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

[Adnane Belmadiaf]

Introducing the logging module

[lp:~daker/loco-team-portal/fix.889337]

532. By Adnane Belmadiaf on 2012-06-01

* Introduce logging module

[Chris Johnston (cjohnston)]

Text conflict in loco_directory/settings.py

review: Needs Fixing

[lp:~daker/loco-team-portal/fix.889337]

533. By Adnane Belmadiaf on 2012-07-01

Fixed the merge conflict

534. By Adnane Belmadiaf on 2012-07-01

Another fix

535. By Adnane Belmadiaf on 2012-07-01

Another fix

=== modified file 'loco_directory/common/management/commands/init.py'
--- loco_directory/common/management/commands/init.py	2012-06-30 00:27:13 +0000
+++ loco_directory/common/management/commands/init.py	2012-07-01 14:09:18 +0000
@@ -1,28 +1,33 @@
+# -*- coding: utf-8 -*-
 #!/usr/bin/python
 
 from django.core.management.base import NoArgsCommand
 from django.contrib.auth.models import Group
 
 import settings
-
 import subprocess
 import sys
 import os
 
+import logging
+log = logging.getLogger(__name__)
+
+
 class Command(NoArgsCommand):
     help = "Make sure the LoCo Team Portal is set up properly."
 
     def handle_noargs(self, **options):
-        print " * Compiling messages."
+
+        log.info("Compiling messages.")
         subprocess.call(["python", "manage.py", "compilemessages"])
 
-        print " * Checking if LoCo Council is in Auth teams:", 
         (lc, new_object) = Group.objects.get_or_create(name="ubuntu-lococouncil")
         if new_object:
             lc.save()
-            print "added."
+            stat = "added"
         else:
-            print "yes."
+            stat = "yes"
+        log.info("Checking if LoCo Council is in Auth teams : %s." % stat)
 
         updated = False
         path = settings.PROJECT_PATH
@@ -33,23 +38,21 @@
         for (package, pathname) in link_mapping:
             src = os.path.join(javascript_dir, pathname)
             if not os.path.exists(src):
-                print >> sys.stderr, "Please install the %s package." % package
+                log.critical("Please install the %s package." % package)
                 sys.exit(1)
             dest = os.path.join(media_dir, pathname)
             if not os.path.exists(dest):
                 os.symlink(src, dest)
                 updated = True
         if updated:
-            print " * Creating jquery symlinks: updated."
+            log.info("Creating jquery symlinks: updated.")
         else:
-            print " * Creating jquery symlinks: not necessary."
+            log.info("Creating jquery symlinks: not necessary.")
 
-        print " * Adding Bzr Apps:",
         if os.path.isdir(os.path.join(path, "bzr_apps", ".bzr")):
-            print "not necessary."
+            log.info("Adding Bzr Apps : not necessary.")
         else:
