Merge lp:~daker/loco-team-portal/fix.960695.common-app into lp:loco-team-portal

[Adnane Belmadiaf]

* Fixed the common app coding style

[Chris Johnston (cjohnston)]

Text conflict in loco_directory/common/launchpad.py

review: Needs Fixing

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'loco_directory/common/context_processors.py'
--- loco_directory/common/context_processors.py	2011-04-15 15:05:40 +0000
+++ loco_directory/common/context_processors.py	2012-06-30 22:09:18 +0000
@@ -4,14 +4,16 @@
 
 from django.conf import settings
 
+
 def loco_version(request):
     """
-    add the loco version to template context processor. 
+    add the loco version to template context processor.
     """
-    
+
     version = getattr(settings, 'VERSION_STRING', 'unknown')
     return {'loco_version': version}
 
+
 def google_api_key(request):
     """
     Return the Google API Key or "" if none is defined.
@@ -20,29 +22,34 @@
     google_api_key = getattr(settings, 'GOOGLE_API_KEY', '')
     return {'google_api_key': google_api_key}
 
+
 def flickr_api_key(request):
     """
     Return the Flickr API Key or "" if none is defined.
     """
-    
+
     flickr_api_key = getattr(settings, 'FLICKR_API_KEY', '')
     return {'flickr_api_key': flickr_api_key}
-    
+
+
 def pixie_api_key(request):
     """
     Return the Pix.ie API Key or "" if none is defined.
     """
-    
+
     pixie_api_key = getattr(settings, 'PIXIE_API_KEY', '')
     return {'pixie_api_key': pixie_api_key}
 
+
 def login_redirect(request):
     return {'login_next': request.get_full_path()}
 
+
 def url_base(request):
     url = request.get_full_path().split('/')
-    return {'url_base': url[1]} 
-    
+    return {'url_base': url[1]}
+
+
 def site_search(request):
     from common.forms import SiteSearchForm
     search_form = SiteSearchForm(data=request.GET)
 
=== modified file 'loco_directory/common/forms.py'
--- loco_directory/common/forms.py	2010-11-20 17:25:50 +0000
+++ loco_directory/common/forms.py	2012-06-30 22:09:18 +0000
@@ -2,12 +2,13 @@
 from django import forms
 from django.utils.translation import ugettext as _
 
+
 # Taken from http://djangosnippets.org/snippets/1732/
 class RenderableMixin(object):
     """
     Mixin to render forms from a predefined template
     """
-    
+
     @property
     def form_class_name(self):
         return '.'.join([self.__module__, self.__class__.__name__.lower()])
@@ -23,7 +24,7 @@
 
         context_dict = dict(
             non_field_errors=self.non_field_errors(),
-            fields=[ forms.forms.BoundField(self, field, name) for name, field in self.fields.iteritems()],
+            fields=[forms.forms.BoundField(self, field, name) for name, field in self.fields.iteritems()],
             errors=self.errors,
             data=self.data,
             form=self,
@@ -40,6 +41,7 @@
             Context(context_dict)
         )
 
+
 class SiteSearchForm(forms.Form):
     """
     A Search form for the whole site
@@ -49,4 +51,3 @@
     def as_line(self):
         "Returns this form rendered. Only the fields. Nothing else HTML."
         return self._html_output(u'%(label)s %(errors)s%(field)s%(help_text)s', u'%s', '', u'%s', False)
-
 
=== modified file 'loco_directory/common/launchpad.py'
--- loco_directory/common/launchpad.py	2012-06-20 11:02:00 +0000
+++ loco_directory/common/launchpad.py	2012-06-30 22:09:18 +0000
@@ -38,7 +38,7 @@
     if is_debug_user(user.username):
         return True
     if user.is_staff:
-		return True
+        return True
     lc_in_groups = user.groups.filter(name__exact='ubuntu-lococouncil')
     return (lc_in_groups.count() == 1)
 
 
