Fix flake8-return warnings

_distutils_hack/__init__.py

@@ -83,15 +83,15 @@ def find_spec(self, fullname, path, target=None):
         # optimization: only consider top level modules and those
         # found in the CPython test suite.
         if path is not None and not fullname.startswith('test.'):
-            return
+            return None
 
         method_name = 'spec_for_{fullname}'.format(**locals())
         method = getattr(self, method_name, lambda: None)
         return method()
 
     def spec_for_distutils(self):
         if self.is_cpython():
-            return
+            return None
 
         import importlib
         import importlib.abc
@@ -108,7 +108,7 @@ def spec_for_distutils(self):
             #   setuptools from the path but only after the hook
             #   has been loaded. Ref #2980.
             # In either case, fall back to stdlib behavior.
-            return
+            return None
 
         class DistutilsLoader(importlib.abc.Loader):
             def create_module(self, spec):

pkg_resources/__init__.py

@@ -1127,8 +1127,7 @@ def obtain(self, requirement, installer=None):
         None is returned instead.  This method is a hook that allows subclasses
         to attempt other ways of obtaining a distribution before falling back
         to the `installer` argument."""
-        if installer is not None:
-            return installer(requirement)
+        return installer(requirement) if installer else None
 
     def __iter__(self):
         """Yield the unique project names of the available distributions"""
@@ -2833,9 +2832,7 @@ def _get_metadata(self, name):
 
     def _get_version(self):
         lines = self._get_metadata(self.PKG_INFO)
-        version = _version_from_file(lines)
-
-        return version
+        return _version_from_file(lines)
 
     def activate(self, path=None, replace=False):
         """Ensure distribution is importable on `path` (default=sys.path)"""
@@ -3210,6 +3207,7 @@ def _find_adapter(registry, ob):
     for t in types:
         if t in registry:
             return registry[t]
+    return None
 
 
 def ensure_directory(path):

setuptools/command/bdist_egg.py

@@ -419,6 +419,7 @@ def can_scan():
         "Please ask the author to include a 'zip_safe'"
         " setting (either True or False) in the package's setup.py"
     )
+    return False
 
 
 # Attribute names of options for commands that might need to be convinced to

setuptools/command/bdist_rpm.py

@@ -30,11 +30,10 @@ def run(self):
 
     def _make_spec_file(self):
         spec = orig.bdist_rpm._make_spec_file(self)
-        spec = [
+        return [
             line.replace(
                 "setup.py install ",
                 "setup.py install --single-version-externally-managed ",
             ).replace("%setup", "%setup -n %{name}-%{unmangled_version}")
             for line in spec
         ]
-        return spec

setuptools/command/build_ext.py

@@ -76,6 +76,7 @@ def get_abi3_suffix():
             return suffix
         elif suffix == '.pyd':  # Windows
             return suffix
+    return None
 
 
 class build_ext(_build_ext):

setuptools/command/develop.py

@@ -157,6 +157,8 @@ def install_egg_scripts(self, dist):
                 script_text = strm.read()
             self.install_script(dist, script_name, script_text, script_path)
 
+        return None
+
     def install_wrapper_scripts(self, dist):
         dist = VersionlessRequirement(dist)
         return easy_install.install_wrapper_scripts(self, dist)

setuptools/command/easy_install.py

@@ -741,6 +741,7 @@ def install_item(self, spec, download, tmpdir, deps, install_needed=False):
             for dist in dists:
                 if dist in spec:
                     return dist
+        return None
 
     def select_scheme(self, name):
         try:
@@ -1473,9 +1474,7 @@ def get_site_dirs():
     with contextlib.suppress(AttributeError):
         sitedirs.extend(site.getsitepackages())
 
-    sitedirs = list(map(normalize_path, sitedirs))
-
-    return sitedirs
+    return list(map(normalize_path, sitedirs))
 
 
 def expand_paths(inputs):  # noqa: C901  # is too complex (11)  # FIXME

setuptools/command/install.py

@@ -71,6 +71,7 @@ def handle_extra_path(self):
         # command without --root or --single-version-externally-managed
         self.path_file = None
         self.extra_dirs = ''
+        return None
 
     def run(self):
         # Explicit request for old-style install?  Just do it
@@ -83,6 +84,8 @@ def run(self):
         else:
             self.do_egg_install()
 
+        return None
+
     @staticmethod
     def _called_from_setup(run_frame):
         """
