Merge pull request #364 from jelmer/ruff

Various linting cleanups

Author: jelmer

doc/conf.py

@@ -10,7 +10,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

testtools/content.py

@@ -302,7 +302,8 @@ def content_from_stream(stream, content_type=None,
     """
     if content_type is None:
         content_type = UTF8_TEXT
-    reader = lambda: _iter_chunks(stream, chunk_size, seek_offset, seek_whence)
+    def reader():
+        return _iter_chunks(stream, chunk_size, seek_offset, seek_whence)
     return content_from_reader(reader, content_type, buffer_now)
 
 
@@ -319,7 +320,8 @@ def content_from_reader(reader, content_type, buffer_now):
         content_type = UTF8_TEXT
     if buffer_now:
         contents = list(reader())
-        reader = lambda: contents
+        def reader():
+            return contents
     return Content(content_type, reader)
 
 

testtools/deferredruntest.py

@@ -128,7 +128,7 @@
 
 # XXX: These are not explicitly included in __all__.  It's unclear how much of
 # the public interface they really are.
-from ._impl import (
+from ._impl import (  # noqa: F401
     Matcher,
     Mismatch,
     MismatchError,

testtools/matchers/__init__.py

@@ -71,7 +71,7 @@ def __init__(self, filenames=None, matcher=None):
         :param matcher: If specified, match the sorted directory listing
             against this matcher.
         """
-        if filenames == matcher == None:
+        if filenames == matcher is None:
             raise AssertionError(
                 "Must provide one of `filenames` or `matcher`.")
         if None not in (filenames, matcher):
@@ -105,7 +105,7 @@ def __init__(self, contents=None, matcher=None):
         :param matcher: If specified, match the contents of the file against
             this matcher.
         """
-        if contents == matcher == None:
+        if contents == matcher is None:
             raise AssertionError(
                 "Must provide one of `contents` or `matcher`.")
         if None not in (contents, matcher):
@@ -163,7 +163,8 @@ def __init__(self, path):
         self.path = path
 
     def match(self, other_path):
-        f = lambda x: os.path.abspath(os.path.realpath(x))
+        def f(x):
+            return os.path.abspath(os.path.realpath(x))
         return Equals(f(self.path)).match(f(other_path))
 
 

testtools/matchers/_filesystem.py

@@ -13,8 +13,6 @@
 from ._higherorder import (
     AfterPreprocessing,
     Annotate,
-    MatchesAll,
-    Not,
     )
 from ._impl import Mismatch
 

testtools/matchers/_warnings.py

@@ -8,7 +8,6 @@
  $ python -m testtools.run testtools.tests.test_suite
 """
 
-import argparse
 from functools import partial
 import os.path
 import sys
@@ -253,7 +252,7 @@ def _get_runner(self):
 ################
 
 def main(argv, stdout):
-    program = TestProgram(argv=argv, testRunner=partial(TestToolsTestRunner, stdout=stdout),
+    TestProgram(argv=argv, testRunner=partial(TestToolsTestRunner, stdout=stdout),
         stdout=stdout)
 
 if __name__ == '__main__':

testtools/run.py

@@ -142,7 +142,8 @@ def _copy_content(content_object):
         ``content_object`` and a non-volatile copy of its content.
     """
     content_bytes = list(content_object.iter_bytes())
-    content_callback = lambda: content_bytes
+    def content_callback():
+        return content_bytes
     return content.Content(content_object.content_type, content_callback)
 
 

testtools/testcase.py

@@ -179,7 +179,8 @@ class TestTarballContains(TestCase, PathHelpers):
 
     def test_match(self):
         tempdir = self.mkdtemp()
-        in_temp_dir = lambda x: os.path.join(tempdir, x)
+        def in_temp_dir(x):
+            return os.path.join(tempdir, x)
         self.touch(in_temp_dir('a'))
         self.touch(in_temp_dir('b'))
         tarball = tarfile.open(in_temp_dir('foo.tar.gz'), 'w')
@@ -191,7 +192,8 @@ def test_match(self):
 
     def test_mismatch(self):
         tempdir = self.mkdtemp()
-        in_temp_dir = lambda x: os.path.join(tempdir, x)
+        def in_temp_dir(x):
+            return os.path.join(tempdir, x)
         self.touch(in_temp_dir('a'))
         self.touch(in_temp_dir('b'))
         tarball = tarfile.open(in_temp_dir('foo.tar.gz'), 'w')

testtools/tests/matchers/test_filesystem.py

@@ -5,7 +5,7 @@
 import tempfile
 import unittest
 
-from testtools import TestCase, skipUnless
+from testtools import TestCase
 from testtools.compat import (
     _b,
     )
@@ -55,8 +55,10 @@ def test___init___sets_ivars(self):
 
     def test___eq__(self):
         content_type = ContentType("foo", "bar")
-        one_chunk = lambda: [_b("bytes")]
-        two_chunk = lambda: [_b("by"), _b("tes")]
+        def one_chunk():
+            return [_b("bytes")]
+        def two_chunk():
+            return [_b("by"), _b("tes")]
         content1 = Content(content_type, one_chunk)
         content2 = Content(content_type, one_chunk)
         content3 = Content(content_type, two_chunk)