Sourcery refactored main branch #1

sourcery-ai · 2024-01-19T01:37:48Z

Branch main refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the main branch, then run:

git fetch origin sourcery/main
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai

Sourcery timed out performing refactorings.

Due to GitHub API limits, only the first 60 comments can be shown.

sourcery-ai · 2024-01-19T01:37:50Z

conftest.py

-    collect_ignore.append('docs/conf.py')  # uses f-strings
-    collect_ignore.append('pavement.py')
-
-
+    collect_ignore.extend(('docs/conf.py', 'pavement.py'))


Lines 45-48 refactored with the following changes:

Merge consecutive list appends into a single extend (merge-list-appends-into-extend)

This removes the following comments ( why? ):

# uses f-strings

sourcery-ai · 2024-01-19T01:37:50Z

pkg_resources/__init__.py

-    state = {}
    g = globals()
-    for k, v in _state_vars.items():
-        state[k] = g['_sget_' + v](g[k])
-    return state
+    return {k: g[f'_sget_{v}'](g[k]) for k, v in _state_vars.items()}


Function __getstate__ refactored with the following changes:

Move assignment closer to its usage within a block (move-assign-in-block)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

Convert for loop into dictionary comprehension (dict-comprehension)

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2024-01-19T01:37:50Z

pkg_resources/__init__.py

-        g['_sset_' + _state_vars[k]](k, g[k], v)
+        g[f'_sset_{_state_vars[k]}'](k, g[k], v)


Function __setstate__ refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2024-01-19T01:37:50Z

pkg_resources/__init__.py

-            plat = 'macosx-%s-%s' % ('.'.join(_macos_vers()[:2]), m.group(3))
+            plat = f"macosx-{'.'.join(_macos_vers()[:2])}-{m.group(3)}"


Function get_supported_platform refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2024-01-19T01:37:50Z

pkg_resources/__init__.py

-        if not self.requirers:
-            return 'the application'
-        return ', '.join(self.requirers)
+        return 'the application' if not self.requirers else ', '.join(self.requirers)


Function DistributionNotFound.requirers_str refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2024-01-19T01:37:51Z

pkg_resources/__init__.py

-    def has_resource(resource_name):
+    def has_resource(self):


Function IResourceProvider.has_resource refactored with the following changes:

The first argument to instance methods should be self (instance-method-first-arg-name)

sourcery-ai · 2024-01-19T01:37:51Z

pkg_resources/__init__.py

-    def resource_isdir(resource_name):
+    def resource_isdir(self):


Function IResourceProvider.resource_isdir refactored with the following changes:

The first argument to instance methods should be self (instance-method-first-arg-name)

sourcery-ai · 2024-01-19T01:37:51Z

pkg_resources/__init__.py

-    def resource_listdir(resource_name):
+    def resource_listdir(self):


Function IResourceProvider.resource_listdir refactored with the following changes:

The first argument to instance methods should be self (instance-method-first-arg-name)

sourcery-ai · 2024-01-19T01:37:51Z

pkg_resources/__init__.py

-                if dist is None:
-                    requirers = required_by.get(req, None)
-                    raise DistributionNotFound(req, requirers)
+            if dist is None:
+                requirers = required_by.get(req, None)
+                raise DistributionNotFound(req, requirers)


Function WorkingSet._resolve_dist refactored with the following changes:

Hoist conditional out of nested conditional (hoist-if-from-if)

sourcery-ai · 2024-01-19T01:37:51Z

pkg_resources/__init__.py

-        plugin_projects = list(plugin_env)
-        # scan project names in alphabetic order
-        plugin_projects.sort()
-
+        plugin_projects = sorted(plugin_env)


Function WorkingSet.find_plugins refactored with the following changes:

Remove an unnecessary list construction call prior to sorting [×2] (skip-sorted-list-construction)

This removes the following comments ( why? ):

# scan project names in alphabetic order

sourcery-ai · 2024-01-19T01:37:53Z

pkg_resources/__init__.py

-        target_path = os.path.join(extract_path, archive_name + '-tmp', *names)
+        target_path = os.path.join(extract_path, f'{archive_name}-tmp', *names)


Function ResourceManager.get_cache_path refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2024-01-19T01:37:53Z

