convenience mirroring some fixes from trunk

 - Legacy-Id: 16512

Author: rjsparks

ietf/checks.py

@@ -400,10 +400,10 @@ def maybe_patch_library(app_configs, **kwargs):
 @checks.register('security')
 def check_api_key_in_local_settings(app_configs, **kwargs):
     errors = []
-    import settings_local
+    import ietf.settings_local
     if settings.SERVER_MODE == 'production':
-        if not (    hasattr(settings_local, 'API_PUBLIC_KEY_PEM')
-                and hasattr(settings_local, 'API_PRIVATE_KEY_PEM')):
+        if not (    hasattr(ietf.settings_local, 'API_PUBLIC_KEY_PEM')
+                and hasattr(ietf.settings_local, 'API_PRIVATE_KEY_PEM')):
             errors.append(checks.Critical(
                 "There are no API key settings in your settings_local.py",
                 hint = dedent("""
@@ -417,8 +417,8 @@ def check_api_key_in_local_settings(app_configs, **kwargs):
                     """).replace('\n', '\n   ').rstrip(),
                 id = "datatracker.E0020",
             ))
-        elif not ( settings_local.API_PUBLIC_KEY_PEM == settings.API_PUBLIC_KEY_PEM
-                    and settings_local.API_PRIVATE_KEY_PEM == settings.API_PRIVATE_KEY_PEM ):
+        elif not ( ietf.settings_local.API_PUBLIC_KEY_PEM == settings.API_PUBLIC_KEY_PEM
+                    and ietf.settings_local.API_PRIVATE_KEY_PEM == settings.API_PRIVATE_KEY_PEM ):
             errors.append(checks.Critical(
                 "Your API key settings in your settings_local.py are not picked up in settings.",
                 hint = dedent("""

ietf/settings.py

@@ -1059,7 +1059,7 @@ def skip_unreadable_post(record):
 
 # Put the production SECRET_KEY in settings_local.py, and also any other
 # sensitive or site-specific changes.  DO NOT commit settings_local.py to svn.
-from settings_local import *            # pyflakes:ignore pylint: disable=wildcard-import
+from ietf.settings_local import *            # pyflakes:ignore pylint: disable=wildcard-import
 
 for app in INSTALLED_APPS:
     if app.startswith('ietf'):

ietf/utils/pdf.py

@@ -10,11 +10,11 @@
 def pdf_pages(filename):
     """Return number of pages in PDF."""
     try:
-        infile = io.open(filename, "r")
+        infile = io.open(filename, "rb")
     except IOError:
         return 0
     for line in infile:
-        m = re.match(r'\] /Count ([0-9]+)',line)
+        m = re.match(br'\] /Count ([0-9]+)',line)
         if m:
             return int(m.group(1))
     return 0