one step closer to flake8

Author: huettenhain

CONTRIBUTING.md

@@ -45,18 +45,11 @@ If you would like to contribute to the development, here are a few things that y
 - Make sure that you stick to the style guide;
   refinery code should pass [flake8], with some tests disabled.
 
-You do not have to worry about the following [flake8] tests:
-
-- The following tests are disabled to allow command line argument annotations to work:
-  - `F821` (undefined name)
-  - `F722` (syntax error in forward annotation)
-  - `E704` (multiple statements on one line (def))
-  - `E701` (multiple statements on one line (colon))
-  - `E128` (continuation line is under-indented for a visual indentation)
-- The following tests are disabled because the maintainer doesn't like them:
+You do not have to worry about the following [flake8] tests, they are disabled because the maintainer doesn't like them:
   - `W503` (line break occurred before a binary operator)
   - `E203` (colons should not have any space before them)
-
+  - `E128` (continuation line is under-indented for a visual indentation)
+  - `E261` (at least two spaces before inline comment)
 
 
 [b64]: refinery/units/encoding/b64.py

refinery/lib/argformats.py

@@ -446,10 +446,13 @@ class DelayedArgumentDispatch:
     register additional handlers.
     """
     class Wrapper:
-        def can_handle(self, *a): return self.ego.can_handle(*a)
-        def terminates(self, *a): return self.ego.terminates(*a)
+        def can_handle(self, *a):
+            return self.ego.can_handle(*a)
 
-        def __init__(self, ego, arg):
+        def terminates(self, *a):
+            return self.ego.terminates(*a)
+
+        def __init__(self, ego: DelayedArgumentDispatch, arg):
             self.ego = ego
             self.arg = arg
 
@@ -1137,7 +1140,7 @@ def itob(self, integers: Iterable[int], size=None) -> buf:
         if not size:
             def byte_length(n: int):
                 width, overflow = divmod(n.bit_length(), 8)
-                if overflow: width += 1
+                width += bool(overflow)
                 return width
             if not isinstance(integers, list):
                 integers = list(integers)

refinery/lib/colors.py

@@ -10,13 +10,20 @@
 
 if TYPE_CHECKING:
     @overload
-    def colored_text_truncate(string: str, end: int) -> str: ...
+    def colored_text_truncate(string: str, end: int) -> str:
+        ...
+
     @overload
-    def colored_text_truncate(string: buf, end: int) -> bytes: ...
+    def colored_text_truncate(string: buf, end: int) -> bytes:
+        ...
+
     @overload
-    def colored_text_bleach(string: str) -> str: ...
+    def colored_text_bleach(string: str) -> str:
+        ...
+
     @overload
-    def colored_text_bleach(string: buf) -> bytes: ...
+    def colored_text_bleach(string: buf) -> bytes:
+        ...
 
 
 def colored_text_bleach(string: str | buf):

refinery/lib/inline.py

@@ -112,9 +112,14 @@ def iterspread_method(self):
 
     function_name = None
 
-    def as_arg(name: str): return F'_arg_{name}'
-    def as_var(name: str): return F'_var_{name}'
-    def as_tmp(name: str): return F'_tmp_{name}'
+    def as_arg(name: str):
+        return F'_arg_{name}'
+
+    def as_var(name: str):
+        return F'_var_{name}'
+
+    def as_tmp(name: str):
+        return F'_tmp_{name}'
 
     def apply_node_transformation(cls: type[NodeTransformer]):
         nonlocal code

refinery/lib/java.py

@@ -97,7 +97,9 @@ def __init__(self, _: StructReader, pool: list, tag: JvConstType):
 
 class JvStructWithName(_HasPoolAndTag):
     name: str = Index(str)
-    def __repr__(self): return self.name
+
+    def __repr__(self):
+        return self.name
 
 
 class JvNameAndType(JvStructWithName):
@@ -403,7 +405,8 @@ class opc(IntEnum):
     impdep1         = 0xfe  # noqa
     impdep2         = 0xff  # noqa
 
-    def __repr__(self) -> str: return self.name
+    def __repr__(self) -> str:
+        return self.name
 
 
 class JvBaseType(IntEnum):
@@ -416,7 +419,8 @@ class JvBaseType(IntEnum):
     INT     = 0xA  # noqa
     LONG    = 0xB  # noqa
 
-    def __repr__(self) -> str: return self.name
+    def __repr__(self) -> str:
+        return self.name
 
 
 class JvTypePath:
@@ -580,7 +584,7 @@ def __init__(self, reader: StructReader, pool: list):
 
 class JvClassFile(Struct):
 
-    TYPEHANDLER: dict[JvConstType, Struct] = {
+    TYPEHANDLER: dict[JvConstType, type[Struct]] = {
         JvConstType.Class            : JvString,
         JvConstType.String           : JvString,
         JvConstType.Field            : JvClassProperty,

refinery/lib/meta.py

@@ -151,10 +151,12 @@ class CustomStringRepresentation(abc.ABC):
     """
 
     @abc.abstractmethod