@@ -114,6 +117,8 @@ def _called_from_setup(run_frame):
 
             return caller_module == 'distutils.dist' and info.function == 'run_commands'
 
+        return False
+
     def do_egg_install(self):
         easy_install = self.distribution.get_command_class('easy_install')
 

setuptools/depends.py

@@ -159,6 +159,7 @@ def extract_constant(code, symbol, default=-1):
         else:
             const = default
 
+    return None
 
 def _update_globals():
     """

setuptools/discovery.py

@@ -485,7 +485,7 @@ def analyse_name(self):
         """
         if self.dist.metadata.name or self.dist.name:
             # get_name() is not reliable (can return "UNKNOWN")
-            return None
+            return
 
         log.debug("No `name` configuration, performing automatic discovery")
 

setuptools/dist.py

@@ -778,6 +778,8 @@ def has_contents_for(self, package):
             if p == package or p.startswith(pfx):
                 return True
 
+        return False
+
     def _exclude_misc(self, name, value):
         """Handle 'exclude()' for list/tuple attrs without a special handler"""
         if not isinstance(value, sequence):

setuptools/installer.py

@@ -107,10 +107,9 @@ def _fetch_build_egg_no_warn(dist, req):  # noqa: C901  # is too complex (16)  #
         dist_metadata = pkg_resources.PathMetadata(
             dist_location, os.path.join(dist_location, 'EGG-INFO')
         )
-        dist = pkg_resources.Distribution.from_filename(
+        return pkg_resources.Distribution.from_filename(
             dist_location, metadata=dist_metadata
         )
-        return dist
 
 
 def strip_marker(req):

setuptools/msvc.py

@@ -577,6 +577,7 @@ def lookup(self, key, name):
             finally:
                 if bkey:
                     closekey(bkey)
+        return None
 
 
 class SystemInfo:
@@ -823,6 +824,7 @@ def WindowsSdkVersion(self):
             return '8.1', '8.1a'
         elif self.vs_ver >= 14.0:
             return '10.0', '8.1'
+        return None
 
     @property
     def WindowsSdkLastVersion(self):
@@ -914,6 +916,8 @@ def WindowsSDKExecutablePath(self):
             if execpath:
                 return execpath
 
+        return None
+
     @property
     def FSharpInstallDir(self):
         """
@@ -946,6 +950,8 @@ def UniversalCRTSdkDir(self):
             if sdkdir:
                 return sdkdir or ''
 
+        return None
+
     @property
     def UniversalCRTSdkLastVersion(self):
         """

setuptools/package_index.py

@@ -319,7 +319,7 @@ def add(self, dist):
         try:
             parse_version(dist.version)
         except Exception:
-            return
+            return None
         return super().add(dist)
 
     # FIXME: 'PackageIndex.process_url' is too complex (14)
@@ -406,6 +406,7 @@ def url_ok(self, url, fatal=False):
             raise DistutilsError(msg % url)
         else:
             self.warn(msg, url)
+            return False
 
     def scan_egg_links(self, search_path):
         dirs = filter(os.path.isdir, search_path)
@@ -648,6 +649,8 @@ def find(req, env=None):
                     if os.path.exists(dist.download_location):
                         return dist
 
+            return None
+
         if force_scan:
             self.prescan()
             self.find_packages(requirement)
@@ -671,6 +674,7 @@ def find(req, env=None):
                 (source and "a source distribution of " or ""),
                 requirement,
             )
+            return None
         else:
             self.info("Best match: %s", dist)
             return dist.clone(location=dist.download_location)
@@ -1034,6 +1038,7 @@ def find_credential(self, url):
         for repository, cred in self.creds_by_repository.items():
             if url.startswith(repository):
                 return cred