=== modified file 'loco_directory/common/management/commands/recoverdata.py'
--- loco_directory/common/management/commands/recoverdata.py	2011-08-30 19:24:24 +0000
+++ loco_directory/common/management/commands/recoverdata.py	2012-06-30 22:09:18 +0000
@@ -13,6 +13,7 @@
 from venues.models import *
 from meetings.models import *
 
+
 class Command(BaseCommand):
     args = 'dump_file'
     help = 'Attempt to recover missing data from a json dump'
@@ -22,13 +23,13 @@
             print "You must supply a dumpfile"
             return
         dumpfile = args[0]
-        
+
         try:
             json = open(dumpfile)
         except:
             print "Unable to open %s" % dumpfile
             return
-            
+
         try:
             decoder = simplejson.JSONDecoder()
             data = decoder.decode(json.read())
@@ -37,7 +38,7 @@
             return
         finally:
             json.close()
-        
+
         print "Loading %s" % dumpfile
         users = dict()
         profiles = dict()
@@ -46,11 +47,11 @@
         globalevents = dict()
         teamevents = dict()
         venues = dict()
-        basemeetings=dict()
+        basemeetings = dict()
         teammeetings = dict()
         agendaitems = dict()
         agendaitems_needparent = dict()
-        
+
         # first pass we can collect user, teams and venues
         for record in data:
             # recover users
@@ -65,7 +66,7 @@
                 )
                 if user_created:
                     print "Created User: %s" % users[record['pk']].username
-            
+
              # recover teams
             if record['model'] == 'teams.team':
 #                print "Checking team %s (%s)" % (record['fields']['name'], record['fields']['lp_name'])
@@ -111,12 +112,12 @@
             if record['model'] == 'events.baseevent':
 #                print "Caching baseevent %s" % (record['fields']['name'],)
                 baseevents[record['pk']] = record['fields']
-            
+
             # save base meeting
             if record['model'] == 'meetings.basemeeting':
 #                print "Caching basemeeting %s" % (record['fields']['name'],)
                 basemeetings[record['pk']] = record['fields']
-                
+
             # recover userprofile
             if record['model'] == 'userprofiles.userprofile':
                 if record['fields']['user'] in users:
@@ -134,7 +135,6 @@
                 else:
                     print u"Failed to create missing userprofile, no such user: %s" % record['fields']['user']
 
- 
         # third pass we can collect global events and team meetings, using the
         # baseevent and basemeeting data cached in the previous pass
         for record in data:
@@ -170,7 +170,7 @@
                         'logs': basemeeting['logs'],
                         'minutes': basemeeting['minutes'],
                         'date_created': basemeeting['date_created'],
-                        'chair': profiles.get(basemeeting['chair'], None),#profile lookup
+                        'chair': profiles.get(basemeeting['chair'], None),  # profile lookup
                         'meeting_tz': record['fields']['meeting_tz'],
                     }
                 )
@@ -190,14 +190,14 @@
                         name=baseevent['name'],
                         date_begin=baseevent['date_begin'],
                         date_end=baseevent['date_end'],
-                        venue=venues.get(record['fields']['venue'], None), #venue lookup
+                        venue=venues.get(record['fields']['venue'], None),  # venue lookup
                         channel=record['fields']['channel'],
                         defaults={
                             'description': baseevent['description'],
                             'announce': baseevent['announce'],
                             'date_created': baseevent['date_created'],
-                            'contact': profiles.get(record['fields']['contact'], None), #profile lookup
-                            'global_event': globalevents.get(record['fields']['global_event'], None), #global event lookup
+                            'contact': profiles.get(record['fields']['contact'], None),  # profile lookup
+                            'global_event': globalevents.get(record['fields']['global_event'], None),  # global event lookup
                             'registration': record['fields']['registration'],
                         }
                     )
@@ -219,7 +219,7 @@
                     created_date=record['fields']['created_date'],
                     defaults={
                         'description': record['fields']['description'],
-                        'parent': None, #saved for later lookup, since they aren't ordered
+                        'parent': None,  # saved for later lookup, since they aren't ordered
                         'order': record['fields']['order'],
                         'log': record['fields']['log'],
                     }