pkg_resources/__init__.py

-    match = _PEP440_FALLBACK.search(version)
-    if match:
+    if match := _PEP440_FALLBACK.search(version):


Function _forgiving_version refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2024-01-19T01:37:53Z

pkg_resources/__init__.py

-            exc.reason += ' in {} file at path: {}'.format(name, path)
+            exc.reason += f' in {name} file at path: {path}'


Function NullProvider.get_metadata refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2024-01-19T01:37:53Z

pkg_resources/__init__.py

-        if self.egg_info:
-            return self._listdir(self._fn(self.egg_info, name))
-        return []
+        return self._listdir(self._fn(self.egg_info, name)) if self.egg_info else []


Function NullProvider.metadata_listdir refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2024-01-19T01:37:53Z

pkg_resources/__init__.py

-        script = 'scripts/' + script_name
+        script = f'scripts/{script_name}'


Function NullProvider.run_script refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2024-01-19T01:37:54Z

pkg_resources/__init__.py

-            match = EGG_NAME(basename)
-            if match:
+            if match := EGG_NAME(basename):


Function Distribution.from_location refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2024-01-19T01:37:54Z

pkg_resources/__init__.py

-                msg = ("Missing 'Version:' header and/or {} file at path: {}").format(
-                    self.PKG_INFO, path
-                )
+                msg = f"Missing 'Version:' header and/or {self.PKG_INFO} file at path: {path}"


Function Distribution.version refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2024-01-19T01:37:54Z

pkg_resources/__init__.py

-            fails_marker = marker and (
+            if fails_marker := marker and (
                invalid_marker(marker) or not evaluate_marker(marker)
-            )
-            if fails_marker:
+            ):


Function Distribution._filter_extras refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2024-01-19T01:37:54Z

pkg_resources/__init__.py

-        version = _version_from_file(lines)
-
-        return version
+        return _version_from_file(lines)


Function Distribution._get_version refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2024-01-19T01:37:54Z

pkg_resources/__init__.py

-        filename = "%s-%s-py%s" % (
-            to_filename(self.project_name),
-            to_filename(self.version),
-            self.py_version or PY_MAJOR,
-        )
+        filename = f"{to_filename(self.project_name)}-{to_filename(self.version)}-py{self.py_version or PY_MAJOR}"

        if self.platform:
-            filename += '-' + self.platform
+            filename += f'-{self.platform}'


Function Distribution.egg_name refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2024-01-19T01:37:56Z

pkg_resources/__init__.py

-        if self.location:
-            return "%s (%s)" % (self, self.location)
-        else:
-            return str(self)
+        return f"{self} ({self.location})" if self.location else str(self)


Function Distribution.__repr__ refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2024-01-19T01:37:57Z

pkg_resources/__init__.py

-        return "%s %s" % (self.project_name, version)
+        return f"{self.project_name} {version}"


Function Distribution.__str__ refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2024-01-19T01:37:57Z

pkg_resources/__init__.py

-            set(super().__dir__())
-            | set(attr for attr in self._provider.__dir__() if not attr.startswith('_'))
+            (
+                set(super().__dir__())
+                | {
+                    attr
+                    for attr in self._provider.__dir__()
+                    if not attr.startswith('_')
+                }
+            )


Function Distribution.__dir__ refactored with the following changes:

Replace list(), dict() or set() with comprehension (collection-builtin-to-comprehension)

sourcery-ai · 2024-01-19T01:37:57Z

pkg_resources/__init__.py

-            spec = "%s==%s" % (self.project_name, self.parsed_version)
+            spec = f"{self.project_name}=={self.parsed_version}"
        else:
-            spec = "%s===%s" % (self.project_name, self.parsed_version)
+            spec = f"{self.project_name}==={self.parsed_version}"


Function Distribution.as_requirement refactored with the following changes:

Replace interpolated string formatting with f-string [×2] (replace-interpolation-with-fstring)

sourcery-ai · 2024-01-19T01:37:57Z

pkg_resources/__init__.py

-        if group is not None:
-            return ep_map.get(group, {})
-        return ep_map
+        return ep_map.get(group, {}) if group is not None else ep_map


Function Distribution.get_entry_map refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2024-01-19T01:37:57Z