Merge lp:~cjohnston/summit/pylint into lp:summit

[Chris Johnston]

[Adnane Belmadiaf (daker)]

It looks good.

review: Approve

=== added file 'pylint.rc'
--- pylint.rc	1970-01-01 00:00:00 +0000
+++ pylint.rc	2012-08-12 22:34:19 +0000
@@ -0,0 +1,83 @@
+[MASTER]
+profile=no
+persistent=yes
+ignore=migrations
+cache-size=500
+
+[MESSAGES CONTROL]
+# C0111 Missing docstring 
+# I0011 Warning locally suppressed using disable-msg
+# I0012 Warning locally suppressed using disable-msg
+# W0704 Except doesn't do anything Used when an except clause does nothing but "pass" and there is no "else" clause
+# W0142 Used * or * magic* Used when a function or method is called using *args or **kwargs to dispatch arguments.
+# W0212 Access to a protected member %s of a client class
+# W0232 Class has no __init__ method Used when a class has no __init__ method, neither its parent classes.
+# W0613 Unused argument %r Used when a function or method argument is not used.
+# W0702 No exception's type specified Used when an except clause doesn't specify exceptions type to catch.
+# R0201 Method could be a function
+disable=C0111,I0011,I0012,W0704,W0142,W0212,W0232,W0613,W0702,R0201
+
+[REPORTS]
+output-format=parseable
+include-ids=yes
+
+[BASIC]
+no-docstring-rgx=__.*__|_.*
+class-rgx=[A-Z_][a-zA-Z0-9_]+$
+function-rgx=[a-zA_][a-zA-Z0-9_]{2,70}$
+method-rgx=[a-z_][a-zA-Z0-9_]{2,70}$
+const-rgx=(([A-Z_][A-Z0-9_]*)|([a-z_][a-z0-9_]*)|(__.*__)|register|urlpatterns)$
+good-names=_,i,j,k,e,qs,pk,setUp,tearDown
+
+[TYPECHECK]
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# List of classes names for which member attributes should not be checked
+# (useful for classes with attributes dynamically set).
+ignored-classes=SQLObject
+
+# When zope mode is activated, add a predefined set of Zope acquired attributes
+# to generated-members.
+zope=no
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E0201 when accessed.
+generated-members=objects,DoesNotExist,id,pk,_meta,base_fields,context
+
+# List of method names used to declare (i.e. assign) instance attributes
+defining-attr-methods=__init__,__new__,setUp
+
+
+[VARIABLES]
+init-import=no
+dummy-variables-rgx=_|dummy
+
+[SIMILARITIES]
+min-similarity-lines=6
+ignore-comments=yes
+ignore-docstrings=yes
+
+
+[MISCELLANEOUS]
+notes=FIXME,XXX,TODO
+
+
+[FORMAT]
+max-line-length=160
+max-module-lines=500
+indent-string='    '
+
+
+[DESIGN]
+max-args=10
+max-locals=15
+max-returns=6
+max-branchs=12
+max-statements=50
+max-parents=7
+max-attributes=7
+min-public-methods=0
+max-public-methods=50

=== modified file 'requirements.txt'
--- requirements.txt	2012-06-29 23:26:00 +0000
+++ requirements.txt	2012-08-12 22:34:19 +0000
@@ -19,6 +19,7 @@
 wsgiref==0.1.2
 model-mommy==0.7
 Markdown==2.1.1
+pylint
 
 # Non-standard dependencies
 -f http://launchpad.net/launchpadlib/trunk/1.6.0/+download/launchpadlib-1.6.0.tar.gz#egg=launchpadlib-1.6.0

=== modified file 'summit/common/utils.py'
--- summit/common/utils.py	2012-01-23 01:18:55 +0000
+++ summit/common/utils.py	2012-08-12 22:34:19 +0000
@@ -1,9 +1,6 @@
 import email
 import os
 
-from django.conf import settings
-
-
 def redirect(to, *args, **kwargs):
     from distutils.version import LooseVersion as V
     import django

=== modified file 'summit/common/views.py'
--- summit/common/views.py	2012-05-22 18:57:56 +0000
+++ summit/common/views.py	2012-08-12 22:34:19 +0000
@@ -17,11 +17,7 @@
 from django.shortcuts import render_to_response
 from django.template.loader import render_to_string
 from django.template import RequestContext