-    def __str__(self): ...
+    def __str__(self) -> str:
+        ...
 
     @abc.abstractmethod
-    def __repr__(self): ...
+    def __repr__(self) -> str:
+        ...
 
 
 _INDEX = 'index'
@@ -698,7 +700,8 @@ def format(
 
         if used is None:
             class dummy:
-                def add(self, _): pass
+                def add(self, _):
+                    pass
             used = dummy()
 
         if args is None:

refinery/lib/mscrypto.py

@@ -12,8 +12,11 @@
 
 
 class _ENUM(enum.IntEnum):
-    def __str__(self): return self.name
-    def __repr__(self): return self.name
+    def __str__(self):
+        return self.name
+
+    def __repr__(self):
+        return self.name
 
 
 class TYPES(_ENUM):
@@ -93,15 +96,17 @@ def __init__(self, reader: StructReader):
 
 
 class PLAINTEXTKEYBLOB(Struct):
-    def __bytes__(self): return bytes(self.data)
+    def __bytes__(self):
+        return bytes(self.data)
 
     def __init__(self, reader: StructReader):
         self.size = reader.u32()
         self.data = reader.read(self.size)
 
 
 class SIMPLEBLOB(Struct):
-    def __bytes__(self): return bytes(self.data)
+    def __bytes__(self):
+        return bytes(self.data)
 
     def __init__(self, reader: StructReader):
         self.magic = reader.read(4)

refinery/lib/ripemd128.py

@@ -49,10 +49,17 @@ def ripemd128(message):
         0xF, 0x5, 0x8, 0xB, 0xE, 0xE, 0x6, 0xE, 0x6, 0x9, 0xC, 0x9, 0xC, 0x5, 0xF, 0x8,
     ]
 
-    def F0(x, y, z): return (x ^ y ^ z)
-    def F1(x, y, z): return (x & y) | (z & ~x)
-    def F2(x, y, z): return (x | (0xffffffff & ~y)) ^ z
-    def F3(x, y, z): return (x & z) | (y & ~z)
+    def F0(x, y, z):
+        return (x ^ y ^ z)
+
+    def F1(x, y, z):
+        return (x & y) | (z & ~x)
+
+    def F2(x, y, z):
+        return (x | (0xffffffff & ~y)) ^ z
+
+    def F3(x, y, z):
+        return (x & z) | (y & ~z)
 
     F = [F0, F1, F2, F3]
 

refinery/lib/suffixtree.py

@@ -68,7 +68,7 @@ def fixlinks(self):
 
     def __repr__(self) -> str:
         label = bytes(self.label).decode('utf8', errors='backslashreplace')
-        if label: label = F': {label}'
+        label = label and F': {label}'
         return F'<{self.__class__.__name__}{label}>'
 
     def __iter__(self) -> Iterable[Node]:

refinery/lib/tools.py

@@ -96,9 +96,14 @@ def terminalfit(text: str, delta: int = 0, width: int = 0, parsep: str = '\n\n',
     width = width or get_terminal_size()
     width = width - delta
 
-    def isol(t): return re.match(R'^\(\d+\)|\d+[.:;]', t)
-    def isul(t): return t.startswith('-') or t.startswith('*')
-    def issp(t): return t.startswith('  ')
+    def isol(t):
+        return re.match(R'^\(\d+\)|\d+[.:;]', t)
+
+    def isul(t):
+        return t.startswith('-') or t.startswith('*')
+
+    def issp(t):
+        return t.startswith('  ')
 
     text = text.replace('\r', '')