Fix name clashes with python built-ins

martinburchell · martinburchell · commit 37d3257fb667 · 2025-05-06T10:23:53.000+01:00
This is preventing us from doing this in extract_text.py:
from email.parser import Parser as EmailParser

Because email already exists as a module
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -18,10 +18,14 @@ repos:
     rev: 5.0.4
     hooks:
     -   id: flake8
+        additional_dependencies:
+        - flake8-builtins==2.5.0
 -   repo: https://github.com/asottile/yesqa
     rev: v1.5.0
     hooks:
     -   id: yesqa
+        additional_dependencies:
+        - flake8-builtins==2.5.0
 -   repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.9.0
     hooks:
diff --git a/cardinal_pythonlib/django/fields/jsonclassfield.py b/cardinal_pythonlib/django/fields/jsonclassfield.py
@@ -130,7 +130,7 @@ def my_decoder_hook(d: Dict) -> Any:
 # noinspection PyUnresolvedReferences
 from django.db.models import TextField
 
-from cardinal_pythonlib.json.serialize import json_decode, json_encode
+from cardinal_pythonlib.json_utils.serialize import json_decode, json_encode
 
 
 # =============================================================================
diff --git a/cardinal_pythonlib/django/function_cache.py b/cardinal_pythonlib/django/function_cache.py
@@ -36,7 +36,7 @@
 from django.core.cache import cache  # default cache
 
 from cardinal_pythonlib.logs import get_brace_style_log_with_null_handler
-from cardinal_pythonlib.json.serialize import json_encode
+from cardinal_pythonlib.json_utils.serialize import json_encode
 
 log = get_brace_style_log_with_null_handler(__name__)
 
diff --git a/cardinal_pythonlib/django/middleware.py b/cardinal_pythonlib/django/middleware.py
@@ -28,7 +28,7 @@
 
 import logging
 import os
-from re import compile
+import re
 import sys
 from typing import Optional
 
@@ -107,9 +107,9 @@ def process_exception(
 Modified according to: https://djangosnippets.org/snippets/2845/
 """
 
-# EXEMPT_URLS = [compile(settings.LOGIN_URL.lstrip('/'))]
+# EXEMPT_URLS = [re.compile(settings.LOGIN_URL.lstrip('/'))]
 # if hasattr(settings, 'LOGIN_EXEMPT_URLS'):
-#     EXEMPT_URLS += [compile(expr) for expr in settings.LOGIN_EXEMPT_URLS]
+#     EXEMPT_URLS += [re.compile(expr) for expr in settings.LOGIN_EXEMPT_URLS]
 #
 #
 # class LoginRequiredMiddleware:
@@ -166,10 +166,10 @@ def process_exception(
 # 3. RNC; composite of those patterns.
 # -----------------------------------------------------------------------------
 
-EXEMPT_URLS = [compile(settings.LOGIN_URL.lstrip("/"))]
+EXEMPT_URLS = [re.compile(settings.LOGIN_URL.lstrip("/"))]
 if hasattr(settings, "LOGIN_EXEMPT_URLS"):
     EXEMPT_URLS += [
-        compile(expr.lstrip("/")) for expr in settings.LOGIN_EXEMPT_URLS
+        re.compile(expr.lstrip("/")) for expr in settings.LOGIN_EXEMPT_URLS
     ]
 
 
diff --git a/cardinal_pythonlib/email_utils/__init__.py b/cardinal_pythonlib/email_utils/__init__.py
diff --git a/cardinal_pythonlib/email_utils/mailboxpurge.py b/cardinal_pythonlib/email_utils/mailboxpurge.py
diff --git a/cardinal_pythonlib/email_utils/sendmail.py b/cardinal_pythonlib/email_utils/sendmail.py
diff --git a/cardinal_pythonlib/email_utils/tests/sendmail_tests.py b/cardinal_pythonlib/email_utils/tests/sendmail_tests.py
diff --git a/cardinal_pythonlib/json_utils/__init__.py b/cardinal_pythonlib/json_utils/__init__.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# cardinal_pythonlib/json/__init__.py
+# cardinal_pythonlib/json_utils/__init__.py
 
 """
 ===============================================================================
diff --git a/cardinal_pythonlib/json_utils/serialize.py b/cardinal_pythonlib/json_utils/serialize.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# cardinal_pythonlib/json/serialize.py
+# cardinal_pythonlib/json_utils/serialize.py
 
 """
 ===============================================================================
diff --git a/cardinal_pythonlib/json_utils/typing_helpers.py b/cardinal_pythonlib/json_utils/typing_helpers.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# cardinal_pythonlib/json/typing_helpers.py
+# cardinal_pythonlib/json_utils/typing_helpers.py
 
 """
 ===============================================================================
diff --git a/cardinal_pythonlib/profiling.py b/cardinal_pythonlib/profiling.py
diff --git a/cardinal_pythonlib/tools/explore_clang_format_config.py b/cardinal_pythonlib/tools/explore_clang_format_config.py
@@ -60,7 +60,11 @@ def monitor_diff(filenames: List[str], meld_exe: str) -> subprocess.Popen:
 
 
 def clang_format(
-    config: str, src: str, dest: str, dir: str, clang_format_exe: str
+    config: str,
+    src: str,
+    dest: str,
+    dir: str,  # noqa: A002
+    clang_format_exe: str,
 ) -> None:
     """
     Rungs clang-format, formatting a source file to a destination file using a
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -32,7 +32,7 @@
 
 project = "cardinal_pythonlib"
 # noinspection PyShadowingBuiltins
-copyright = "2009-2020, Rudolf Cardinal"
+copyright = "2009-2020, Rudolf Cardinal"  # noqa: A001
 author = "Rudolf Cardinal"
 
 # The short X.Y version
diff --git a/setup.cfg b/setup.cfg
@@ -13,7 +13,7 @@ linters=pycodestyle,pyflakes
 max-line-length=79
 # Not compatible with Black and not PEP8 apparently
 # E203: Whitespace before ':'
-extend-ignore = E203
+extend-ignore = A003,E203
 
 [mypy]
 # MyPy is a static type checker. It will not execute the code!