@@ -227,7 +227,7 @@
                 if ai_created and record['fields']['parent']:
                     agendaitems_needparent[record['pk']] = record['fields']['parent']
                     print u"Created AgendaItem %s: %s" % (agendaitems[record['pk']].pk, unicode(agendaitems[record['pk']].title).encode('ascii', 'ignore'))
-            
+
             # recover event attendee
             if record['model'] == 'events.attendee':
                 if record['fields']['team_event'] in teamevents:
@@ -259,7 +259,7 @@
                         print u"Created TeamEvent Comment: %s on %s (%s)" % (comment.commenter_profile.user.username, unicode(comment.team_event.name).encode('ascii', 'ignore'), comment.team_event.pk)
                 else:
                     print u"Failed to create TeamEventComment, no such team event: %s" % record['fields']['team_event']
-            
+
         # after fifth pass, set agendaitem parents
         for agendaitem_id in agendaitems_needparent:
             parent_id = agendaitems_needparent[agendaitem_id]
 
=== modified file 'loco_directory/common/mixins.py'
--- loco_directory/common/mixins.py	2011-06-17 17:10:41 +0000
+++ loco_directory/common/mixins.py	2012-06-30 22:09:18 +0000
@@ -1,8 +1,9 @@
 import pytz
 
+
 class LocalTimeMixin(object):
     '''Provides methods for converting between UTC and localtime
-    
+
     Classes using this should provide the timezone string as self.tz
     '''
 
@@ -13,19 +14,17 @@
         except:
             return pytz.utc
     timezone = property(get_timezone)
-    
+
     def tolocaltime(self, dt):
         'Converts a datetime in UTC to a datetime in this object\'s timezone'
         if dt is None:
             return None
         as_utc = pytz.utc.localize(dt)
         return as_utc.astimezone(self.timezone)
-    
+
     def fromlocaltime(self, dt):
         'Converts a datetime in this object\'s timezone to a datetime in UTC'
         if dt is None:
             return None
         local = self.timezone.localize(dt)
         return local.astimezone(pytz.utc)
-            
-
 
=== modified file 'loco_directory/common/shortcuts.py'
--- loco_directory/common/shortcuts.py	2010-04-09 14:10:02 +0000
+++ loco_directory/common/shortcuts.py	2012-06-30 22:09:18 +0000
@@ -9,20 +9,22 @@
 from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect
 from django.core import urlresolvers
 
+
+# pylint: disable-msg=C0103
 def redirect(to, *args, **kwargs):
     """
     Returns an HttpResponseRedirect to the apropriate URL for the arguments
     passed.
-    
+
     The arguments could be:
-    
+
         * A model: the model's `get_absolute_url()` function will be called.
-    
+
         * A view name, possibly with arguments: `urlresolvers.reverse()` will
           be used to reverse-resolve the name.
-         
+
         * A URL, which will be used as-is for the redirect location.
-        
+
     By default issues a temporary redirect; pass permanent=True to issue a
     permanent redirect
     """
@@ -30,11 +32,11 @@
         redirect_class = HttpResponsePermanentRedirect
     else:
         redirect_class = HttpResponseRedirect
-    
+
     # If it's a model, use get_absolute_url()
     if hasattr(to, 'get_absolute_url'):
         return redirect_class(to.get_absolute_url())
-    
+
     # Next try a reverse URL resolution.
     try:
         return redirect_class(urlresolvers.reverse(to, args=args, kwargs=kwargs))
@@ -42,7 +44,7 @@
         # If this doesn't "feel" like a URL, re-raise.
         if '/' not in to and '.' not in to:
             raise
-        
+
     # Finally, fall back and assume it's a URL
     return redirect_class(to)
 
@@ -64,6 +66,7 @@
             raise AttributeError
     return sum
 
