removed {has,get}attr calls on config to clean up code

freedomofpress · Oct 10, 2018 · 02de5cd · 02de5cd
1 parent b8eb1ea
commit 02de5cd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/securedrop/i18n.py b/securedrop/i18n.py
@@ -39,7 +39,7 @@ def setup_app(config, app):
     global LOCALES
     global babel
 
-    translation_dirs = getattr(config, 'TRANSLATION_DIRS', None)
+    translation_dirs = config.TRANSLATION_DIRS
 
     if translation_dirs is None:
             translation_dirs = \
@@ -63,8 +63,8 @@ def setup_app(config, app):
 
     LOCALES = _get_supported_locales(
         LOCALES,
-        getattr(config, 'SUPPORTED_LOCALES', None),
-        getattr(config, 'DEFAULT_LOCALE', None),
+        config.SUPPORTED_LOCALES,
+        config.DEFAULT_LOCALE,
         translation_directories)
 
     babel.localeselector(lambda: get_locale(config))
@@ -106,7 +106,7 @@ def get_locale(config):
     if locale:
         return locale
     else:
-        return getattr(config, 'DEFAULT_LOCALE', 'en_US')
+        return config.DEFAULT_LOCALE
 
 
 def get_text_direction(locale):

diff --git a/securedrop/journalist.py b/securedrop/journalist.py
@@ -8,5 +8,5 @@
 
 
 if __name__ == "__main__":  # pragma: no cover
-    debug = getattr(config, 'env', 'prod') != 'prod'
+    debug = config.env != 'prod'
     app.run(debug=debug, host='0.0.0.0', port=8081)  # nosec
diff --git a/securedrop/journalist_app/__init__.py b/securedrop/journalist_app/__init__.py
@@ -89,7 +89,7 @@ def _handle_http_exception(error):
     app.jinja_env.trim_blocks = True
     app.jinja_env.lstrip_blocks = True
     app.jinja_env.globals['version'] = version.__version__
-    if hasattr(config, 'CUSTOM_HEADER_IMAGE'):
+    if config.CUSTOM_HEADER_IMAGE:
         app.jinja_env.globals['header_image'] = \
             config.CUSTOM_HEADER_IMAGE  # type: ignore
         app.jinja_env.globals['use_custom_header_image'] = True

diff --git a/securedrop/source.py b/securedrop/source.py
@@ -8,5 +8,5 @@
 
 
 if __name__ == "__main__":  # pragma: no cover
-    debug = getattr(config, 'env', 'prod') != 'prod'
+    debug = config.env != 'prod'
     app.run(debug=debug, host='0.0.0.0', port=8080)  # nosec
diff --git a/securedrop/source_app/__init__.py b/securedrop/source_app/__init__.py
@@ -80,7 +80,7 @@ def handle_csrf_error(e):
     app.jinja_env.trim_blocks = True
     app.jinja_env.lstrip_blocks = True
     app.jinja_env.globals['version'] = version.__version__
-    if getattr(config, 'CUSTOM_HEADER_IMAGE', None):
+    if config.CUSTOM_HEADER_IMAGE:
         app.jinja_env.globals['header_image'] = \
             config.CUSTOM_HEADER_IMAGE  # type: ignore
         app.jinja_env.globals['use_custom_header_image'] = True