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

[Adnane Belmadiaf]

Fixed the venues apps to passe pylint checkers

[lp:~daker/loco-team-portal/fix.960695.venues-app]

532. By Adnane Belmadiaf on 2012-06-03

Fixed the venues apps to passe pylint checkers

[Chris Johnston (cjohnston)]

Looks good

review: Approve

=== modified file 'loco_directory/venues/forms.py'
--- loco_directory/venues/forms.py	2011-02-17 17:54:09 +0000
+++ loco_directory/venues/forms.py	2012-06-03 17:29:18 +0000
@@ -1,24 +1,26 @@
 # -*- coding: utf-8 -*-
-
 from django import forms
+from django.conf import settings
+#pylint: disable-msg=E1102
 from django.utils.translation import ugettext_lazy as _
-from models import Venue
+from venues.models import Venue
 
 from common.forms import RenderableMixin
-from django.conf import settings
 
 try:
     google_api_key = settings.GOOGLE_API_KEY
 except AttributeError:
     google_api_key = ""
 
+
 def validate_name(name):
     if not name or not name.strip():
         raise forms.ValidationError(_(u'Please use a descriptive name for the venue.'))
     return name
 
+
 class VenueForm(forms.ModelForm, RenderableMixin):
-    """ 
+    """
     a form to create/update a new Venue
     """
     class Meta:
@@ -26,7 +28,7 @@
 
     class Media:
         css = {'all': (
-                       '/media/css/colortip-1.0-jquery.css', 
+                       '/media/css/colortip-1.0-jquery.css',
                        )}
         js = (
               'http://maps.google.com/maps/api/js?sensor=false&language=%(language)s&region=%(region)s' % {'language': _('en'), 'region': _('US')},
@@ -38,5 +40,3 @@
     def clean(self):
         self.cleaned_data['name'] = validate_name(self.cleaned_data.get('name'))
         return super(VenueForm, self).clean()
-
-

=== modified file 'loco_directory/venues/models.py'
--- loco_directory/venues/models.py	2011-07-18 09:31:15 +0000
+++ loco_directory/venues/models.py	2012-06-03 17:29:18 +0000
@@ -1,6 +1,6 @@
 from django.db import models
+#pylint: disable-msg=E1102
 from django.utils.translation import ugettext_lazy as _
-from django.db.models import permalink
 
 from teams.models import Country, Continent
 from common.mixins import LocalTimeMixin
@@ -12,14 +12,15 @@
     """
     a manager class for Venues
     """
-    pass 
+    pass
+
 
 class Venue(models.Model, LocalTimeMixin):
     """
     a venue
     """
     name = models.CharField(help_text=_('Name of the Venue'), max_length=150)
-    continent = models.ForeignKey(Continent, verbose_name=_('Continent'), null=True)    
+    continent = models.ForeignKey(Continent, verbose_name=_('Continent'), null=True)
     country = models.ForeignKey(Country, verbose_name=_('Country'), null=True)
     spr = models.CharField(_("State/Province/Region"), max_length=50, null=True, blank=True)
     city = models.CharField(help_text=_('City Name'), max_length=150, null=True, blank=True)
@@ -27,26 +28,29 @@
     longitude = models.FloatField(help_text=_('Longitude in Degrees East'), null=True, blank=True)
     latitude = models.FloatField(help_text=_('Latitude in Degrees North'), null=True, blank=True)
     tz = models.CharField(max_length=32, verbose_name=_('Timezone'), default='UTC', choices=[(tz, tz) for tz in pytz.all_timezones], blank=False, null=False)
-    venue_url = models.URLField(help_text=_('URL for the Venue Homepage'), verbose_name=_('URL of the Venue'), max_length=200, verify_exists=False, blank=True, null=True)
+    venue_url = models.URLField(help_text=_('URL for the Venue Homepage'), verbose_name=_('URL of the Venue'),
+                                max_length=200, verify_exists=False, blank=True, null=True)
     comment = models.TextField(help_text=_('Comment about the Venue'), blank=True, null=True)
-    
+
     class Meta:
-        unique_together = ( ('name', 'country', 'city'), ('longitude', 'latitude'), )
+        unique_together = (('name', 'country', 'city'), ('longitude', 'latitude'), )
 
-    #add manager 
+    #add manager
     objects = VenueManager()
 
     def __unicode__(self):
         if self.spr and self.city:
-            return '%(name)s (%(city)s, %(spr)s)' %{'name':self.name, 'city':self.city, 'spr':self.spr}
+            return '%(name)s (%(city)s, %(spr)s)' % {'name': self.name, 'city': self.city, 'spr': self.spr}
         if self.city:
-            return '%(name)s (%(city)s)' %{'name':self.name, 'city':self.city}
+            return '%(name)s (%(city)s)' % {'name': self.name, 'city': self.city}
         else:
             return self.name
-    
+
     @models.permalink
     def get_absolute_url(self):
         """ get the absolute url for the venue """
+        #suppress Instance of 'ForeignKey' has no 'slug' member
+        #pylint: disable-msg=E1101
         if self.country:
             country = self.country.slug
         else:
@@ -71,6 +75,7 @@
                         e.date_end = e.date_end + (old_offset - new_offset)
                         e.save()
         return super(Venue, self).save(*args, **kargs)
-                
+
+
 def venues_without_country():
     return Venue.objects.filter(country__isnull=True)

=== modified file 'loco_directory/venues/tests.py'
--- loco_directory/venues/tests.py	2011-07-12 00:53:18 +0000
+++ loco_directory/venues/tests.py	2012-06-03 17:29:18 +0000
@@ -29,10 +29,10 @@
 
         # Check that the country group is labeled
         self.assertContains(response, 'Test Country', 1)
-        
+
         # Check that the venue name is displayed
         self.assertContains(response, 'Test Venue', 1)
-        
+
         # Check that the venue details URL exists using the propert country slug
         self.assertContains(response, 'href="/events/venues/Test_Country/%s/detail/"' % self.venue.id, 1)
 
@@ -43,7 +43,7 @@
         self.assertContains(response, 'href="/events/venues/Test_Country/%s/update/"' % self.venue.id)
 
     def test_country_contains_comma(self):
-        self.country.name='Korea, Republic of'
+        self.country.name = 'Korea, Republic of'
         self.country.save()
 
         # Check list view
@@ -54,4 +54,3 @@
         # Check details view
         response = self.client.get('/events/venues/Test_Country/%s/detail/' % self.venue.id)
         self.assertContains(response, 'href="/events/venues/Korea_Republic_of/%s/update/"' % self.venue.id)
-        

=== modified file 'loco_directory/venues/urls.py'
--- loco_directory/venues/urls.py	2011-03-16 18:35:53 +0000
+++ loco_directory/venues/urls.py	2012-06-03 17:29:18 +0000
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import url, patterns
 
 urlpatterns = patterns('',
     #venues
@@ -6,9 +6,8 @@
     url(r'^(?P<country>[\w\s]+)/(?P<venue_id>\d+)/detail/$', 'venues.views.venue_detail', name='venue-detail'),
     url(r'^(?P<country>[\w\s]+)/(?P<venue_id>\d+)/update/$', 'venues.views.venue_update', name='venue-update'),
     url(r'add/$', 'venues.views.venue_new', name='venue-new'),
-    
+
     # Old urls for compatibility
-    url(r'^(?P<venue_id>\d+)/detail/$', 'venues.views.venue_detail', kwargs={'country':''}),
-    url(r'^(?P<venue_id>\d+)/update/$', 'venues.views.venue_update', kwargs={'country':''}),
+    url(r'^(?P<venue_id>\d+)/detail/$', 'venues.views.venue_detail', kwargs={'country': ''}),
+    url(r'^(?P<venue_id>\d+)/update/$', 'venues.views.venue_update', kwargs={'country': ''}),
 )
-

=== modified file 'loco_directory/venues/views.py'
--- loco_directory/venues/views.py	2011-11-12 23:19:28 +0000
+++ loco_directory/venues/views.py	2012-06-03 17:29:18 +0000
@@ -3,28 +3,27 @@
 from django.shortcuts import get_object_or_404
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, HttpResponseRedirect
-from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 from django.utils.html import escape
-from django.db.models import Q
 
-from teams.models import Continent, countries_without_continent, countries_without_continent_have_venues
-from models import Venue, venues_without_country
-from forms import VenueForm
+from teams.models import Continent
+from venues.models import Venue
+from venues.forms import VenueForm
 
 from common.utils import simple_iterator
 
+
 def venue_list(request):
     """
     a list with all venues
     """
-    venue_base_query = Venue.objects.select_related('country').order_by('country') 
-    
+    venue_base_query = Venue.objects.select_related('country').order_by('country')
+
     continent_list = []
     for continent in Continent.objects.filter(country__venue__isnull=False).distinct():
         continent.venue_list = venue_base_query.filter(country__continents=continent)
         continent_list.append(continent)
-        
+
     venues_with_country = venue_base_query.filter(country__isnull=False, country__continents__isnull=True)
     venues__without_country = venue_base_query.filter(country__isnull=True)
 
@@ -32,12 +31,13 @@
         'continent_list': continent_list,
         'venues_with_country': venues_with_country,
         'venues_without_country': venues__without_country,
-        'colcycle' : simple_iterator('col_left', 'col_right'),
+        'colcycle': simple_iterator('col_left', 'col_right'),
 
     }
     return render_to_response('venues/venue_list.html', context,
                   RequestContext(request))
 
+
 def venue_detail(request, country, venue_id):
     """
     detailed view for a venue
