From 9a6f96c4be5c6366822aaf41499e2c23e8bcd6e5 Mon Sep 17 00:00:00 2001
From: Mike Blume <mike@loggly.com>
Date: Tue, 12 Apr 2011 20:55:44 +0000
Subject: [PATCH] don't put this whole thing in a try

---
 axes/__init__.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/axes/__init__.py b/axes/__init__.py
index 9d066a3..25823a3 100644
--- a/axes/__init__.py
+++ b/axes/__init__.py
@@ -1,3 +1,7 @@
+import logging
+import os
+from django.conf import settings
+
 VERSION = (1, 2, 4, 'rc1')
 
 
@@ -5,11 +9,12 @@ def get_version():
     return '%s.%s.%s-%s' % VERSION
 
 try:
-    from django.conf import settings
-    import logging
-    import os
-
     LOGFILE = os.path.join(settings.DIRNAME, 'axes.log')
+except (ImportError, AttributeError):
+    # if we have any problems, we most likely don't have a settings module
+    # loaded
+    pass
+else:
     log_format = '%(asctime)s %(name)-12s %(levelname)-8s %(message)s'
     logging.basicConfig(level=logging.DEBUG,
                         format=log_format,
@@ -29,7 +34,3 @@ try:
 
     # add the handler to the root logger
     logging.getLogger('').addHandler(fileLog)
-except:
-    # if we have any problems, we most likely don't have a settings module
-    # loaded
-    pass