Merge pull request #1315 from njgheorghita/remove-guess-tld

Remove all remaining guess_tld kwargs

setup.py

@@ -25,7 +25,7 @@
         "ethtoken",
         "py-geth>=1.4.0",
         "py-solc>=0.4.0",
-        "pytest>=3.5.0,<4.0.0",
+        "pytest>=4.4.0,<5.0.0",
         "sphinx",
         "sphinx_rtd_theme>=0.1.9",
         "toposort>=1.4",
@@ -37,7 +37,7 @@
         "bumpversion",
         "flaky>=3.3.0",
         "hypothesis>=3.31.2",
-        "pytest>=3.6.0,<4.0.0",
+        "pytest>=4.4.0,<5.0.0",
         "pytest-mock==1.*",
         "pytest-pythonpath>=0.3",
         "pytest-watch==4.*",

tests/core/middleware/test_name_to_address_middleware.py

@@ -21,9 +21,7 @@ class TempENS():
     def __init__(self, name_addr_pairs):
         self.registry = dict(name_addr_pairs)
 
-    def address(self, name, guess_tld=True):
-        # no automated web3 usages should be guessing the TLD
-        assert not guess_tld
+    def address(self, name):
         return self.registry.get(name, None)
 
 

web3/_utils/ens.py

@@ -26,7 +26,7 @@ def is_ens_name(value):
 
 
 def validate_name_has_address(ens, name):
-    addr = ens.address(name, guess_tld=False)
+    addr = ens.address(name)
     if addr:
         return addr
     else:
@@ -37,9 +37,7 @@ class StaticENS:
     def __init__(self, name_addr_pairs):
         self.registry = dict(name_addr_pairs)
 
-    def address(self, name, guess_tld=True):
-        # no automated web3 usages should be guessing the TLD
-        assert not guess_tld
+    def address(self, name):
         return self.registry.get(name, None)