From 8149be16694059d6912557d622b4716972318d68 Mon Sep 17 00:00:00 2001
From: Chris Hager <chris.hager@bitsworking.com>
Date: Sun, 6 Dec 2015 00:17:58 +0100
Subject: [PATCH] bugfixes

---
 pdfminer/pdfpage.py  | 1 -
 pdfminer/settings.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pdfminer/pdfpage.py b/pdfminer/pdfpage.py
index f9761d9..41882ea 100644
--- a/pdfminer/pdfpage.py
+++ b/pdfminer/pdfpage.py
@@ -9,7 +9,6 @@ from .pdftypes import dict_value
 from .pdfparser import PDFParser
 from .pdfdocument import PDFDocument
 from .pdfdocument import PDFTextExtractionNotAllowed
-from .settings import
 
 import six # Python 2+3 compatibility
 
diff --git a/pdfminer/settings.py b/pdfminer/settings.py
index 46d4bbd..350b2ce 100644
--- a/pdfminer/settings.py
+++ b/pdfminer/settings.py
@@ -1,6 +1,6 @@
 try:
     from django.conf import django_settings
-except ImportError:
+except (ImportError, NameError) as e:
     # in case it's not a django project
     django_settings = None