Fix flake8-return warning

RET504 Unnecessary assignment to `...` before `return` statement

Author: DimitriPapadopoulos

pkg_resources/__init__.py

@@ -2832,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)"""

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/easy_install.py

@@ -1474,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/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/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):