Use the right version of PIP.

[redakcja.git] / redakcja / settings / common.py

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 379f5b5..377a4d5 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -141,6 +141,8 @@ WL_API_CONFIG = {
 
 # Import localsettings file, which may override settings defined here
 
 
 # Import localsettings file, which may override settings defined here
 

+from localsettings import *
+

 try:
     import logging
     if os.path.isfile(LOGGING_CONFIG_FILE):
 try:
     import logging
     if os.path.isfile(LOGGING_CONFIG_FILE):


@@ -149,8 +151,5 @@ try:
     else:
         import sys
         logging.basicConfig(stream=sys.stderr)
     else:
         import sys
         logging.basicConfig(stream=sys.stderr)

-except NameError:
-    print "No logging"
-    pass

 except ImportError as exc:
     raise
 except ImportError as exc:
     raise