-            subprocess.call(["bzr", "branch", "-q", "--use-existing-dir", 
-                             "lp:ubuntu-django-foundations/bzr-apps", 
+            subprocess.call(["bzr", "branch", "-q", "--use-existing-dir",
+                             "lp:ubuntu-django-foundations/bzr-apps",
                              "bzr_apps"])
-            print "added."
-
+            log.info("Bzr Apps added.")

=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2012-06-30 00:27:13 +0000
+++ loco_directory/settings.py	2012-07-01 14:09:18 +0000
@@ -5,6 +5,16 @@
 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)
+
+log = logging.getLogger(__name__)
+log.addHandler(st_handler)
+log.setLevel(logging.DEBUG)
+
 uw_import = False
 try:
     import ubuntu_website
@@ -27,9 +37,9 @@
     try:
         __import__(module)
     except ImportError:
-        sys.stderr.write("Missing library: %s, Install package: %s\n" % (module, package))
+        log.error('Missing library: %s, Install package: %s\n' % (module, package))
         sys.exit(1)
-    
+
 PROJECT_PATH = os.path.dirname(os.path.abspath(__file__))
 
 DEBUG = True

=== modified file 'loco_directory/teams/management/commands/lpupdate.py'
--- loco_directory/teams/management/commands/lpupdate.py	2011-05-27 14:26:26 +0000
+++ loco_directory/teams/management/commands/lpupdate.py	2012-07-01 14:09:18 +0000
@@ -1,21 +1,24 @@
+# -*- coding: utf-8 -*-
 #!/usr/bin/python
 
 from django.core.management.base import NoArgsCommand
+from django.contrib.auth.models import Group
 
-from common import launchpad
 from teams import models
-from django.contrib.auth.models import Group
 from userprofiles.models import UserProfile, create_profile
+from common import launchpad
 
 from datetime import datetime
 import sys
 
+
 def create_admin_dict(admins):
     admin_dict = {}
     for (lpid, realname) in admins:
         admin_dict[lpid] = realname
     return admin_dict
 
+
 def update_admins(ld_team, lp_team, lp):
     admins = set(get_team_admins(lp_team))
     team_owner = lp_team.team_owner
@@ -39,13 +42,15 @@
         admin.tz = launchpad.get_user_timezone(admin_name, lp)
         admin.save()
         ld_team.admin_profiles.add(admin)
-        
+
+
 def get_team_owner(lp_team):
     owner = lp_team.team_owner
     if owner.is_team:
         return get_team_owner(owner)
     return owner
 
+
 def get_team_admins(lp_team):
     ''' Get all the admins of a team (recursive) '''
     admins = []
@@ -65,14 +70,14 @@
         if not lp:
             sys.exit(1)
         TEAM_BLACKLIST = (u"ubuntu-lococouncil", u"ubuntu-games-merged")
-        
+
         existing_locos = models.Team.objects.all()
         existing_groups = Group.objects.all()
-        locos = filter(lambda a: a.is_team and a.name not in TEAM_BLACKLIST, 
+        locos = filter(lambda a: a.is_team and a.name not in TEAM_BLACKLIST,
                        lp.people["locoteams"].members)
         for l in locos:
             if not existing_locos or l.name not in [b.lp_name for b in existing_locos]:
-                team = models.Team(lp_name=l.name, name=l.display_name, 
+                team = models.Team(lp_name=l.name, name=l.display_name,
                                    owner_profile=create_profile(get_team_owner(l).name))
                 team.save()
             else:
@@ -82,7 +87,7 @@
                 if not len(team.contact_profiles.all()):
                     team.contact_profiles.add(team.owner_profile)
             update_admins(team, l, lp)
-            
+
             if not existing_groups or l.name not in [g.name for g in existing_groups]:
                 group = Group(name=l.name)
                 group.save()

=== modified file 'loco_directory/teams/management/commands/update-languages.py'
--- loco_directory/teams/management/commands/update-languages.py	2010-08-12 09:59:25 +0000
+++ loco_directory/teams/management/commands/update-languages.py	2012-07-01 14:09:18 +0000
@@ -3,11 +3,11 @@
 from django.core.management.base import NoArgsCommand
 
 from teams import models
-
 from common import launchpad
 
 import sys
 
+
 class Command(NoArgsCommand):
     help = "Update list of continents and countries."
 
@@ -15,12 +15,15 @@
         lp = launchpad.lp_login()
         if not lp:
             sys.exit(1)
+
         ld_languages = models.Language.objects.all()
-        lp_language_names = set([(a.english_name, a.code) for a in lp.languages.getAllLanguages()])
+        lp_language_names = set([(a.eng_name, a.code) for a in lp.languages.getAllLanguages()])
         ld_language_names = set([(a.name, a.code) for a in ld_languages])
-        for (language_name, language_code) in ld_language_names.difference(lp_language_names):
-            language = ld_languages.get(name=language_name)
+
+        for (name, code) in ld_language_names.difference(lp_language_names):
+            language = ld_languages.get(name=name)
             language.delete()
-        for (language_name, language_code) in lp_language_names.difference(ld_language_names):
-            language = models.Language(name=language_name, code=language_code)
+
+        for (name, code) in lp_language_names.difference(ld_language_names):
+            language = models.Language(name=name, code=code)
             language.save()

=== modified file 'loco_directory/teams/management/commands/update-openids.py'
--- loco_directory/teams/management/commands/update-openids.py	2010-12-21 03:18:12 +0000
+++ loco_directory/teams/management/commands/update-openids.py	2012-07-01 14:09:18 +0000
@@ -1,9 +1,11 @@
+# -*- coding: utf-8 -*-
 #!/usr/bin/python
 
 from django.core.management.base import NoArgsCommand
+from django.contrib.auth.models import User
 
 from common import launchpad
-from django.contrib.auth.models import User
+
 
 class Command(NoArgsCommand):
     help = "Set openid identity urls from launchpad"

=== modified file 'loco_directory/teams/management/commands/update-template.py'
--- loco_directory/teams/management/commands/update-template.py	2010-04-09 10:21:16 +0000
+++ loco_directory/teams/management/commands/update-template.py	2012-07-01 14:09:18 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #!/usr/bin/python
 
 from django.core.management.base import NoArgsCommand
@@ -15,18 +16,20 @@
 
 DUMMY_LOCALE = "xx"
 
+
 def update_template():
     pwd = os.getcwd()
     os.chdir(settings.PROJECT_PATH)
     subprocess.call(["./manage.py", "makemessages", "-l", DUMMY_LOCALE])
     project_locale_path = os.path.join(settings.PROJECT_PATH, "locale")
-    os.rename(os.path.join(project_locale_path, 
+    os.rename(os.path.join(project_locale_path,
                            "%s/LC_MESSAGES/django.po" % DUMMY_LOCALE),
               os.path.join(project_locale_path, "%s.pot" % APP_NAME))
-    os.removedirs(os.path.join(project_locale_path, 
+    os.removedirs(os.path.join(project_locale_path,
                                "%s/LC_MESSAGES" % DUMMY_LOCALE))
     os.chdir(pwd)
 
+
 class Command(NoArgsCommand):
     help = "Update translations template."
 

=== modified file 'loco_directory/teams/management/commands/update.py'
--- loco_directory/teams/management/commands/update.py	2011-06-02 12:33:31 +0000
+++ loco_directory/teams/management/commands/update.py	2012-07-01 14:09:18 +0000
@@ -1,11 +1,10 @@
 #!/usr/bin/python
 
 from django.core.management.base import NoArgsCommand
-
 from common.utils import run_job
-
 import datetime
 
+
 class Command(NoArgsCommand):
     help = "Update everything."
 
@@ -13,6 +12,5 @@
         run_job("update-countries", datetime.timedelta(days=1))
         run_job("update-languages", datetime.timedelta(days=1))
         run_job("lpupdate", datetime.timedelta(minutes=20))
-        run_job("update-profiles", datetime.timedelta(days=1)) 
-        run_job("refresh", datetime.timedelta(minutes=30)) 
-                
+        run_job("update-profiles", datetime.timedelta(days=1))
+        run_job("refresh", datetime.timedelta(minutes=30))