+
 def queryset_count(field, qs):
     """
     Returns the number of non-null the values in the given field of the queryset
 
=== modified file 'loco_directory/common/templatetags/markup.py'
--- loco_directory/common/templatetags/markup.py	2012-02-07 14:36:29 +0000
+++ loco_directory/common/templatetags/markup.py	2012-06-30 22:09:18 +0000
@@ -20,6 +20,7 @@
 
 register = template.Library()
 
+
 @register.filter
 def textile(value):
     try:
@@ -31,6 +32,7 @@
     else:
         return mark_safe(force_unicode(textile.textile(smart_str(value), encoding='utf-8', output='utf-8')))
 
+
 @register.filter
 def markdown(value, arg=''):
     """
@@ -68,13 +70,14 @@
 
             # Unicode support only in markdown v1.7 or above. Version_info
             # exist only in markdown v1.6.2rc-2 or above.
-            if getattr(markdown, "version_info", None) < (1,7):
+            if getattr(markdown, "version_info", None) < (1, 7):
                 return mark_safe(force_unicode(markdown.markdown(smart_str(value), extensions, safe_mode=safe_mode)))
             else:
                 return mark_safe(markdown.markdown(force_unicode(value), extensions, safe_mode=safe_mode))
         else:
             return mark_safe(force_unicode(markdown.markdown(smart_str(value))))
 
+
 @register.filter
 def restructuredtext(value):
     try:
 
=== modified file 'loco_directory/common/templatetags/teams_tags.py'
--- loco_directory/common/templatetags/teams_tags.py	2011-06-19 13:55:34 +0000
+++ loco_directory/common/templatetags/teams_tags.py	2012-06-30 22:09:18 +0000
@@ -3,8 +3,9 @@
 
 register = template.Library()
 
+
 def irc(nickname):
-    """ 
+    """
         Replace dots with underscores
     """
     return nickname.replace('.', '_')
 
=== modified file 'loco_directory/common/utils.py'
--- loco_directory/common/utils.py	2011-10-05 00:50:53 +0000
+++ loco_directory/common/utils.py	2012-06-30 22:09:18 +0000
@@ -6,6 +6,7 @@
 
 from django.conf import settings
 
+
 def write_log(job_name, log):
     stamp_dir = os.path.join(settings.PROJECT_PATH, 'data')
     log_file = os.path.join(stamp_dir, "%s.log" % job_name)
@@ -15,6 +16,7 @@
     f.write(log)
     f.close()
 
+
 def run_job(which, interval, args=None):
     stamp_dir = os.path.join(settings.PROJECT_PATH, 'data')
     if not os.path.exists(stamp_dir):
@@ -24,7 +26,7 @@
        datetime.datetime.utcfromtimestamp(os.path.getmtime(stamp_file)) + interval < datetime.datetime.now():
         pwd = os.getcwd()
         os.chdir(settings.PROJECT_PATH)
-        p = subprocess.Popen(["python", "manage.py", which], stdout=subprocess.PIPE, 
+        p = subprocess.Popen(["python", "manage.py", which], stdout=subprocess.PIPE,
                              stderr=subprocess.STDOUT, close_fds=True)
         log = p.stdout.read()
         p.communicate()
@@ -33,6 +35,7 @@
         os.utime(stamp_file, None)
         write_log(which, log)
 
+
 def flat_list(some_list):
     """
     >>> reduce(lambda a,b: a.extend(b) or a, [[2,3],[6],[66,34]])