+        return None
 
 
 def open_with_auth(url, opener=urllib.request.urlopen):

setuptools/sandbox.py

@@ -115,7 +115,7 @@ def dump(type, exc):
 
 class ExceptionSaver:
     """
-    A Context Manager that will save an exception, serialized, and restore it
+    A Context Manager that will save an exception, serialize, and restore it
     later.
     """
 
@@ -124,7 +124,7 @@ def __enter__(self):
 
     def __exit__(self, type, exc, tb):
         if not exc:
-            return
+            return False
 
         # dump the exception
         self._saved = UnpickleableException.dump(type, exc)

setuptools/tests/config/test_setupcfg.py

@@ -964,7 +964,6 @@ def _fake_distribution_init(self, dist, attrs):
             'Link One': 'https://example.com/one/',
             'Link Two': 'https://example.com/two/',
         }
-        return None
 
     @patch.object(_Distribution, '__init__', autospec=True)
     def test_external_setters(self, mock_parent_init, tmpdir):

setuptools/tests/server.py

@@ -84,5 +84,4 @@ def path_to_url(path, authority=None):
     base = 'file:'
     if authority is not None:
         base += '//' + authority
-    url = urllib.parse.urljoin(base, urllib.request.pathname2url(path))
-    return url
+    return urllib.parse.urljoin(base, urllib.request.pathname2url(path))

setuptools/tests/test_build_ext.py

@@ -98,12 +98,11 @@ def dist_with_example(self):
         ext3 = Extension("ext3", ["c-extension/ext3.c"])
 
         path.build(files)
-        dist = Distribution({
+        return Distribution({
             "script_name": "%test%",
             "ext_modules": [ext1, ext2, ext3],
             "package_dir": {"": "src"},
         })
-        return dist
 
     def test_get_outputs(self, tmpdir_cwd, monkeypatch):
         monkeypatch.setenv('SETUPTOOLS_EXT_SUFFIX', '.mp3')  # make test OS-independent

setuptools/tests/test_core_metadata.py

@@ -64,7 +64,7 @@ def __read_test_cases():
 
     params = functools.partial(dict, base)
 
-    test_cases = [
+    return [
         ('Metadata version 1.0', params()),
         (
             'Metadata Version 1.0: Short long description',
@@ -156,8 +156,6 @@ def __read_test_cases():
         ),
     ]
 
-    return test_cases
-
 
 @pytest.mark.parametrize('name,attrs', __read_test_cases())
 def test_read_metadata(name, attrs):
@@ -209,7 +207,7 @@ def merge_dicts(d1, d2):
 
         return d1
 
-    test_cases = [
+    return [
         ('No author, no maintainer', attrs.copy()),
         (
             'Author (no e-mail), no maintainer',
@@ -267,8 +265,6 @@ def merge_dicts(d1, d2):
         ('Maintainer unicode', merge_dicts(attrs, {'maintainer': 'Jan Łukasiewicz'})),
     ]
 
-    return test_cases
-
 
 @pytest.mark.parametrize('name,attrs', __maintainer_test_cases())
 def test_maintainer_author(name, attrs, tmpdir):

setuptools/tests/test_distutils_adoption.py

@@ -16,9 +16,7 @@ def win_sr(env):
     > Fatal Python error: _Py_HashRandomization_Init: failed to
     > get random numbers to initialize Python
     """
-    if env is None:
-        return
-    if platform.system() == 'Windows':
+    if env and platform.system() == 'Windows':
         env['SYSTEMROOT'] = os.environ['SYSTEMROOT']
     return env
 

setuptools/unicode_utils.py

@@ -18,7 +18,7 @@ def decompose(path):
 def filesys_decode(path):
     """
     Ensure that the given path is decoded,
-    NONE when no expected encoding works
+    ``None`` when no expected encoding works
     """
 
     if isinstance(path, str):
@@ -33,6 +33,8 @@ def filesys_decode(path):
         except UnicodeDecodeError:
             continue
 
+    return None
+
 
 def try_encode(string, enc):
     "turn unicode encoding into a functional routine"