flake8_simplify 0.21.0__tar.gz → 0.22.0__tar.gz

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.21.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.21.0 → flake8_simplify-0.22.0}/.github/workflows/unit-test.yml

@@ -18,9 +18,9 @@ jobs:
         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

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

@@ -12,16 +12,14 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
     -   id: mixed-line-ending
+        args: ['--fix=lf']
     -   id: check-added-large-files
         args: ['--maxkb=500']
-# -   repo: https://gitlab.com/pycqa/flake8
-#     rev: 3.8.3
-#     hooks:
-#     -   id: flake8
 -   repo: https://github.com/psf/black
     rev: 23.9.1
     hooks:
     -   id: black
+        args: [--target-version, py36]
 -   repo: https://github.com/asottile/blacken-docs
     rev: 1.16.0
     hooks:
@@ -37,8 +35,14 @@ repos:
     hooks:
     -   id: pyupgrade
         args: [--py36-plus]
+-   repo: https://github.com/pycqa/flake8
+    rev: 6.1.0
+    hooks:
+    -   id: flake8
+        args: ["--ignore", "E,W,F"]
+
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.5.1
+    rev: 'v1.5.1'
     hooks:
     -   id: mypy
 -   repo: https://github.com/pre-commit/mirrors-isort

{flake8_simplify-0.21.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.21.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>
@@ -21,6 +21,7 @@ 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"

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.21.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)}"

{flake8_simplify-0.21.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.21.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.21.0 → flake8_simplify-0.22.0}/pyproject.toml

@@ -6,7 +6,7 @@ requires = [
 
 [project]
 name = "flake8_simplify"
-version = "0.21.0"
+version = "0.22.0"
 description = "flake8 plugin which checks for code that can be simplified"
 keywords = [
   "flake8",

flake8_simplify-0.21.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)