@@ -40,9 +43,10 @@
     """
     if not some_list:
         return []
-    return reduce(lambda a,b: a.extend(b) or a, some_list)
-    
-
+    return reduce(lambda a, b: a.extend(b) or a, some_list)
+
+
+# pylint: disable-msg=C0103
 def redirect(to, *args, **kwargs):
     from distutils.version import LooseVersion as V
     import django
@@ -62,10 +66,10 @@
     if not os.path.exists(version_file):
         return "version unknown"
 
-    f = email.message_from_file(open(version_file))
-    version = f["version"]
-    bzr_revno = f["revno"]
-    
+    emai_msg = email.message_from_file(open(version_file))
+    version = emai_msg["version"]
+    bzr_revno = emai_msg["revno"]
+
     if debug:
         try:
             from bzrlib.branch import Branch
@@ -76,6 +80,7 @@
 
     return "version %s (rev %s)" % (version, bzr_revno)
 
+
 class simple_iterator(object):
 
     def __init__(self, *args):
@@ -85,7 +90,7 @@
             self.values.extend(deepcopy(args[0]))
         else:
             self.values.extend(deepcopy(args))
-    
+
     def get_next_index(self):
         if self.index + 1 >= len(self.values):
             self.index = 0
@@ -101,5 +106,3 @@
     def reset(self):
         self.index = -1
         return ''
-
-
 
=== modified file 'loco_directory/common/views.py'
--- loco_directory/common/views.py	2011-10-11 14:03:43 +0000
+++ loco_directory/common/views.py	2012-06-30 22:09:18 +0000
@@ -13,6 +13,7 @@
         MissingUsernameViolation,
     )
 except ImportError:
+    # pylint: disable-msg=C0103
     MissingPhysicalMultiFactor = None
     MissingUsernameViolation = None
 
@@ -25,7 +26,7 @@
     team_meeting_count = TeamMeeting.objects.next_meetings().count()
     global_event_list = GlobalEvent.objects.next_events()[:5]
     articles = Article.objects.all()[:5]
-    
+
     context = {'team_event_count': team_event_count,
                'team_meeting_count': team_meeting_count,
                'global_event_list': global_event_list,
@@ -35,36 +36,43 @@
     return render_to_response('index.html', context,
         RequestContext(request))
 
+
 def loco_council(request):
     context = {}
     return render_to_response('loco_council.html', context,
         RequestContext(request))
 
+
 def about(request):
     context = {}
     return render_to_response('about.html', context,
         RequestContext(request))
 
+
 def about_loco(request):
     context = {}
     return render_to_response('about_loco.html', context,
         RequestContext(request))
 
+
 def loco_setup(request):
     context = {}
     return render_to_response('loco_setup.html', context,
         RequestContext(request))
 
+
 def irc_chat(request):
     context = {}
     return render_to_response('irc_chat.html', context,
         RequestContext(request))
-        
+
+
 def using_locodir(request):
     context = {}
     return render_to_response('using_locodir.html', context,
         RequestContext(request))
-        
+
+
 def site_logout(request):
     logout(request)
     return HttpResponseRedirect('/')
@@ -74,17 +82,19 @@
     """
     Change the language for a user
     """
-    next = request.META.get('HTTP_REFERER', None)
-    if not next:
-        next = '/'
-    response = HttpResponseRedirect(next)
+    next_url = request.META.get('HTTP_REFERER', None)
+    if not next_url:
+        next_url = '/'
+    response = HttpResponseRedirect(next_url)
     lang = request.GET.get('lang', '')
     if check_for_language(lang):
         if hasattr(request, 'session'):
             request.session['django_language'] = lang
-        response.set_cookie(settings.LANGUAGE_COOKIE_NAME,lang)
+        response.set_cookie(settings.LANGUAGE_COOKIE_NAME, lang)
     return response
-    
+
+
+# pylint: disable-msg=C0103
 def site_search(request):
     from common.forms import SiteSearchForm
     from common.utils import simple_iterator
@@ -110,17 +120,24 @@
         'venues': venues,
         'meetings': meetings,
         'q': q,
-        'colcycle' : simple_iterator('col_left', 'col_right'),
+        'colcycle': simple_iterator('col_left', 'col_right'),
     }
     return render_to_response('site_search.html', context,
         RequestContext(request))
-    
+
+
+# pylint: disable-msg=C0103
 def search_teams(q):
     from teams.models import Team
     from django.db.models import Q
-    team_list = Team.objects.filter(Q(name__icontains=q) | Q(countries__name__icontains=q) | Q(city__icontains=q) | Q(languages__name__icontains=q)).order_by('name').distinct()
+    team_list = Team.objects.filter(Q(name__icontains=q) |
+                                    Q(countries__name__icontains=q) |
+                                    Q(city__icontains=q) |
+                                    Q(languages__name__icontains=q)).order_by('name').distinct()
     return team_list
-    
+
+
+# pylint: disable-msg=C0103
 def search_global_events(q):
     from events.models import GlobalEvent
     from django.db.models import Q
@@ -128,26 +145,43 @@
     global_event_list = global_event_list.filter(Q(name__icontains=q)).distinct()
     return global_event_list
 
+
+# pylint: disable-msg=C0103
 def search_team_events(q):
     from events.models import TeamEvent
     from django.db.models import Q
     team_event_list = TeamEvent.objects.next_events()
-    team_event_list = team_event_list.filter(Q(name__icontains=q) | Q(teams__name__icontains=q) | Q(venue__name__icontains=q) | Q(venue__city__icontains=q) | Q(venue__country__name__icontains=q) | Q(global_event__name__icontains=q)).distinct()
+    team_event_list = team_event_list.filter(Q(name__icontains=q) |
+                                             Q(teams__name__icontains=q) |
+                                             Q(venue__name__icontains=q) |
+                                             Q(venue__city__icontains=q) |
+                                             Q(venue__country__name__icontains=q) |
+                                             Q(global_event__name__icontains=q)).distinct()
     return team_event_list
-    
+
+
+# pylint: disable-msg=C0103
 def search_venues(q):
     from venues.models import Venue
     from django.db.models import Q
-    venue_list = Venue.objects.filter(Q(name__icontains=q) | Q(country__name__icontains=q) | Q(city__icontains=q) | Q(address__icontains=q)).order_by('name').distinct()
+    venue_list = Venue.objects.filter(Q(name__icontains=q) |
+                                      Q(country__name__icontains=q) |
+                                      Q(city__icontains=q) |
+                                      Q(address__icontains=q)).order_by('name').distinct()
     return venue_list
-    
+
+
+# pylint: disable-msg=C0103
 def search_meetings(q):
     from meetings.models import TeamMeeting
     from django.db.models import Q
     meeting_list = TeamMeeting.objects.next_meetings()
-    meeting_list = meeting_list.filter(Q(name__icontains=q) | Q(teams__name__icontains=q) | Q(agenda__title__icontains=q)).distinct()
+    meeting_list = meeting_list.filter(Q(name__icontains=q) |
+                                       Q(teams__name__icontains=q) |
+                                       Q(agenda__title__icontains=q)).distinct()
     return meeting_list
-    
+
+
 def login_failure(request, message, status=403,
            template_name='login_failure.html',
            exception=None):
@@ -159,9 +193,10 @@
     if isinstance(exception, MissingPhysicalMultiFactor):
         context['solution'] = 'Try logging in again using your Yubikey'
     elif isinstance(exception, MissingUsernameViolation):
-        context['solution'] = 'You will need to create a <a href="https://launchpad.net/people/+me">Launchpad profile</a> to use the LoCo Teams Directory'
+        context['solution'] = 'You will need to create a ' \
+                              '<a href="https://launchpad.net/people/+me">' \
+                              'Launchpad profile</a> to use the LoCo Teams Directory'
 
     data = render_to_string(template_name, context,
         context_instance=RequestContext(request))
     return HttpResponse(data, status=status)
-
 
=== modified file 'loco_directory/common/widgets.py'
--- loco_directory/common/widgets.py	2010-07-29 12:05:20 +0000
+++ loco_directory/common/widgets.py	2012-06-30 22:09:18 +0000
@@ -7,6 +7,7 @@
 from django.utils.safestring import mark_safe
 import copy
 
+
 class PopupRelatedFieldWidgetWrapper(forms.Widget):
     """
     This class is a wrapper to a given widget to add the add icon for the
@@ -29,7 +30,7 @@
 
     def _media(self):
         wm = self.widget.media
-        wm.add_js(['%sjs/admin/RelatedObjectLookups.js'%settings.ADMIN_MEDIA_PREFIX,])
+        wm.add_js(['%sjs/admin/RelatedObjectLookups.js' % settings.ADMIN_MEDIA_PREFIX, ])
         return wm
     media = property(_media)
 
@@ -55,4 +56,3 @@
 
     def id_for_label(self, id_):
         return self.widget.id_for_label(id_)
-