-from django.http import HttpResponse, HttpResponseRedirect
-
-from django.conf import settings
-
-from django.contrib.sites.models import Site
+from django.http import HttpResponse
 
 from summit.schedule.models import Summit
 

=== modified file 'summit/schedule/forms.py'
--- summit/schedule/forms.py	2012-08-05 16:31:15 +0000
+++ summit/schedule/forms.py	2012-08-12 22:34:19 +0000
@@ -15,15 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django import forms
-from django.conf import settings
-from django.contrib.formtools import wizard
-from django.http import HttpResponseRedirect
-from django.utils.safestring import mark_safe
-from launchpadlib.credentials import Credentials
-
-from django.db import models
-
-from summit.schedule.fields import NameField
 
 from summit.schedule.models.meetingmodel import Meeting
 from summit.schedule.models.attendeemodel import Attendee

=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2012-08-11 01:23:54 +0000
+++ summit/schedule/render.py	2012-08-12 22:34:19 +0000
@@ -1006,8 +1006,8 @@
                         continue
                     if not show_private and meeting.private:
                         continue
-                    dtstart = str(slot.start_utc).replace(' ','T', 1).replace(':','',2).replace('-','',2)
-                    dtend = str(slot.end_utc).replace(' ','T', 1).replace(':','',2).replace('-','',2)
+                    dtstart = str(slot.start_utc).replace(' ', 'T', 1).replace(':', '', 2).replace('-', '', 2)
+                    dtend = str(slot.end_utc).replace(' ', 'T', 1).replace(':', '', 2).replace('-', '', 2)
                     categories = ','.join([t.title for t in meeting.tracks.all()])
                     ical += '''BEGIN:VEVENT
 UID:%(id)s

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2012-08-08 20:29:24 +0000
+++ summit/schedule/views.py	2012-08-12 22:34:19 +0000
@@ -14,14 +14,10 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from time import strftime
 import datetime
 
 from django.db.models import Q
-from django.conf import settings
 from django.contrib.auth import logout
-from django.contrib.auth.decorators import login_required, permission_required
-from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
 from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
@@ -32,11 +28,22 @@
                                         summit_only_required,
                                         summit_attendee_required)
 
-from summit.schedule.models import Summit, Slot, Attendee, Meeting, Lead, Track, Room
+from summit.schedule.models import (Summit,
+                                    Slot,
+                                    Attendee,
+                                    Meeting,
+                                    Track,
+                                    Room)
 
 from summit.schedule.render import schedule_factory, Schedule
 
-from summit.schedule.forms import *
+from summit.schedule.forms import (CreateMeeting,
+                                   OrganizerEditMeeting,
+                                   ProposeMeeting,
+                                   EditMeeting,
+                                   MeetingReview,
+                                   AttendMeeting,
+                                   OrganizerChangeAttend)
 
 __all__ = (
     'summit',
@@ -328,10 +335,10 @@
     return _show_meeting(request, summit, meeting, attendee)
 
 def _show_meeting(request, summit, meeting, attendee):
-    agendaitems=meeting.agenda_set.all()
-    participants=meeting.participant_set.all()
-    attendees=meeting.attendees
-    tracks=meeting.tracks.all()
+    agendaitems = meeting.agenda_set.all()
+    participants = meeting.participant_set.all()
+    attendees = meeting.attendees
+    tracks = meeting.tracks.all()
     user_is_attending = attendee is not None and attendee in meeting.attendees
     user_is_participating = attendee is not None and attendee in [p.attendee for p in participants if not p.from_launchpad]
     
@@ -693,7 +700,7 @@
     if not summit.is_organizer(attendee) and attendee != meeting.drafter:
         return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
     else:
-        participants=meeting.participant_set.all()
+        participants = meeting.participant_set.all()
 
     context = {
         'summit': summit,

=== modified file 'summit/sponsor/tests.py'
--- summit/sponsor/tests.py	2012-01-23 01:18:55 +0000
+++ summit/sponsor/tests.py	2012-08-12 22:34:19 +0000
@@ -313,8 +313,8 @@
         self.sponsorship.further_info = '"><script>alert(/xss/)</script>'
         self.sponsorship.save()
         
-        self.user.first_name= '"><script>alert(/xss/)</script>'
-        self.user.last_name=''
+        self.user.first_name = '"><script>alert(/xss/)</script>'
+        self.user.last_name = ''
         self.user.save()
         
         self.client.login(username='testscorer', password='password')