linting with Ruff

Author: Borda

fire/__main__.py

@@ -64,7 +64,7 @@ def import_from_file_path(path):
     raise OSError('Unable to load module from specified path.')
 
   module = util.module_from_spec(spec)  # pylint: disable=no-member
-  spec.loader.exec_module(module)  # pytype: disable=attribute-error
+  spec.loader.exec_module(module)
 
   return module, module_name
 

fire/console/console_attr_os.py

@@ -47,7 +47,7 @@ def GetTermSize():
       xy = get_terminal_size()
       if xy:
         break
-    except:  # pylint: disable=bare-except
+    except:  # noqa: E722
       pass
   return xy or (80, 24)
 
@@ -75,7 +75,7 @@ def _GetXY(fd):
       # binary shorts to a (rows, columns) int tuple.
       rc = struct.unpack(b'hh', fcntl.ioctl(fd, termios.TIOCGWINSZ, 'junk'))
       return (rc[1], rc[0]) if rc else None
-    except:  # pylint: disable=bare-except
+    except:  # noqa: E722
       return None
 
   xy = _GetXY(0) or _GetXY(1) or _GetXY(2)
@@ -84,7 +84,7 @@ def _GetXY(fd):
     try:
       fd = os.open(os.ctermid(), os.O_RDONLY)
       xy = _GetXY(fd)
-    except:  # pylint: disable=bare-except
+    except:  # noqa: E722
       xy = None
     finally:
       if fd is not None:
@@ -153,7 +153,7 @@ def GetRawKeyFunction():
                                _GetRawKeyFunctionWindows):
     try:
       return get_raw_key_function()
-    except:  # pylint: disable=bare-except
+    except:  # noqa: E722
       pass
   return lambda: None
 
@@ -212,7 +212,7 @@ def _GetKeyChar():
             c = prev_c
             break
         return ansi_to_key.get(c, '')
-    except:  # pylint:disable=bare-except
+    except:  # noqa: E722
       c = None
     finally:
       termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)

fire/console/encoding.py

@@ -91,14 +91,14 @@ def Decode(data, encoding=None):
 
   # Try the filesystem encoding.
   try:
-    return string.decode(sys.getfilesystemencoding())  # pytype: disable=attribute-error
+    return string.decode(sys.getfilesystemencoding())  # pytype: disable=attribute-error,  # noqa: E501
   except UnicodeError:
     # string is not encoded for filesystem paths.
     pass
 
   # Try the system default encoding.
   try:
-    return string.decode(sys.getdefaultencoding())  # pytype: disable=attribute-error
+    return string.decode(sys.getdefaultencoding())  # pytype: disable=attribute-error,  # noqa: E501
   except UnicodeError:
     # string is not encoded using the default encoding.
     pass

fire/console/text.py

@@ -100,4 +100,3 @@ class TextTypes(_TextTypes):
   OUTPUT = 7
   PT_SUCCESS = 8
   PT_FAILURE = 9
-

fire/decorators.py

@@ -100,7 +100,7 @@ def GetMetadata(fn) -> Dict[str, Any]:
       return metadata
     else:
       return default
-  except:  # pylint: disable=bare-except
+  except:  # noqa: E722
     return default
 
 

fire/docstrings_test.py

@@ -46,7 +46,9 @@ def test_one_line_simple_whitespace(self):
 
   def test_one_line_too_long(self):
     # pylint: disable=line-too-long
-    docstring = """A one line docstring that is both a little too verbose and a little too long so it keeps going well beyond a reasonable length for a one-liner.
+    docstring = """A one line docstring that is both a little too verbose
+    and a little too long so it keeps going well beyond a reasonable length
+    for a one-liner.
     """
     # pylint: enable=line-too-long
     docstring_info = docstrings.parse(docstring)
@@ -59,8 +61,8 @@ def test_one_line_too_long(self):
 
   def test_one_line_runs_over(self):
     # pylint: disable=line-too-long
-    docstring = """A one line docstring that is both a little too verbose and a little too long
-    so it runs onto a second line.
+    docstring = """A one line docstring that is both a little too verbose
+    and a little too long so it runs onto a second line.
     """
     # pylint: enable=line-too-long
     docstring_info = docstrings.parse(docstring)
@@ -72,8 +74,8 @@ def test_one_line_runs_over(self):
 
   def test_one_line_runs_over_whitespace(self):
     docstring = """
-      A one line docstring that is both a little too verbose and a little too long
-      so it runs onto a second line.
+      A one line docstring that is both a little too verbose
+      and a little too long so it runs onto a second line.
     """
     docstring_info = docstrings.parse(docstring)
     expected_docstring_info = DocstringInfo(

fire/fire_test.py

@@ -323,10 +323,10 @@ def testFireObjectWithTupleAsObject(self):
   def testFireNoComponent(self):
     self.assertEqual(fire.Fire(command=['tc', 'WithDefaults', 'double', '10']),
                      20)
-    last_char = lambda text: text[-1]  # pylint: disable=unused-variable
+    # last_char = lambda text: text[-1]
     self.assertEqual(fire.Fire(command=['last_char', '"Hello"']), 'o')
     self.assertEqual(fire.Fire(command=['last-char', '"World"']), 'd')
-    rset = lambda count=0: set(range(count))  # pylint: disable=unused-variable
+    # rset = lambda count=0: set(range(count))
     self.assertEqual(fire.Fire(command=['rset', '5']), {0, 1, 2, 3, 4})
 
   def testFireUnderscores(self):

fire/formatting.py

@@ -14,7 +14,6 @@
 
 """Formatting utilities for use in creating help text."""
 
-from fire import formatting_windows  # pylint: disable=unused-import
 import termcolor
 
 

fire/formatting_windows.py

@@ -21,7 +21,7 @@
 import sys
 
 try:
-  import colorama  # pylint: disable=g-import-not-at-top,  # pytype: disable=import-error
+  import colorama  # pytype: disable=import-error
   HAS_COLORAMA = True
 except ImportError:
   HAS_COLORAMA = False
@@ -40,7 +40,8 @@ def initialize_or_disable():
       wrap = False
       kernel32 = ctypes.windll.kernel32  # pytype: disable=module-attr
       enable_virtual_terminal_processing = 0x04
-      out_handle = kernel32.GetStdHandle(subprocess.STD_OUTPUT_HANDLE)  # pylint: disable=line-too-long,  # pytype: disable=module-attr
+      out_handle = kernel32.GetStdHandle(  # pytype: disable=module-attr
+        subprocess.STD_OUTPUT_HANDLE)
       # GetConsoleMode fails if the terminal isn't native.
       mode = ctypes.wintypes.DWORD()
       if kernel32.GetConsoleMode(out_handle, ctypes.byref(mode)) == 0:

fire/inspectutils.py

@@ -344,5 +344,5 @@ def GetClassAttrsDict(component):
 def IsCoroutineFunction(fn):
   try:
     return asyncio.iscoroutinefunction(fn)
-  except:  # pylint: disable=bare-except
+  except:  # noqa: E722
     return False