flake8_simplify 0.20.0__tar.gz → 0.22.0__tar.gz

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/.flake8

@@ -3,3 +3,4 @@ ignore = E203, W503, PT007
 exclude = build/*
 per-file-ignores =
     tests/*: ASS001
+max-line-length = 88

flake8_simplify-0.22.0/.github/dependabot.yml

@@ -0,0 +1,9 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/.github/workflows/lint.yml

@@ -18,9 +18,9 @@ jobs:
         python-version: [3.8]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/.github/workflows/unit-test.yml

@@ -15,14 +15,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", 3.11]
+        python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/.gitignore

@@ -138,3 +138,5 @@ tests/reports/
 *.code-workspace
 
 html/
+
+.envrc

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 # pre-commit run --all-files
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.4.0
     hooks:
     -   id: check-ast
     -   id: check-byte-order-marker
@@ -12,33 +12,40 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
     -   id: mixed-line-ending
-# -   repo: https://gitlab.com/pycqa/flake8
-#     rev: 3.8.3
-#     hooks:
-#     -   id: flake8
--   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.942
-    hooks:
-    -   id: mypy
--   repo: https://github.com/asottile/seed-isort-config
-    rev: v2.2.0
-    hooks:
-    -   id: seed-isort-config
--   repo: https://github.com/pre-commit/mirrors-isort
-    rev: v5.10.1
-    hooks:
-    -   id: isort
+        args: ['--fix=lf']
+    -   id: check-added-large-files
+        args: ['--maxkb=500']
 -   repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 23.9.1
     hooks:
     -   id: black
+        args: [--target-version, py36]
+-   repo: https://github.com/asottile/blacken-docs
+    rev: 1.16.0
+    hooks:
+    -   id: blacken-docs
+        additional_dependencies: [black==22.1.0]
+-   repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.0.290
+    hooks:
+    -   id: ruff
+        args: ['--fix']
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.1
+    rev: v3.12.0
     hooks:
     -   id: pyupgrade
         args: [--py36-plus]
--   repo: https://github.com/asottile/blacken-docs
-    rev: v1.12.1
+-   repo: https://github.com/pycqa/flake8
+    rev: 6.1.0
     hooks:
-    -   id: blacken-docs
-        additional_dependencies: [black==22.1.0]
+    -   id: flake8
+        args: ["--ignore", "E,W,F"]
+
+-   repo: https://github.com/pre-commit/mirrors-mypy
+    rev: 'v1.5.1'
+    hooks:
+    -   id: mypy
+-   repo: https://github.com/pre-commit/mirrors-isort
+    rev: v5.10.1
+    hooks:
+    -   id: isort

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/CHANGELOG.md

@@ -1,6 +1,13 @@
 Release History
 ===============
 
+### 0.21.0
+Release on 23.09.2023
+
+New rules:
+
+* SIM911: zip(dict.keys(), dict.values()) → dict.items()
+
 ### 0.20.0
 Release on 30.03.2023
 

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: flake8_simplify
-Version: 0.20.0
+Version: 0.22.0
 Summary: flake8 plugin which checks for code that can be simplified
 Keywords: flake8
 Author-email: Martin Thoma <info@martin-thoma.de>
@@ -15,12 +15,13 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development
 Classifier: Framework :: Flake8
+License-File: LICENSE
 Requires-Dist: astor>=0.1
 Requires-Dist: flake8>=3.7
 Requires-Dist: importlib-metadata>=0.9; python_version < "3.8"
@@ -43,7 +44,7 @@ Install with `pip`:
 pip install flake8-simplify
 ```
 
-Python 3.6 to 3.10 are supported.
+Python 3.8 to 3.11 are supported.
 
 
 ## Usage
@@ -105,6 +106,7 @@ Simplifying usage of dictionaries:
 
 * [`SIM401`](https://github.com/MartinThoma/flake8-simplify/issues/72): Use 'a_dict.get(key, "default_value")' instead of an if-block ([example](#SIM401))
 * [`SIM118`](https://github.com/MartinThoma/flake8-simplify/issues/40): Use 'key in dict' instead of 'key in dict.keys()' ([example](#SIM118))
+* `SIM119` Reserved for [SIM911](#sim911) once it's stable
 
 General Code Style:
 
@@ -134,6 +136,7 @@ Current experimental rules:
 * [`SIM908`](https://github.com/MartinThoma/flake8-simplify/issues/50): Use dict.get(key) ([example](#SIM908))
 * [`SIM909`](https://github.com/MartinThoma/flake8-simplify/issues/114): Avoid reflexive assignments ([example](#SIM909))
 * [`SIM910`](https://github.com/MartinThoma/flake8-simplify/issues/171): Avoid to use `dict.get(key, None)` ([example](#SIM910))
+* [`SIM911`](https://github.com/MartinThoma/flake8-simplify/issues/161): Avoid using `zip(dict.keys(), dict.values())` ([example](#SIM911))
 
 ## Disabling Rules
 

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/README.md

@@ -15,7 +15,7 @@ Install with `pip`:
 pip install flake8-simplify
 ```
 
-Python 3.6 to 3.10 are supported.
+Python 3.8 to 3.11 are supported.
 
 
 ## Usage
@@ -77,6 +77,7 @@ Simplifying usage of dictionaries:
 
 * [`SIM401`](https://github.com/MartinThoma/flake8-simplify/issues/72): Use 'a_dict.get(key, "default_value")' instead of an if-block ([example](#SIM401))
 * [`SIM118`](https://github.com/MartinThoma/flake8-simplify/issues/40): Use 'key in dict' instead of 'key in dict.keys()' ([example](#SIM118))
+* `SIM119` Reserved for [SIM911](#sim911) once it's stable
 
 General Code Style:
 
@@ -106,6 +107,7 @@ Current experimental rules:
 * [`SIM908`](https://github.com/MartinThoma/flake8-simplify/issues/50): Use dict.get(key) ([example](#SIM908))
 * [`SIM909`](https://github.com/MartinThoma/flake8-simplify/issues/114): Avoid reflexive assignments ([example](#SIM909))
 * [`SIM910`](https://github.com/MartinThoma/flake8-simplify/issues/171): Avoid to use `dict.get(key, None)` ([example](#SIM910))
+* [`SIM911`](https://github.com/MartinThoma/flake8-simplify/issues/161): Avoid using `zip(dict.keys(), dict.values())` ([example](#SIM911))
 
 ## Disabling Rules
 

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/flake8_simplify/__init__.py

@@ -20,6 +20,7 @@ from flake8_simplify.rules.ast_call import (
     get_sim905,
     get_sim906,
     get_sim910,
+    get_sim911,
 )
 from flake8_simplify.rules.ast_classdef import get_sim120
 from flake8_simplify.rules.ast_compare import get_sim118, get_sim300
@@ -76,6 +77,7 @@ class Visitor(ast.NodeVisitor):
         self.errors += get_sim905(node)
         self.errors += get_sim906(node)
         self.errors += get_sim910(Call(node))
+        self.errors += get_sim911(node)
         self.generic_visit(node)
 
     def visit_With(self, node: ast.With) -> Any:

flake8_simplify-0.22.0/flake8_simplify/constants.py

@@ -0,0 +1,12 @@
+# Core Library
+import ast
+
+# ast.Constant in Python 3.8, ast.NameConstant in Python 3.6 and 3.7
+if hasattr(ast, 'NameConstant'):
+  BOOL_CONST_TYPES = (ast.Constant, ast.NameConstant)
+  AST_CONST_TYPES = (ast.Constant, ast.NameConstant, ast.Str, ast.Num)
+  STR_TYPES = (ast.Constant, ast.Str)
+else:
+  BOOL_CONST_TYPES = (ast.Constant,)
+  AST_CONST_TYPES = (ast.Constant,)
+  STR_TYPES = (ast.Constant,)

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/flake8_simplify/rules/ast_call.py

@@ -99,14 +99,14 @@ def get_sim905(node: ast.Call) -> List[Tuple[int, int, str]]:
     if not (
         isinstance(node.func, ast.Attribute)
         and node.func.attr == "split"
-        and isinstance(node.func.value, (ast.Str, ast.Constant))
+        and isinstance(node.func.value, ast.Constant) and isinstance(node.func.value.value, str)
     ):
         return errors
 
     if isinstance(node.func.value, ast.Constant):
         value = node.func.value.value
     else:
-        value = node.func.value.s
+        value = node.func.value.value
 
     expected = json.dumps(value.split())
     actual = to_source(node.func.value) + ".split()"
@@ -161,8 +161,8 @@ def get_sim906(node: ast.Call) -> List[Tuple[int, int, str]]:
                 names = names + get_os_path_join_args(arg)
             elif isinstance(arg, ast.Name):
                 names.append(arg.id)
-            elif isinstance(arg, ast.Str):
-                names.append(f"'{arg.s}'")
+            elif isinstance(arg, ast.Constant) and isinstance(arg.value, str):
+                names.append(f"'{arg.value}'")
             else:
                 logger.debug(
                     f"Unexpected os.path.join arg: {arg} -- {to_source(arg)}"
@@ -233,3 +233,69 @@ def get_sim910(node: Call) -> List[Tuple[int, int, str]]:
         )
     )
     return errors
+
+
+def get_sim911(node: ast.AST) -> List[Tuple[int, int, str]]:
+    """
+    Find nodes representing the expression "zip(_.keys(), _.values())".
+
+    Returns a list of tuples containing the line number and column offset
+    of each identified node.
+
+    Expr(
+        value=Call(
+            func=Name(id='zip', ctx=Load()),
+            args=[
+                Call(
+                    func=Attribute(
+                        value=Name(id='_', ctx=Load()),
+                        attr='keys',
+                        ctx=Load()),
+                    args=[],
+                    keywords=[]),
+                Call(
+                    func=Attribute(
+                        value=Name(id='_', ctx=Load()),
+                        attr='values',
+                        ctx=Load()),
+                    args=[],
+                    keywords=[])],
+            keywords=[
+                keyword(
+                    arg='strict',
+                    value=Constant(value=False))
+                ]
+            )
+        )
+    """
+    RULE = (
+        "SIM911 Use '{name}.items()' instead of "
+        "'zip({name}.keys(), {name}.values())'"
+    )
+    errors: List[Tuple[int, int, str]] = []
+
+    if isinstance(node, ast.Call) and (
+        isinstance(node.func, ast.Name)
+        and node.func.id == "zip"
+        and len(node.args) == 2
+    ):
+        first_arg, second_arg = node.args
+        if (
+            isinstance(first_arg, ast.Call)
+            and isinstance(first_arg.func, ast.Attribute)
+            and isinstance(first_arg.func.value, ast.Name)
+            and first_arg.func.attr == "keys"
+            and isinstance(second_arg, ast.Call)
+            and isinstance(second_arg.func, ast.Attribute)
+            and isinstance(second_arg.func.value, ast.Name)
+            and second_arg.func.attr == "values"
+            and first_arg.func.value.id == second_arg.func.value.id
+        ):
+            errors.append(
+                (
+                    node.lineno,
+                    node.col_offset,
+                    RULE.format(name=first_arg.func.value.id),
+                )
+            )
+    return errors

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/flake8_simplify/rules/ast_for.py

@@ -50,10 +50,12 @@ def get_sim104(node: ast.For) -> List[Tuple[int, int, str]]:
         return errors
 
     parent = getattr(node, "parent", None)
-    while (parent
-           and hasattr(parent, "parent")
-           and parent.parent is not parent
-           and not isinstance(parent, ast.AsyncFunctionDef)):
+    while (
+        parent
+        and hasattr(parent, "parent")
+        and parent.parent is not parent
+        and not isinstance(parent, ast.AsyncFunctionDef)
+    ):
         parent = getattr(parent, "parent", None)
 
     if isinstance(parent, ast.AsyncFunctionDef):  # type: ignore

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/flake8_simplify/rules/ast_if.py

@@ -41,8 +41,8 @@ def get_sim102(node: ast.If) -> List[Tuple[int, int, str]]:
         and isinstance(node.test.left, ast.Name)
         and node.test.left.id == "__name__"
         and len(node.test.comparators) == 1
-        and isinstance(node.test.comparators[0], ast.Str)
-        and node.test.comparators[0].s == "__main__"
+        and isinstance(node.test.comparators[0], ast.Constant) and isinstance(node.test.comparators[0].value, str)
+        and node.test.comparators[0].value == "__main__"
     )
     if is_main_check:
         return errors
@@ -248,14 +248,14 @@ def get_sim116(node: ast.If) -> List[Tuple[int, int, str]]:
     assert isinstance(child, ast.If), "hint for mypy"
     else_value: Optional[str] = None
     key_value_pairs: Dict[Any, Any]
-    if isinstance(node.test.comparators[0], ast.Str):
+    if isinstance(node.test.comparators[0], ast.Constant) and isinstance(node.test.comparators[0].value, str):
         value = to_source(node.body[0].value)
         if value[0] == '"' and value[-1] == '"':
             value = value[1:-1]
-        key_value_pairs = {node.test.comparators[0].s: value}
-    elif isinstance(node.test.comparators[0], ast.Num):
+        key_value_pairs = {node.test.comparators[0].value: value}
+    elif isinstance(node.test.comparators[0], ast.Constant) and isinstance(node.test.comparators[0].value, (int, float, complex)):
         key_value_pairs = {
-            node.test.comparators[0].n: to_source(node.body[0].value)
+            node.test.comparators[0].value: to_source(node.body[0].value)
         }
     else:
         key_value_pairs = {
@@ -281,10 +281,10 @@ def get_sim116(node: ast.If) -> List[Tuple[int, int, str]]:
             # See https://github.com/MartinThoma/flake8-simplify/issues/113
             return errors
         key: Any
-        if isinstance(child.test.comparators[0], ast.Str):
-            key = child.test.comparators[0].s
-        elif isinstance(child.test.comparators[0], ast.Num):
-            key = child.test.comparators[0].n
+        if isinstance(child.test.comparators[0], ast.Constant) and isinstance(child.test.comparators[0].value, str):
+            key = child.test.comparators[0].value
+        elif isinstance(child.test.comparators[0], ast.Constant) and isinstance(child.test.comparators[0].value, (int, float, complex)):
+            key = child.test.comparators[0].value
         else:
             key = child.test.comparators[0].value
 

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/flake8_simplify/utils.py

@@ -182,7 +182,7 @@ def get_if_body_pairs(node: ast.If) -> List[Tuple[ast.expr, List[ast.stmt]]]:
 def is_constant_increase(expr: ast.AugAssign) -> bool:
     return isinstance(expr.op, ast.Add) and (
         (isinstance(expr.value, ast.Constant) and expr.value.value == 1)
-        or (isinstance(expr.value, ast.Num) and expr.value.n == 1)
+        or (isinstance(expr.value, ast.Constant) and isinstance(expr.value.value, (int, float, complex)) and expr.value.value == 1)
     )
 
 

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/pyproject.toml

@@ -6,7 +6,7 @@ requires = [
 
 [project]
 name = "flake8_simplify"
-version = "0.20.0"
+version = "0.22.0"
 description = "flake8 plugin which checks for code that can be simplified"
 keywords = [
   "flake8",
@@ -29,10 +29,10 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Topic :: Software Development",
     "Framework :: Flake8",
 ]
@@ -57,7 +57,7 @@ namespaces = false
 
 [tool.black]
 line-length = 79
-target-version = ['py37']
+target-version = ['py38']
 
 [tool.mutmut]
 backup = "False"

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/requirements/dev.txt

@@ -4,87 +4,84 @@
 #
 #    pip-compile requirements/dev.in
 #
-attrs==21.4.0
-    # via pytest
-certifi==2021.10.8
+build==1.0.3
+    # via pip-tools
+certifi==2023.7.22
     # via requests
-cfgv==3.3.1
+cfgv==3.4.0
     # via pre-commit
-charset-normalizer==2.0.12
+charset-normalizer==3.2.0
     # via requests
-click==8.0.4
+click==8.1.7
     # via pip-tools
-coverage[toml]==6.3.2
+coverage[toml]==7.3.1
     # via pytest-cov
-distlib==0.3.4
+distlib==0.3.7
     # via virtualenv
-docutils==0.18.1
+docutils==0.20.1
     # via flit
-filelock==3.6.0
+exceptiongroup==1.1.3
+    # via pytest
+filelock==3.12.4
     # via virtualenv
-flit==3.8.0
+flit==3.9.0
     # via -r requirements/dev.in
-flit-core==3.8.0
+flit-core==3.9.0
     # via flit
-identify==2.4.12
+identify==2.5.29
     # via pre-commit
-idna==3.3
+idna==3.4
     # via requests
-iniconfig==1.1.1
+iniconfig==2.0.0
     # via pytest
-jinja2==3.1.1
+jinja2==3.1.2
     # via junit2html
-junit2html==30.0.6
+junit2html==30.1.3
     # via -r requirements/dev.in
-markupsafe==2.1.1
+markupsafe==2.1.3
     # via jinja2
-nodeenv==1.6.0
+nodeenv==1.8.0
     # via pre-commit
-packaging==21.3
-    # via pytest
-pep517==0.12.0
-    # via pip-tools
-pip-tools==6.5.1
+packaging==23.1
+    # via
+    #   build
+    #   pytest
+pip-tools==7.3.0
     # via -r requirements/dev.in
-platformdirs==2.5.1
+platformdirs==3.10.0
     # via virtualenv
-pluggy==1.0.0
+pluggy==1.3.0
     # via pytest
-pre-commit==2.17.0
+pre-commit==3.4.0
     # via -r requirements/dev.in
-py==1.11.0
-    # via pytest
-pyparsing==3.0.7
-    # via packaging
-pytest==7.1.1
+pyproject-hooks==1.0.0
+    # via build
+pytest==7.4.2
     # via
     #   -r requirements/dev.in
     #   pytest-cov
     #   pytest-timeout
-pytest-cov==3.0.0
+pytest-cov==4.1.0
     # via -r requirements/dev.in
 pytest-timeout==2.1.0
     # via -r requirements/dev.in
-pyyaml==6.0
+pyyaml==6.0.1
     # via pre-commit
-requests==2.27.1
+requests==2.31.0
     # via flit
-six==1.16.0
-    # via virtualenv
-toml==0.10.2
-    # via pre-commit
 tomli==2.0.1
     # via
+    #   build
     #   coverage
-    #   pep517
+    #   pip-tools
     #   pytest
 tomli-w==1.0.0
     # via flit
-urllib3==1.26.9
+urllib3==2.0.5
     # via requests
-virtualenv==20.14.0
+virtualenv==20.24.5
     # via pre-commit
-wheel==0.37.1
+wheel==0.41.2
     # via
     #   -r requirements/dev.in
     #   pip-tools

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/requirements/lint.txt

@@ -1,21 +1,20 @@
 #
-# This file is autogenerated by pip-compile with python 3.10
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
 #
 #    pip-compile requirements/lint.in
 #
-attrs==21.4.0
+attrs==23.1.0
     # via
     #   flake8-bugbear
     #   flake8-eradicate
-    #   flake8-implicit-str-concat
-black==22.1.0
+black==23.9.1
     # via -r requirements/lint.in
-click==8.0.4
+click==8.1.7
     # via black
-eradicate==2.0.0
+eradicate==2.3.0
     # via flake8-eradicate
-flake8==4.0.1
+flake8==6.1.0
     # via
     #   -r requirements/lint.in
     #   flake8-bugbear
@@ -26,59 +25,59 @@ flake8==4.0.1
     #   flake8-isort
     #   flake8-raise
     #   flake8-string-format
-flake8-bugbear==22.3.23
+flake8-bugbear==23.9.16
     # via -r requirements/lint.in
-flake8-builtins==1.5.3
+flake8-builtins==2.1.0
     # via -r requirements/lint.in
-flake8-comprehensions==3.8.0
+flake8-comprehensions==3.14.0
     # via -r requirements/lint.in
-flake8-eradicate==1.2.0
+flake8-eradicate==1.5.0
     # via -r requirements/lint.in
-flake8-executable==2.1.1
+flake8-executable==2.1.3
     # via -r requirements/lint.in
-flake8-implicit-str-concat==0.3.0
+flake8-implicit-str-concat==0.4.0
     # via -r requirements/lint.in
-flake8-isort==4.1.1
+flake8-isort==6.1.0
     # via -r requirements/lint.in
-flake8-plugin-utils==1.3.2
+flake8-plugin-utils==1.3.3
     # via flake8-pytest-style
-flake8-pytest-style==1.6.0
+flake8-pytest-style==1.7.2
     # via -r requirements/lint.in
 flake8-raise==0.0.5
     # via -r requirements/lint.in
 flake8-string-format==0.3.0
     # via -r requirements/lint.in
-isort==5.10.1
+isort==5.12.0
     # via flake8-isort
-mccabe==0.6.1
+mccabe==0.7.0
     # via
     #   -r requirements/lint.in
     #   flake8
-more-itertools==8.12.0
-    # via flake8-implicit-str-concat
-mypy==0.942
+mypy==1.5.1
     # via -r requirements/lint.in
-mypy-extensions==0.4.3
+mypy-extensions==1.0.0
     # via
     #   black
     #   mypy
-pathspec==0.9.0
+packaging==23.1
     # via black
-platformdirs==2.5.1
+pathspec==0.11.2
     # via black
-pycodestyle==2.8.0
+platformdirs==3.10.0
+    # via black
+pycodestyle==2.11.0
     # via flake8
-pydocstyle==6.1.1
+pydocstyle==6.3.0
     # via -r requirements/lint.in
-pyflakes==2.4.0
+pyflakes==3.1.0
     # via flake8
 snowballstemmer==2.2.0
     # via pydocstyle
-testfixtures==6.18.5
-    # via flake8-isort
 tomli==2.0.1
     # via
     #   black
     #   mypy
-typing-extensions==4.1.1
-    # via mypy
+typing-extensions==4.8.0
+    # via
+    #   black
+    #   mypy

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/tests/test_900_rules.py

@@ -204,3 +204,34 @@ def test_sim910(s, msg):
     expected = {msg} if msg is not None else set()
     results = _results(s)
     assert results == expected
+
+
+@pytest.mark.parametrize(
+    ("s", "expected"),
+    (
+        (
+            "zip(d.keys(), d.values())",
+            {
+                "1:0 SIM911 Use 'd.items()' instead of 'zip(d.keys(), d.values())'"
+            },
+        ),
+        (
+            "zip(d.keys(), d.keys())",
+            None,
+        ),
+        (
+            "zip(d1.keys(), d2.values())",
+            None,
+        ),
+        (
+            "zip(d1.keys(), values)",
+            None,
+        ),
+        (
+            "zip(keys, values)",
+            None,
+        ),
+    ),
+)
+def test_sim911(s, expected):
+    assert _results(s) == (expected or set())

{flake8_simplify-0.20.0 → flake8_simplify-0.22.0}/tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = lint,py36,py37,py38,py39,python3.10
+envlist = lint,py38,py39,py310,py311
 
 [testenv]
 deps =

flake8_simplify-0.20.0/flake8_simplify/constants.py

@@ -1,7 +0,0 @@
-# Core Library
-import ast
-
-# ast.Constant in Python 3.8, ast.NameConstant in Python 3.6 and 3.7
-BOOL_CONST_TYPES = (ast.Constant, ast.NameConstant)
-AST_CONST_TYPES = (ast.Constant, ast.NameConstant, ast.Str, ast.Num)
-STR_TYPES = (ast.Constant, ast.Str)