Improvements from comments in PR ethereum#2411

Author: fselmo

ens/main.py

@@ -522,7 +522,7 @@ def _set_resolver(
     def _get_resolver(
         self,
         normal_name: str,
-        func: str = 'addr'
+        func_name: str = 'addr'
     ) -> Tuple[Optional['Contract'], str]:
         current_name = normal_name
 
@@ -537,7 +537,7 @@ def _get_resolver(
             resolver_addr = self.ens.caller.resolver(normal_name_to_hash(current_name))
             if not is_none_or_zero_address(resolver_addr):
                 # if resolver found, return it
-                return self._type_aware_resolver(resolver_addr, func), current_name
+                return self._type_aware_resolver(resolver_addr, func_name), current_name
 
             # set current_name to parent and try again
             current_name = self.parent(current_name)
@@ -548,6 +548,8 @@ def _decode_ensip10_resolve_data(
         func = extended_resolver.get_function_by_name(fn_name)
         output_types = get_abi_output_types(func.abi)
         decoded = self.w3.codec.decode_abi(output_types, contract_call_result)
+
+        # if decoding a single value, return that value - else, return the tuple
         return decoded[0] if len(decoded) == 1 else decoded
 
     def _setup_reverse(

tests/ens/test_get_text.py

@@ -66,6 +66,9 @@ def test_get_text(ens, key, expected):
     ens.set_text('tester.eth', key, expected)
     assert ens.get_text('tester.eth', key) == expected
 
+    # teardown
+    ens.setup_address('tester.eth', None)
+
 
 def test_get_text_resolver_not_found(ens):
     with pytest.raises(ResolverNotFound):