pin pyflakes pending a release with PyCQA/pyflakes#455

Clean up some type hints.

Author: wsanchez

src/hyperlink/_url.py

@@ -23,7 +23,7 @@
 try:
     from socket import AddressFamily
 except ImportError:
-    AddressFamily = int  # type: ignore[assignment,misc] Python 2
+    AddressFamily = int  # type: ignore[assignment,misc]
 from typing import (
     Any, Callable, Dict, Iterable, Iterator, List, Mapping, Optional,
     Sequence, Text, Tuple, Type, TypeVar, Union, cast,
@@ -97,7 +97,7 @@ def __repr__(self):
         if var_name:
             # superclass type hints don't allow str return type, but it is
             # allowed in the docs, hence the ignore[override] below
-            def __reduce__(self):  # type: ignore[override] intentional
+            def __reduce__(self):  # type: ignore[override]
                 # type: () -> str
                 return self.var_name
 
@@ -110,7 +110,7 @@ def __nonzero__(self):
     return Sentinel()
 
 
-_unspecified = _UNSET = make_sentinel('_UNSET')
+_unspecified = _UNSET = make_sentinel('_UNSET')  # type: Any
 
 
 # RFC 3986 Section 2.3, Unreserved URI Characters
@@ -466,15 +466,15 @@ def _textcheck(name, value, delims=frozenset(), nullable=False):
     if not isinstance(value, Text):
         if nullable and value is None:
             # used by query string values
-            return value  # type: ignore[misc] unreachable
+            return value  # type: ignore[misc] # unreachable
         else:
             str_name = "unicode" if PY2 else "str"
             exp = str_name + ' or NoneType' if nullable else str_name
             raise TypeError('expected %s for %s, got %r' % (exp, name, value))
     if delims and set(value) & set(delims):  # TODO: test caching into regexes
         raise ValueError('one or more reserved delimiters %s present in %s: %r'
                          % (''.join(delims), name, value))
-    return value  # type: ignore[return-value] T vs. Text
+    return value  # type: ignore[return-value] # T vs. Text
 
 
 def iter_pairs(iterable):
@@ -1089,7 +1089,7 @@ def absolute(self):
         """
         return bool(self.scheme and self.host)
 
-    def replace(  # type: ignore[assignment] _UNSET is private
+    def replace(
         self,
         scheme=_UNSET,      # type: Optional[Text]
         host=_UNSET,        # type: Optional[Text]
@@ -1194,7 +1194,7 @@ def from_text(cls, text):
         port = au_gs['port']
         if port is not None:
             try:
-                port = int(port)  # type: ignore[assignment] FIXME, also below
+                port = int(port)  # type: ignore[assignment] # FIXME, see below
             except ValueError:
                 if not port:  # TODO: excessive?
                     raise URLParseError('port must not be empty: %r' % au_text)
@@ -1227,7 +1227,7 @@ def from_text(cls, text):
             query = ()
         return cls(
             scheme, host, path, query, fragment,
-            port,  # type: ignore[arg-type] FIXME, also above
+            port,  # type: ignore[arg-type] # FIXME, see above
             rooted, userinfo, uses_netloc,
         )
 
@@ -1323,7 +1323,7 @@ def child(self, *segments):
         if not segments:
             return self
 
-        segments = [  # type: ignore[assignment] variable is tuple
+        segments = [  # type: ignore[assignment] # variable is tuple
             _textcheck('path segment', s) for s in segments
         ]
         new_path = tuple(self.path)
@@ -1679,7 +1679,7 @@ def get(self, name):
         """
         return [value for (key, value) in self.query if name == key]
 
-    def remove(  # type: ignore[assignment] _UNSET is private
+    def remove(
         self,
         name,          # type: Text
         value=_UNSET,  # type: Text
@@ -1863,7 +1863,7 @@ def path(self):
         try:
             return cast(
                 Tuple[Text, ...],
-                self._path  # type: ignore[has-type] can't determine
+                self._path  # type: ignore[has-type] # can't determine
             )
         except AttributeError:
             pass
@@ -1879,7 +1879,7 @@ def query(self):
         try:
             return cast(
                 QueryPairs,
-                self._query  # type: ignore[has-type] can't determine
+                self._query  # type: ignore[has-type] # can't determine
             )
         except AttributeError:
             pass
@@ -1899,7 +1899,7 @@ def fragment(self):
         try:
             return cast(
                 Text,
-                self._fragment  # type: ignore[has-type] can't determine
+                self._fragment  # type: ignore[has-type] # can't determine
             )
         except AttributeError:
             pass
@@ -1913,7 +1913,7 @@ def userinfo(self):
         try:
             return cast(
                 Union[Tuple[str], Tuple[str, str]],
-                self._userinfo  # type: ignore[has-type] can't determine
+                self._userinfo  # type: ignore[has-type] # can't determine
             )
         except AttributeError:
             pass
@@ -1938,7 +1938,7 @@ def uses_netloc(self):
         # type: () -> bool
         return cast(bool, self._url.uses_netloc)
 
-    def replace(  # type: ignore[assignment] _UNSET is private
+    def replace(
         self,
         scheme=_UNSET,      # type: Optional[Text]
         host=_UNSET,        # type: Optional[Text]
@@ -2007,7 +2007,7 @@ def set(self, name, value=None):
         q[idx:idx] = [(name, value)]
         return self.replace(query=q)
 
-    def remove(  # type: ignore[assignment] _UNSET is private
+    def remove(
         self,
         name,          # type: Text
         value=_UNSET,  # type: Text

src/hyperlink/test/common.py

@@ -6,7 +6,7 @@ class HyperlinkTestCase(TestCase):
     """This type mostly exists to provide a backwards-compatible
     assertRaises method for Python 2.6 testing.
     """
-    def assertRaises(  # type: ignore[override] Doesn't match superclass, meh
+    def assertRaises(  # type: ignore[override]
         self, expected_exception, callableObj=None, *args, **kwargs
     ):
         # type: (Type[BaseException], Optional[Callable], Any, Any) -> Any

src/hyperlink/test/test_common.py

@@ -88,7 +88,7 @@ def test_assertRaisesContextManager(self):
         with self.hyperlink_test.assertRaises(_ExpectedException) as cm:
             raise _ExpectedException
 
-        self.assertTrue(  # type: ignore[misc] unreachable
+        self.assertTrue(  # type: ignore[misc] # unreachable
             isinstance(cm.exception, _ExpectedException)
         )
 

src/hyperlink/test/test_decoded_url.py

@@ -170,7 +170,7 @@ def test_replace_userinfo(self):
         durl = DecodedURL.from_text(TOTAL_URL)
         with self.assertRaises(ValueError):
             durl.replace(
-                userinfo=(  # type: ignore[arg-type] intentional
+                userinfo=(  # type: ignore[arg-type]
                     'user', 'pw', 'thiswillcauseafailure'
                 )
             )

src/hyperlink/test/test_socket.py

@@ -3,7 +3,7 @@
 try:
     from socket import inet_pton
 except ImportError:
-    inet_pton = None  # type: ignore[assignment] optional
+    inet_pton = None  # type: ignore[assignment]
 
 if not inet_pton:
     import socket

src/hyperlink/test/test_url.py

@@ -871,7 +871,7 @@ def assertRaised(raised, expectation, name):
         def check(param, expectation=defaultExpectation):
             # type: (Any, str) -> None
             with self.assertRaises(TypeError) as raised:
-                URL(**{param: Unexpected()})  # type: ignore[arg-type] ok
+                URL(**{param: Unexpected()})  # type: ignore[arg-type]
 
             assertRaised(raised, expectation, param)
 

tox.ini

@@ -84,6 +84,8 @@ deps =
     mccabe==0.6.1
     pep8-naming==0.9.1
     pydocstyle==4.0.1
+    # pin pyflakes pending a release with https://github.com/PyCQA/pyflakes/pull/455
+    git+git://github.com/PyCQA/pyflakes@ffe9386#egg=pyflakes
 
 commands =
     flake8 {posargs:src/{env:PY_MODULE}}