Clean PEP8 violations

2015-11-22 14:03:47 +00:00 · 2015-11-22 14:03:47 +00:00 · b11055807f
commit b11055807f
parent be0531ec30
20 changed files with 153 additions and 132 deletions
--- a/gnuviechadmin/gnuviechadmin/celery.py
+++ b/gnuviechadmin/gnuviechadmin/celery.py
@ -12,6 +12,7 @@ os.environ.setdefault('DJANGO_SETTINGS_MODULE',

 app = Celery('gnuviechadmin')

+
 def get_installed_apps():
    return settings.INSTALLED_APPS

--- a/gnuviechadmin/gnuviechadmin/context_processors.py
+++ b/gnuviechadmin/gnuviechadmin/context_processors.py
@ -13,7 +13,6 @@ from gnuviechadmin import __version__ as gvaversion
 _LOGGER = logging.getLogger(__name__)


-
 def navigation(request):
    """
    Add navigation items to the request context.
--- a/gnuviechadmin/gnuviechadmin/settings/init.py
+++ b/gnuviechadmin/gnuviechadmin/settings/init.py
@ -1 +0,0 @@
-
--- a/gnuviechadmin/gnuviechadmin/settings/base.py
+++ b/gnuviechadmin/gnuviechadmin/settings/base.py
@ -27,7 +27,7 @@ def get_env_variable(var_name):
        raise ImproperlyConfigured(error_msg)


-########## PATH CONFIGURATION
+# ######### PATH CONFIGURATION
 # Absolute filesystem path to the Django project directory:
 DJANGO_ROOT = dirname(dirname(abspath(__file__)))

@ -40,19 +40,19 @@ SITE_NAME = basename(DJANGO_ROOT)
 # Add our project to our pythonpath, this way we don't need to type our project
 # name in our dotted import paths:
 path.append(DJANGO_ROOT)
-########## END PATH CONFIGURATION
+# ######### END PATH CONFIGURATION


-########## DEBUG CONFIGURATION
+# ######### DEBUG CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#debug
 DEBUG = False

 # See: https://docs.djangoproject.com/en/dev/ref/settings/#template-debug
 TEMPLATE_DEBUG = DEBUG
-########## END DEBUG CONFIGURATION
+# ######### END DEBUG CONFIGURATION


-########## MANAGER CONFIGURATION
+# ######### MANAGER CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#admins
 ADMINS = (
    (get_env_variable('GVA_ADMIN_NAME'), get_env_variable('GVA_ADMIN_EMAIL')),
@ -60,10 +60,10 @@ ADMINS = (

 # See: https://docs.djangoproject.com/en/dev/ref/settings/#managers
 MANAGERS = ADMINS
-########## END MANAGER CONFIGURATION
+# ######### END MANAGER CONFIGURATION


-########## DATABASE CONFIGURATION
+# ######### DATABASE CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#databases
 DATABASES = {
    'default': {
@ -75,10 +75,10 @@ DATABASES = {
        'PORT': get_env_variable('GVA_PGSQL_PORT'),
    }
 }
-########## END DATABASE CONFIGURATION
+# ######### END DATABASE CONFIGURATION


-########## GENERAL CONFIGURATION
+# ######### GENERAL CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#time-zone
 TIME_ZONE = 'Europe/Berlin'

@ -98,7 +98,7 @@ USE_L10N = True

 # See: https://docs.djangoproject.com/en/dev/ref/settings/#use-tz
 USE_TZ = True
-########## END GENERAL CONFIGURATION
+# ######### END GENERAL CONFIGURATION


 LOCALE_PATHS = (
@ -106,59 +106,59 @@ LOCALE_PATHS = (
 )


-########## MEDIA CONFIGURATION
+# ######### MEDIA CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#media-root
 MEDIA_ROOT = normpath(join(SITE_ROOT, 'media'))

 # See: https://docs.djangoproject.com/en/dev/ref/settings/#media-url
 MEDIA_URL = '/media/'
-########## END MEDIA CONFIGURATION
+# ######### END MEDIA CONFIGURATION


-########## STATIC FILE CONFIGURATION
+# ######### STATIC FILE CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#static-root
 STATIC_ROOT = normpath(join(SITE_ROOT, 'assets'))

 # See: https://docs.djangoproject.com/en/dev/ref/settings/#static-url
 STATIC_URL = '/static/'

-# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS
+# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS  # noqa
 STATICFILES_DIRS = (
    normpath(join(SITE_ROOT, 'static')),
 )

-# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#staticfiles-finders
+# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#staticfiles-finders  # noqa
 STATICFILES_FINDERS = (
    'django.contrib.staticfiles.finders.FileSystemFinder',
    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 )
-########## END STATIC FILE CONFIGURATION
+# ######### END STATIC FILE CONFIGURATION


-########## SECRET CONFIGURATION
+# ######### SECRET CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#secret-key
 # Note: This key should only be used for development and testing.
 SECRET_KEY = get_env_variable('GVA_SITE_SECRET')
-########## END SECRET CONFIGURATION
+# ######### END SECRET CONFIGURATION


-########## SITE CONFIGURATION
+# ######### SITE CONFIGURATION
 # Hosts/domain names that are valid for this site
 # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
 ALLOWED_HOSTS = []
-########## END SITE CONFIGURATION
+# ######### END SITE CONFIGURATION


-########## FIXTURE CONFIGURATION
-# See: https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-FIXTURE_DIRS
+# ######### FIXTURE CONFIGURATION
+# See: https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-FIXTURE_DIRS  # noqa
 FIXTURE_DIRS = (
    normpath(join(SITE_ROOT, 'fixtures')),
 )
-########## END FIXTURE CONFIGURATION
+# ######### END FIXTURE CONFIGURATION


-########## TEMPLATE CONFIGURATION
-# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-context-processors
+# ######### TEMPLATE CONFIGURATION
+# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-context-processors  # noqa
 TEMPLATE_CONTEXT_PROCESSORS = (
    'django.contrib.auth.context_processors.auth',
    'django.core.context_processors.debug',
@ -186,10 +186,10 @@ TEMPLATE_LOADERS = (
 TEMPLATE_DIRS = (
    normpath(join(SITE_ROOT, 'templates')),
 )
-########## END TEMPLATE CONFIGURATION
+# ######### END TEMPLATE CONFIGURATION


-########## MIDDLEWARE CONFIGURATION
+# ######### MIDDLEWARE CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#middleware-classes
 MIDDLEWARE_CLASSES = (
    # Default Django middleware.
@ -202,7 +202,7 @@ MIDDLEWARE_CLASSES = (
    'django.middleware.locale.LocaleMiddleware',
    'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
-########## END MIDDLEWARE CONFIGURATION
+# ######### END MIDDLEWARE CONFIGURATION


 AUTHENTICATION_BACKENDS = (
@ -214,18 +214,18 @@ AUTHENTICATION_BACKENDS = (
 )


-########## URL CONFIGURATION
+# ######### URL CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#root-urlconf
 ROOT_URLCONF = '%s.urls' % SITE_NAME
-########## END URL CONFIGURATION
+# ######### END URL CONFIGURATION


-########## TEST RUNNER CONFIGURATION
+# ######### TEST RUNNER CONFIGURATION
 TEST_RUNNER = 'django.test.runner.DiscoverRunner'
-########## END TEST RUNNER CONFIGURATION
+# ######### END TEST RUNNER CONFIGURATION


-########## APP CONFIGURATION
+# ######### APP CONFIGURATION
 DJANGO_APPS = (
    # Default Django apps:
    'django.contrib.auth',
@ -285,23 +285,23 @@ MESSAGE_TAGS = {
    messages.SUCCESS: 'alert-success',
    messages.WARNING: 'alert-warning',
 }
-########## END APP CONFIGURATION
+# ######### END APP CONFIGURATION


-########## ALLAUTH CONFIGURATION
+# ######### ALLAUTH CONFIGURATION
 ACCOUNT_EMAIL_REQUIRED = True
 ACCOUNT_EMAIL_VERIFICATION = 'mandatory'
 LOGIN_REDIRECT_URL = '/'
 SOCIALACCOUNT_QUERY_EMAIL = True
-########## END ALLAUTH CONFIGURATION
+# ######### END ALLAUTH CONFIGURATION


-########## CRISPY FORMS CONFIGURATION
+# ######### CRISPY FORMS CONFIGURATION
 CRISPY_TEMPLATE_PACK = 'bootstrap3'
-########## END CRISPY_FORMS CONFIGURATION
+# ######### END CRISPY_FORMS CONFIGURATION


-########## LOGGING CONFIGURATION
+# ######### LOGGING CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#logging
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
@ -340,16 +340,16 @@ LOGGING = {
        },
    }
 }
-########## END LOGGING CONFIGURATION
+# ######### END LOGGING CONFIGURATION


-########## WSGI CONFIGURATION
+# ######### WSGI CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#wsgi-application
 WSGI_APPLICATION = '%s.wsgi.application' % SITE_NAME
-########## END WSGI CONFIGURATION
+# ######### END WSGI CONFIGURATION


-########## CELERY CONFIGURATION
+# ######### CELERY CONFIGURATION
 BROKER_URL = get_env_variable('GVA_BROKER_URL')
 CELERY_RESULT_BACKEND = 'amqp'
 CELERY_RESULT_PERSISTENT = True
@ -362,10 +362,10 @@ CELERY_ENABLE_UTC = True
 CELERY_ACCEPT_CONTENT = ['json']
 CELERY_TASK_SERIALIZER = 'json'
 CELERY_RESULT_SERIALIZER = 'json'
-########## END CELERY CONFIGURATION
+# ######### END CELERY CONFIGURATION


-########## CUSTOM APP CONFIGURATION
+# ######### CUSTOM APP CONFIGURATION
 OSUSER_MINUID = int(get_env_variable('GVA_MIN_OS_UID'))
 OSUSER_MINGID = int(get_env_variable('GVA_MIN_OS_GID'))
 OSUSER_USERNAME_PREFIX = get_env_variable('GVA_OSUSER_PREFIX')
@ -379,4 +379,4 @@ OSUSER_UPLOAD_SERVER = get_env_variable('GVA_OSUSER_UPLOADSERVER')
 GVA_LINK_WEBMAIL = get_env_variable('GVA_WEBMAIL_URL')
 GVA_LINK_PHPMYADMIN = get_env_variable('GVA_PHPMYADMIN_URL')
 GVA_LINK_PHPPGADMIN = get_env_variable('GVA_PHPPGADMIN_URL')
-########## END CUSTOM APP CONFIGURATION
+# ######### END CUSTOM APP CONFIGURATION
--- a/gnuviechadmin/gnuviechadmin/settings/local.py
+++ b/gnuviechadmin/gnuviechadmin/settings/local.py
@ -7,33 +7,33 @@ from __future__ import absolute_import
 from .base import *


-########## DEBUG CONFIGURATION
+# ######### DEBUG CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#debug
 DEBUG = True

 # See: https://docs.djangoproject.com/en/dev/ref/settings/#template-debug
 TEMPLATE_DEBUG = DEBUG
-########## END DEBUG CONFIGURATION
+# ######### END DEBUG CONFIGURATION


-########## EMAIL CONFIGURATION
+# ######### EMAIL CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-########## END EMAIL CONFIGURATION
+# ######### END EMAIL CONFIGURATION


-########## CACHE CONFIGURATION
+# ######### CACHE CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#caches
 CACHES = {
    'default': {
        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
    }
 }
-########## END CACHE CONFIGURATION
+# ######### END CACHE CONFIGURATION


-########## TOOLBAR CONFIGURATION
-# See: http://django-debug-toolbar.readthedocs.org/en/latest/installation.html#explicit-setup
+# ######### TOOLBAR CONFIGURATION
+# See: http://django-debug-toolbar.readthedocs.org/en/latest/installation.html#explicit-setup # noqa
 INSTALLED_APPS += (
    'debug_toolbar',
 )
@ -50,7 +50,7 @@ LOGGING['handlers'].update({
    }
 })
 LOGGING['loggers'].update(dict(
-    [(key, {'handlers': ['console'], 'level': 'DEBUG', 'propagate': True,})
+    [(key, {'handlers': ['console'], 'level': 'DEBUG', 'propagate': True, })
        for key in [
            'dashboard', 'domains', 'fileservertasks', 'gvacommon',
            'gvawebcore', 'hostingpackages', 'ldaptasks', 'managemails',
@ -61,4 +61,4 @@ DEBUG_TOOLBAR_PATCH_SETTINGS = False

 # http://django-debug-toolbar.readthedocs.org/en/latest/installation.html
 INTERNAL_IPS = ('127.0.0.1', '10.0.2.2')
-########## END TOOLBAR CONFIGURATION
+# ######### END TOOLBAR CONFIGURATION
--- a/gnuviechadmin/gnuviechadmin/settings/production.py
+++ b/gnuviechadmin/gnuviechadmin/settings/production.py
@ -6,12 +6,12 @@ from __future__ import absolute_import

 from .base import *

-########## HOST CONFIGURATION
-# See: https://docs.djangoproject.com/en/1.5/releases/1.5/#allowed-hosts-required-in-production
+# ######### HOST CONFIGURATION
+# See: https://docs.djangoproject.com/en/1.5/releases/1.5/#allowed-hosts-required-in-production # noqa
 ALLOWED_HOSTS = [SITES_DOMAIN_NAME]
-########## END HOST CONFIGURATION
+# ######### END HOST CONFIGURATION

-########## EMAIL CONFIGURATION
+# ######### EMAIL CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'

@ -23,14 +23,14 @@ DEFAULT_FROM_EMAIL = get_env_variable('GVA_SITE_ADMINMAIL')

 # See: https://docs.djangoproject.com/en/dev/ref/settings/#server-email
 SERVER_EMAIL = get_env_variable('GVA_SITE_ADMINMAIL')
-########## END EMAIL CONFIGURATION
+# ######### END EMAIL CONFIGURATION

-########## CACHE CONFIGURATION
+# ######### CACHE CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#caches
-#CACHES = {}
-########## END CACHE CONFIGURATION
+# CACHES = {}
+# ######### END CACHE CONFIGURATION

-########## ALLAUTH PRODUCTION CONFIGURATION
+# ######### ALLAUTH PRODUCTION CONFIGURATION
 ACCOUNT_EMAIL_SUBJECT_PREFIX = '[Jan Dittberner IT-Consulting & -Solutions] '
 ACCOUNT_DEFAULT_HTTP_PROTOCOL = 'https'
-########## END ALLAUTH PRODUCTION CONFIGURATION
+# ######### END ALLAUTH PRODUCTION CONFIGURATION
--- a/gnuviechadmin/gnuviechadmin/tests/test_wsgi.py
+++ b/gnuviechadmin/gnuviechadmin/tests/test_wsgi.py
@ -8,4 +8,3 @@ class WSGITest(TestCase):
    def test_wsgi_application(self):
        from gnuviechadmin import wsgi
        self.assertIsNotNone(wsgi.application)
-
--- a/gnuviechadmin/gnuviechadmin/wsgi.py
+++ b/gnuviechadmin/gnuviechadmin/wsgi.py
@ -24,12 +24,13 @@ path.append(SITE_ROOT)
 # if running multiple sites in the same mod_wsgi process. To fix this, use
 # mod_wsgi daemon mode with each site in its own daemon process, or use
 # os.environ["DJANGO_SETTINGS_MODULE"] = "jajaja.settings"
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gnuviechadmin.settings.production")
+os.environ.setdefault(
+    "DJANGO_SETTINGS_MODULE", "gnuviechadmin.settings.production")

 # This application object is used by any WSGI server configured to use this
 # file. This includes Django's development server, if the WSGI_APPLICATION
 # setting points here.
-from django.core.wsgi import get_wsgi_application
+from django.core.wsgi import get_wsgi_application  # noqa
 application = get_wsgi_application()

 # Apply WSGI middleware here.