Merge pull request #253 from transtats/bugfix

few more fixes

dashboard/jobs_framework/action_mapper.py

@@ -317,7 +317,7 @@ def platform_pot_file(self, input, kwargs):
                         self.sandbox_path + 'platform.' + input.get('i18n_domain') + '.pot',
                         headers=headers
                     )
-                probable_versions = ('master', 'default', input['package'])
+                probable_versions = ('main', 'master', 'default', input['package'])
                 while_loop_counter = 0
                 while platform_pot_path == '404' and while_loop_counter < len(probable_versions):
                     url_kwargs['version'] = probable_versions[while_loop_counter]
@@ -510,7 +510,7 @@ def git_repository(self, input, kwargs):
             task_log.update(self._log_task(
                 input['log_f'], task_subject, 'Cloning failed. Details: %s' % trace_back
             ))
-            raise Exception("Cloning '%s' branch failed." % kwargs.get('branch', 'master'))
+            raise Exception("Cloning '%s' branch failed." % kwargs.get('branch', 'main'))
         else:
             if vars(clone_result).get('git_dir'):
                 task_log.update(self._log_task(

dashboard/managers/graphs.py

@@ -724,7 +724,7 @@ def get_locales_from_territory_id(self, territory_id):
             return territory_locales, territory_languages, ''
         two_char_country_code = COUNTRY_CODE_3to2_LETTERS.get(territory_id, '')
         if not two_char_country_code:
-            return territory_locales, ''
+            return territory_locales, territory_languages, ''
         territory_locales = langtable.list_locales(
             territoryId=two_char_country_code
         )
@@ -773,8 +773,7 @@ def get_territory_summary(self, territory_id):
         :param territory_id: three characters country code
         :return: related stats: dict
         """
-        related_locales, related_langs, country_code = \
-            self.get_locales_from_territory_id(territory_id)
+        related_locales, _, _ = self.get_locales_from_territory_id(territory_id)
         location_summary = self.get_reports(report_subject='location')
 
         if not related_locales or not location_summary:

dashboard/managers/inventory.py

@@ -617,7 +617,7 @@ def get_product_by_release(self, release_slug):
     def get_relbranch_name_slug_tuple(self):
         """
         Get release branch slug and name tuple
-        :return: (('master', 'master'), )
+        :return: (('main', 'main'), )
         """
         release_branches = self.get_release_branches(
             fields=('release_slug', 'release_name', 'track_trans_flag')

dashboard/managers/packages.py

@@ -911,7 +911,7 @@ def git_branches(self, package_name, repo_type='default', release=None):
         :param release: Release Slug
         :return: git branch(es)
         """
-        default_branch = ['master']
+        default_branch = ['main']
         package = self.get_packages([package_name])
         if not package:
             return default_branch
@@ -1044,7 +1044,7 @@ def calculate_branch_mapping(self, branch, from_branches):
         2. sort versions matching stream and then try to match version number
         3. try short forms combined with version number
         4. todo: fetch release dates and try matching with that
-        5. try finding default version: 'master' may be
+        5. try finding default version: 'main' may be
         6. if nothing works, return blank
         """
         match1 = difflib.get_close_matches(branch, from_branches)
@@ -1061,8 +1061,9 @@ def calculate_branch_mapping(self, branch, from_branches):
         if status2:
             return self._return_original_version(match3)
 
-        probable_branches = ['default', 'master', 'head', 'rawhide', 'devel', 'app',
-                             'core', 'translations', 'programs', self.package_name]
+        probable_branches = ['default', 'main', 'master', 'head',
+                             'rawhide', 'devel', 'app', 'core',
+                             'translations', 'programs', self.package_name]
 
         for version in probable_branches:
             if version in from_branches:

dashboard/tests/test_package.py

@@ -136,4 +136,4 @@ def xtest_git_branches(self):
             repo_type='l10n'
         )
         self.assertEqual(len(scm_branch), 2)
-        self.assertListEqual(scm_branch, ['autoupdate-potfiles', 'master'])
+        self.assertListEqual(scm_branch, ['autoupdate-potfiles', 'main'])

dashboard/views.py

@@ -580,7 +580,7 @@ def get_success_url(self):
 
     def get_initial(self):
         initials = {}
-        initials.update(dict(rule_relbranch='master'))
+        initials.update(dict(rule_relbranch='main'))
         return initials
 
     def get_form(self, form_class=None, data=None):
@@ -1176,10 +1176,8 @@ def schedule_job(request):
                 )
                 try:
                     job_uuid = job_manager.execute_job()
-                except Exception as e:
-                    error_msg = str(e) if len(str(e)) < 50 else str(e)[:50] + '...'
-                    message = "&nbsp;&nbsp;<span class='text-danger'>Alas! Something unexpected happened.<br/>" \
-                              "&nbsp;&nbsp;<small class='text-danger'>" + error_msg + " </small></span>"
+                except Exception:
+                    message = "&nbsp;&nbsp;<span class='text-danger'>Alas! Something unexpected happened.</span>"
                     return HttpResponse(message, status=500)
                 else:
                     if not request.POST.dict().get('SCRATCH', '') == 'ScratchRun':

transtats/settings/auth.py

@@ -7,6 +7,25 @@
     app_config_vars, INSTALLED_APPS, AUTHENTICATION_BACKENDS
 )
 
+__all__ = [
+    'FAS_AUTH',
+    'ADMINS',
+    'SECURE_PROXY_SSL_HEADER',
+    'ADMIN_INITIAL_PASSWORD',
+    'INSTALLED_APPS',
+    'AUTHENTICATION_BACKENDS',
+    'OIDC_RP_CLIENT_ID',
+    'OIDC_RP_CLIENT_SECRET',
+    'OIDC_OP_AUTHORIZATION_ENDPOINT',
+    'OIDC_OP_TOKEN_ENDPOINT',
+    'OIDC_OP_USER_ENDPOINT',
+    'OIDC_OP_JWKS_ENDPOINT',
+    'OIDC_RP_SIGN_ALGO',
+    'LOGOUT_REDIRECT_URL',
+    'REST_FRAMEWORK',
+    'CORS_ORIGIN_ALLOW_ALL'
+]
+
 FAS_AUTH = app_config_vars('TS_AUTH_SYSTEM') == 'fedora'
 
 ADMINS = (
@@ -36,5 +55,4 @@
     )
 }
 
-if FAS_AUTH:
-    CORS_ORIGIN_ALLOW_ALL = True
+CORS_ORIGIN_ALLOW_ALL = True if FAS_AUTH else False

transtats/settings/base.py

@@ -19,6 +19,39 @@
 # Core Django imports
 from django.core.exceptions import ImproperlyConfigured
 
+__all__ = [
+    'BASE_DIR',
+    'SECRET_KEY',
+    'INSTALLED_APPS',
+    'MIDDLEWARE',
+    'ROOT_URLCONF',
+    'TEMPLATES',
+    'AUTHENTICATION_BACKENDS',
+    'SESSION_ENGINE',
+    'SESSION_COOKIE_SECURE',
+    'WSGI_APPLICATION',
+    'LOGIN_REDIRECT_URL',
+    'CELERY_BROKER_URL',
+    'CELERY_TASK_SERIALIZER',
+    'CELERY_RESULT_SERIALIZER',
+    'CELERY_ACCEPT_CONTENT',
+    'CELERY_ENABLE_UTC',
+    'CELERY_BEAT_SCHEDULE',
+    'DATABASES',
+    'MIGRATE_INITIAL_DATA',
+    'AUTH_PASSWORD_VALIDATORS',
+    'LANGUAGE_CODE',
+    'TIME_ZONE',
+    'USE_I18N',
+    'USE_L10N',
+    'USE_TZ',
+    'STATICFILES_DIRS',
+    'STATIC_URL',
+    'STATIC_ROOT',
+    'CRISPY_TEMPLATE_PACK',
+    'CACHES'
+]
+
 # Imports from your apps
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)

transtats/settings/dev.py

@@ -9,6 +9,7 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.9/ref/settings/
 """
+import os
 
 from .base import *
 from .auth import *

transtats/settings/prod.py

@@ -9,9 +9,10 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.9/ref/settings/
 """
+import os
 
 from .base import *
-
+from .auth import *
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False

transtats/settings/test.py

@@ -9,6 +9,7 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.9/ref/settings/
 """
+import os
 
 from .base import *
 from .auth import *