@@ -46,20 +46,20 @@
     context = {
         'venue_object': venue_object,
     }
-    return render_to_response('venues/venue_detail.html', 
+    return render_to_response('venues/venue_detail.html',
                                          context, RequestContext(request))
 
+
 @login_required
 def venue_new(request):
     """
     new venue
     """
     venue_object = Venue()
-    if request.method == 'POST':		
+    if request.method == 'POST':
         form = VenueForm(data=request.POST, instance=venue_object)
         if form.is_valid():
-            new_venue = form.save()
-            new_venue_id = new_venue.id
+            form.save()
             if request.REQUEST.has_key('_popup'):
                 return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' % \
                     # escape() calls force_unicode.
@@ -68,21 +68,22 @@
                 return HttpResponseRedirect(venue_object.get_absolute_url())
     else:
         form = VenueForm()
-        
+
     context = {
         'form': form,
     }
-    return render_to_response('venues/venue_update.html', 
+    return render_to_response('venues/venue_update.html',
                                      context, RequestContext(request))
 
+
 @login_required
 def venue_update(request, country, venue_id):
     """
  update venue
     """
     venue_object = get_object_or_404(Venue, pk=venue_id)
-    
-    if request.method == 'POST':		
+
+    if request.method == 'POST':
         form = VenueForm(data=request.POST, instance=venue_object)
         if form.is_valid():
             form.save()
@@ -90,11 +91,10 @@
             return HttpResponseRedirect(venue_object.get_absolute_url())
     else:
         form = VenueForm(instance=venue_object)
-        
+
     context = {
         'form': form,
-        'venue_object':venue_object,
+        'venue_object': venue_object,
     }
-    return render_to_response('venues/venue_update.html', 
+    return render_to_response('venues/venue_update.html',
                                      context, RequestContext(request))
-