PyLint. As usual, a lot of noise and a handful of real, albeit minor, bugs.

svn path=/branches/tk705/; revision=6123

1 files changed, 4 insertions, 4 deletions

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