Merge lp:~daker/loco-team-portal/fix.1088088 into lp:loco-team-portal

[Adnane Belmadiaf]

Fixed settings.py

=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2012-11-27 21:52:42 +0000
+++ loco_directory/settings.py	2012-12-09 01:07:23 +0000
@@ -5,8 +5,6 @@
 from common import utils
 import logging
 
-import logging
-
 st_handler = logging.StreamHandler(sys.stderr)
 formatter = logging.Formatter("[%(asctime)s] - %(levelname)s - %(module)s - %(message)s")
 st_handler.setFormatter(formatter)
@@ -25,7 +23,8 @@
         pass
     except:
         if not 'init' in sys.argv:
-            print "You will need to run ./manage.py init to make the LoCo Team Portal fully work."
+            log.error('You will need to run ./manage.py init to make ' \
+                      'the LoCo Team Portal fully work.')
 
 # Check for necessary modules
 modules = {
@@ -47,10 +46,6 @@
 STATIC_SERVE = True
 USE_DEBUG_TOOLBAR = False
 
-OPENID_STRICT_USERNAMES = True
-OPENID_FOLLOW_RENAMES = True
-OPENID_SREG_REQUIRED_FIELDS = ['email', ]
-
 VERSION_STRING = utils.get_locodirectory_version(
             os.path.join(PROJECT_PATH, "version"),
             DEBUG)
@@ -168,6 +163,12 @@
 
 AUTH_PROFILE_MODULE = 'userprofiles.UserProfile'
 
+
+OPENID_STRICT_USERNAMES = True
+OPENID_FOLLOW_RENAMES = True
+OPENID_SREG_REQUIRED_FIELDS = ['email', ]
+
+
 # Should users be created when new OpenIDs are used to log in?
 OPENID_CREATE_USERS = True
 
@@ -185,8 +186,6 @@
 # Automatically map lp team membership to ld group membership
 OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO = True
 
-OPENID_SREG_REQUIRED_FIELDS = ['email']
-
 # Tell django.contrib.auth to use the OpenID signin URLs.
 LOGIN_URL = '/openid/login'
 LOGIN_REDIRECT_URL = '/'