clean-up unused variable and improve placement. update for Django 3.2

Author: TimidRobot

cc_legal_tools/settings/base.py

@@ -8,10 +8,6 @@
 import colorlog  # noqa: F401
 from django.conf.locale import LANG_INFO
 
-APP_NAME = "legal_tools"
-APP_LABEL = APP_NAME
-APP_VERBOSE_NAME = APP_NAME.replace("_", " ").title()
-
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 # SETTINGS_DIR is where this settings file is
 SETTINGS_DIR = os.path.dirname(os.path.abspath(__file__))

legal_tools/__init__.py

@@ -1,34 +0,0 @@
-# Standard library
-import re
-
-default_app_config = "legal_tools.apps.LegalToolsConfig"
-
-FREEDOM_LEVEL_MAX = 1
-FREEDOM_LEVEL_MID = 2
-FREEDOM_LEVEL_MIN = 3
-
-FREEDOM_COLORS = {
-    FREEDOM_LEVEL_MIN: "red",
-    FREEDOM_LEVEL_MID: "yellow",
-    FREEDOM_LEVEL_MAX: "green",
-}
-MISSING_LICENSES = [
-    "http://creativecommons.org/licenses/by-nc/2.1/",
-    "http://creativecommons.org/licenses/by-nd/2.1/",
-    "http://creativecommons.org/licenses/by-nc-nd/2.1/",
-    "http://creativecommons.org/licenses/by-sa/2.1/",
-    "http://creativecommons.org/licenses/by-nc-sa/2.1/",
-    "http://creativecommons.org/licenses/nc/2.0/",
-    "http://creativecommons.org/licenses/nc-sa/2.0/",
-    "http://creativecommons.org/licenses/by/2.1/",
-    "http://creativecommons.org/licenses/nd-nc/2.0/",
-    "http://creativecommons.org/licenses/by-nd-nc/2.0/",
-    "http://creativecommons.org/licenses/nd/2.0/",
-    "http://creativecommons.org/licenses/sa/2.0/",
-]
-
-# These mostly APPEAR to have the format X.Y, where X and Y are digits.
-# To be forgiving, we accept any mix of digits and ".".
-# There's also at least one with an empty version (MIT).
-VERSION_REGEX_STRING = r"[0-9.]+|"
-VERSION_REGEX = re.compile(VERSION_REGEX_STRING)

legal_tools/apps.py

@@ -8,12 +8,12 @@
 
 
 class LegalToolsConfig(AppConfig):
-    # required: must be the Full dotted path to the app
-    name = settings.APP_NAME
+    # required: must be the full dotted path to the app
+    name = "legal_tools"
     # optional: app label, must be unique in Django project
-    label = settings.APP_LABEL
+    label = name
     # optional: verbose name
-    verbose_name = settings.APP_VERBOSE_NAME
+    verbose_name = name.replace("_", " ").title()
 
     def ready(self):
         setup_to_call_git()

legal_tools/models.py

@@ -31,11 +31,12 @@
     map_django_to_redirects_language_codes,
     map_django_to_redirects_language_codes_lowercase,
 )
-from legal_tools import FREEDOM_LEVEL_MAX, FREEDOM_LEVEL_MID, FREEDOM_LEVEL_MIN
 from legal_tools.constants import EXCLUDED_LANGUAGE_IDENTIFIERS
 
+FREEDOM_LEVEL_MAX = 1
+FREEDOM_LEVEL_MID = 2
+FREEDOM_LEVEL_MIN = 3
 MAX_LANGUAGE_CODE_LENGTH = 15
-
 UNITS_LICENSES = [
     # Units are in all versions, unless otherwise noted:
     "by",

legal_tools/tests/test_models.py

@@ -8,18 +8,19 @@
 from django.utils.translation import override
 
 # First-party/Local
-from legal_tools import FREEDOM_LEVEL_MAX, FREEDOM_LEVEL_MID, FREEDOM_LEVEL_MIN
-from legal_tools.models import LegalCode, Tool
+from legal_tools.models import (
+    FREEDOM_LEVEL_MAX,
+    FREEDOM_LEVEL_MID,
+    FREEDOM_LEVEL_MIN,
+    LegalCode,
+    Tool,
+)
 from legal_tools.tests.factories import (
     LegalCodeFactory,
     ToolFactory,
     TranslationBranchFactory,
 )
 
-# TODO: update as part of translation rewrite
-# from i18n.transifex import TransifexHelper
-# from legal_tools.tests.test_transifex import TEST_TRANSIFEX_SETTINGS
-
 
 class LegalCodeQuerySetTest(TestCase):
     def test_translated(self):

legal_tools/tests/test_views.py

@@ -416,9 +416,9 @@ def test_view_deed_template_body_certification(self):
 
     def test_view_deed_template_body_unimplemented(self):
         lc = LegalCodeFactory(
-            tool__canonical_url="https://creativecommons.org/licenses/x/0",
+            tool__canonical_url="https://creativecommons.org/licenses/x/0.0",
             tool__unit="x",
-            tool__version="0",
+            tool__version="0.0",
             language_code="en",
         )
         url = lc.deed_url

legal_tools/urls.py

@@ -13,7 +13,6 @@
 
 # First-party/Local
 from i18n import LANGUAGE_CODE_REGEX_STRING
-from legal_tools import VERSION_REGEX_STRING
 from legal_tools.views import view_deed, view_legal_code, view_metadata
 
 
@@ -73,7 +72,7 @@ def to_url(self, value):
 
 class VersionConverter:
 
-    regex = VERSION_REGEX_STRING
+    regex = r"[0-9]+[.][0-9]+"  # X.Y
 
     def to_python(self, value):
         return value

manage.py

@@ -7,7 +7,7 @@
 # Third-party
 from django.conf import settings
 
-LOG = logging.getLogger(f"{settings.APP_NAME}.management.commands")
+LOG = logging.getLogger(f"management.commands")
 
 
 def main():