diff options
Diffstat (limited to 'rpki/django_settings')
| -rw-r--r-- | rpki/django_settings/gui.py | 6 | ||||
| -rw-r--r-- | rpki/django_settings/irdb.py | 6 | ||||
| -rw-r--r-- | rpki/django_settings/pubd.py | 6 | ||||
| -rw-r--r-- | rpki/django_settings/rpkid.py | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/rpki/django_settings/gui.py b/rpki/django_settings/gui.py index 5007df8b..4e9ac0f3 100644 --- a/rpki/django_settings/gui.py +++ b/rpki/django_settings/gui.py @@ -20,7 +20,7 @@ This module contains GUI-specific configuration settings for Django libraries. # Pull in the irdb configuration, which in turn pulls in the common configuration. -from .irdb import * +from .irdb import * # pylint: disable=W0401 __version__ = "$Id$" @@ -151,6 +151,6 @@ TEMPLATE_CONTEXT_PROCESSORS = ( # putting that configuration into rpki.conf and just adding code here # to read that configuration. try: - from local_settings import * -except: + from local_settings import * # pylint: disable=W0401,F0401 +except ImportError: pass diff --git a/rpki/django_settings/irdb.py b/rpki/django_settings/irdb.py index 7749b9d6..11e7417a 100644 --- a/rpki/django_settings/irdb.py +++ b/rpki/django_settings/irdb.py @@ -21,7 +21,7 @@ the GUI code also uses this but adds a bunch of other stuff, thus has its own settings file. """ -from .common import * +from .common import * # pylint: disable=W0401 __version__ = "$Id$" @@ -44,6 +44,6 @@ INSTALLED_APPS = ["rpki.irdb"] # putting that configuration into rpki.conf and just adding code here # to read that configuration. try: - from local_settings import * -except: + from local_settings import * # pylint: disable=W0401,F0401 +except ImportError: pass diff --git a/rpki/django_settings/pubd.py b/rpki/django_settings/pubd.py index 6f1fe06b..7ae533e7 100644 --- a/rpki/django_settings/pubd.py +++ b/rpki/django_settings/pubd.py @@ -19,7 +19,7 @@ This module contains configuration settings for Django libraries for the pubd program. """ -from .common import * +from .common import * # pylint: disable=W0401 __version__ = "$Id$" @@ -43,6 +43,6 @@ INSTALLED_APPS = ["rpki.pubdb"] # putting that configuration into rpki.conf and just adding code here # to read that configuration. try: - from local_settings import * -except: + from local_settings import * # pylint: disable=W0401,F0401 +except ImportError: pass diff --git a/rpki/django_settings/rpkid.py b/rpki/django_settings/rpkid.py index e3abb0eb..a2aa9401 100644 --- a/rpki/django_settings/rpkid.py +++ b/rpki/django_settings/rpkid.py @@ -19,7 +19,7 @@ This module contains configuration settings for Django libraries for the rpkid program. """ -from .common import * +from .common import * # pylint: disable=W0401 __version__ = "$Id$" @@ -31,7 +31,7 @@ DATABASES = dict( NAME = cfg.get("sql-database", section = "rpkid"), USER = cfg.get("sql-username", section = "rpkid"), PASSWORD = cfg.get("sql-password", section = "rpkid"))) - + # Apps. @@ -43,6 +43,6 @@ INSTALLED_APPS = ["rpki.rpkidb"] # putting that configuration into rpki.conf and just adding code here # to read that configuration. try: - from local_settings import * -except: + from local_settings import * # pylint: disable=W0401,F0401 +except ImportError: pass |