# HG changeset patch
# User Pawel Solyga <Pawel.Solyga@gmail.com>
# Date 1223934891 0
# Node ID 9efdc7bc3565b591651435d062a8c2fe542c1fa9
# Parent  c4f1a07ee3407ea1cf66b69d784cab72067a4b28
Add missing blank lines between imports and sort all of the imports.

Patch by: Pawel Solyga
Review by: to-be-reviewed

diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/logic/models/document.py
--- a/app/soc/logic/models/document.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/logic/models/document.py	Mon Oct 13 21:54:51 2008 +0000
@@ -24,6 +24,7 @@
 
 from soc.logic import key_name
 from soc.logic.models import base
+
 import soc.models.document
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/logic/models/settings.py
--- a/app/soc/logic/models/settings.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/logic/models/settings.py	Mon Oct 13 21:54:51 2008 +0000
@@ -24,6 +24,7 @@
 
 from soc.logic import key_name
 from soc.logic.models import base
+
 import soc.models.site_settings
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/logic/models/sponsor.py
--- a/app/soc/logic/models/sponsor.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/logic/models/sponsor.py	Mon Oct 13 21:54:51 2008 +0000
@@ -24,6 +24,7 @@
 
 from soc.logic import key_name
 from soc.logic.models import base
+
 import soc.models.sponsor
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/logic/models/user.py
--- a/app/soc/logic/models/user.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/logic/models/user.py	Mon Oct 13 21:54:51 2008 +0000
@@ -24,6 +24,7 @@
 
 from soc.logic import key_name
 from soc.logic.models import base
+
 import soc.models.user
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/logic/models/work.py
--- a/app/soc/logic/models/work.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/logic/models/work.py	Mon Oct 13 21:54:51 2008 +0000
@@ -24,6 +24,7 @@
 
 from soc.logic import key_name
 from soc.logic.models import base
+
 import soc.models.work
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/logic/validate.py
--- a/app/soc/logic/validate.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/logic/validate.py	Mon Oct 13 21:54:51 2008 +0000
@@ -26,9 +26,9 @@
 
 from google.appengine.api import urlfetch
 
-import feedparser
+from soc.logic import path_link_name
 
-from soc.logic import path_link_name
+import feedparser
 
 
 def isFeedURLValid(feed_url=None):
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/models/answer.py
--- a/app/soc/models/answer.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/models/answer.py	Mon Oct 13 21:54:51 2008 +0000
@@ -21,10 +21,12 @@
   '"Sverre Rabbelier" <sverre@rabbelier.nl>',
 ]
 
+
 from google.appengine.ext import db
 
 from soc import models
 from soc.models import base
+
 import soc.models.question
 import soc.models.review
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/models/base.py
--- a/app/soc/models/base.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/models/base.py	Mon Oct 13 21:54:51 2008 +0000
@@ -28,6 +28,7 @@
 from google.appengine.ext import db
 
 from soc.views import helper
+
 import soc.views.helper.forms
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/models/club.py
--- a/app/soc/models/club.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/models/club.py	Mon Oct 13 21:54:51 2008 +0000
@@ -24,6 +24,7 @@
 from google.appengine.ext import db
 
 from soc.models import base
+
 import soc.models.group
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/models/document.py
--- a/app/soc/models/document.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/models/document.py	Mon Oct 13 21:54:51 2008 +0000
@@ -23,10 +23,9 @@
 
 from google.appengine.ext import db
 
-import polymodel
-
 from django.utils.translation import ugettext_lazy
 
+import polymodel
 import soc.models.user
 import soc.models.work
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/models/group.py
--- a/app/soc/models/group.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/models/group.py	Mon Oct 13 21:54:51 2008 +0000
@@ -24,13 +24,14 @@
 
 from google.appengine.ext import db
 
-import polymodel
-
 from django.utils.translation import ugettext_lazy
 
 from soc.models import countries
+
+import polymodel
 import soc.models.user
 
+
 class Group(polymodel.PolyModel):
   """Common data fields for all groups.
   """
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/models/home_settings.py
--- a/app/soc/models/home_settings.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/models/home_settings.py	Mon Oct 13 21:54:51 2008 +0000
@@ -24,10 +24,10 @@
 
 from google.appengine.ext import db
 
-import polymodel
 
 from django.utils.translation import ugettext_lazy
 
+import polymodel
 import soc.models.document
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/models/organization.py
--- a/app/soc/models/organization.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/models/organization.py	Mon Oct 13 21:54:51 2008 +0000
@@ -20,11 +20,14 @@
   '"Pawel Solyga" <pawel.solyga@gmail.com>',
 ]
 
+
 from google.appengine.ext import db
 
 from soc import models
+
 import soc.models.group
 
+
 class Organization(soc.models.group.Group):
   """Organization details.
 
@@ -36,5 +39,4 @@
      'reviewers' back-reference Query of the Organization model 'org'
      reference.
   """
-  pass
-
+  pass
\ No newline at end of file
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/models/person.py
--- a/app/soc/models/person.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/models/person.py	Mon Oct 13 21:54:51 2008 +0000
@@ -24,11 +24,11 @@
 
 from google.appengine.ext import db
 
-import polymodel
-
 from django.utils.translation import ugettext_lazy
 
 from soc.models import countries
+
+import polymodel
 import soc.models.user
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/models/review.py
--- a/app/soc/models/review.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/models/review.py	Mon Oct 13 21:54:51 2008 +0000
@@ -24,6 +24,7 @@
 from google.appengine.ext import db
 
 from soc import models
+
 import soc.models.survey
 import soc.models.work
 import soc.models.reviewer
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/models/school.py
--- a/app/soc/models/school.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/models/school.py	Mon Oct 13 21:54:51 2008 +0000
@@ -24,6 +24,7 @@
 from google.appengine.ext import db
 
 from soc.models import base
+
 import soc.models.group
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/models/sponsor.py
--- a/app/soc/models/sponsor.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/models/sponsor.py	Mon Oct 13 21:54:51 2008 +0000
@@ -23,6 +23,7 @@
 from google.appengine.ext import db
 
 from soc import models
+
 import soc.models.group
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/models/task.py
--- a/app/soc/models/task.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/models/task.py	Mon Oct 13 21:54:51 2008 +0000
@@ -25,6 +25,7 @@
 
 from soc import models
 from soc.models import base
+
 import soc.models.proposal
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/docs/show.py
--- a/app/soc/views/docs/show.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/docs/show.py	Mon Oct 13 21:54:51 2008 +0000
@@ -28,8 +28,9 @@
 
 from soc.logic import document
 from soc.logic import out_of_band
+from soc.views import helper
 from soc.views import simple
-from soc.views import helper
+
 import soc.views.helper.responses
 import soc.views.helper.templates
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/helper/lists.py
--- a/app/soc/views/helper/lists.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/helper/lists.py	Mon Oct 13 21:54:51 2008 +0000
@@ -24,6 +24,7 @@
 
 
 from soc.views import helper
+
 import soc.views.helper.forms
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/helper/responses.py
--- a/app/soc/views/helper/responses.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/helper/responses.py	Mon Oct 13 21:54:51 2008 +0000
@@ -30,7 +30,15 @@
 from django import http
 from django.template import loader
 
+from soc.logic import system
+from soc.logic.site import id_user
+from soc.logic.site import sidebar
+from soc.views import helper
+from soc.views.helper import html_menu
+
+import soc.logic
 import soc.logic.models.user
+import soc.views.helper.requests
 
 # DeadlineExceededError can live in two different places
 try:
@@ -40,14 +48,6 @@
   # In the development server
   from google.appengine.runtime.apiproxy_errors import DeadlineExceededError
 
-import soc.logic
-from soc.logic import system
-from soc.logic.site import id_user
-from soc.logic.site import sidebar
-from soc.views import helper
-import soc.views.helper.requests
-from soc.views.helper import html_menu
-
 
 def respond(request, template, context=None, response_args=None):
   """Helper to render a response, passing standard stuff to the response.
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/helper/templatetags/forms_helpers.py
--- a/app/soc/views/helper/templatetags/forms_helpers.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/helper/templatetags/forms_helpers.py	Mon Oct 13 21:54:51 2008 +0000
@@ -24,6 +24,7 @@
 
 
 from django import template
+
 register = template.Library()
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/person/profile.py
--- a/app/soc/views/person/profile.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/person/profile.py	Mon Oct 13 21:54:51 2008 +0000
@@ -29,12 +29,14 @@
 
 
 from google.appengine.api import users
+
 from django import http
 from django import shortcuts
 from django import newforms as forms
 
 from soc.models import person
 from soc.views import helper
+
 import soc.views.helper.forms
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/simple.py
--- a/app/soc/views/simple.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/simple.py	Mon Oct 13 21:54:51 2008 +0000
@@ -29,6 +29,7 @@
 from soc.logic import out_of_band
 from soc.logic.site import id_user
 from soc.views import helper
+
 import soc.views.helper.responses
 import soc.views.helper.templates
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/site/docs/edit.py
--- a/app/soc/views/site/docs/edit.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/site/docs/edit.py	Mon Oct 13 21:54:51 2008 +0000
@@ -29,19 +29,21 @@
 from django.utils.translation import ugettext_lazy
 
 from soc.logic import models
-from soc.logic.models import document
 from soc.logic import out_of_band
 from soc.logic import path_link_name
+from soc.logic.models import document
 from soc.logic.site import id_user
+
+from soc.views import helper
+from soc.views import simple
+from soc.views.helper import access
+from soc.views.user import profile
+
 import soc.models.document
-from soc.views import helper
-from soc.views.helper import access
 import soc.views.helper.forms
 import soc.views.helper.requests
 import soc.views.helper.responses
 import soc.views.helper.widgets
-from soc.views import simple
-from soc.views.user import profile
 import soc.views.out_of_band
 
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/site/docs/list.py
--- a/app/soc/views/site/docs/list.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/site/docs/list.py	Mon Oct 13 21:54:51 2008 +0000
@@ -22,12 +22,13 @@
   ]
 
 
-import soc.logic
 from soc.logic.models import work
-import soc.models.document
 from soc.views import simple
 from soc.views import helper
 from soc.views.helper import access
+
+import soc.logic
+import soc.models.document
 import soc.views.helper.lists
 import soc.views.helper.responses
 import soc.views.out_of_band
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/site/sponsor/list.py
--- a/app/soc/views/site/sponsor/list.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/site/sponsor/list.py	Mon Oct 13 21:54:51 2008 +0000
@@ -22,11 +22,12 @@
   ]
 
 
-import soc.logic
 from soc.logic import models
+from soc.views import helper
 from soc.views import simple
-from soc.views import helper
 from soc.views.helper import access
+
+import soc.logic
 import soc.views.helper.lists
 import soc.views.helper.responses
 import soc.views.out_of_band
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/site/sponsor/profile.py
--- a/app/soc/views/site/sponsor/profile.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/site/sponsor/profile.py	Mon Oct 13 21:54:51 2008 +0000
@@ -27,23 +27,25 @@
 from django import http
 from django import newforms as forms
 
-import soc.logic
+from soc.logic import models
+from soc.logic import out_of_band
 from soc.logic import validate
-from soc.logic import out_of_band
+from soc.logic.models import sponsor
 from soc.logic.site import id_user
-from soc.logic import models
-from soc.logic.models import sponsor
+from soc.views import helper
+from soc.views import simple
+from soc.views.helper import access
+from soc.views.user import profile
+
+import soc.logic
 import soc.models.sponsor
-from soc.views import helper
-from soc.views.helper import access
 import soc.views.helper.forms
 import soc.views.helper.requests
 import soc.views.helper.responses
 import soc.views.helper.widgets
-from soc.views import simple
-from soc.views.user import profile
 import soc.views.out_of_band
 
+
 class CreateForm(helper.forms.DbModelForm):
   """Django form displayed when creating a Sponsor.
   """
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/site/user/list.py
--- a/app/soc/views/site/user/list.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/site/user/list.py	Mon Oct 13 21:54:51 2008 +0000
@@ -22,13 +22,14 @@
   ]
 
 
-import soc.logic
 from soc.logic import models
 from soc.logic.site import id_user
-import soc.models.user
+from soc.views import helper
 from soc.views import simple
-from soc.views import helper
 from soc.views.helper import access
+
+import soc.logic
+import soc.models.user
 import soc.views.helper.lists
 import soc.views.helper.responses
 import soc.views.out_of_band
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/site/user/profile.py
--- a/app/soc/views/site/user/profile.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/site/user/profile.py	Mon Oct 13 21:54:51 2008 +0000
@@ -28,21 +28,21 @@
 from django import newforms as forms
 from django.utils.translation import ugettext_lazy
 
-import soc.logic
 from soc.logic import models
+from soc.logic import out_of_band
 from soc.logic import validate
-from soc.logic import out_of_band
 from soc.logic.site import id_user
 from soc.views import simple
 from soc.views import helper
 from soc.views.helper import access
+from soc.views.user import profile
+
+import soc.logic
+import soc.models.user
 import soc.views.helper.forms
 import soc.views.helper.lists
 import soc.views.helper.requests
 import soc.views.helper.responses
-from soc.views.user import profile
-
-import soc.models.user
 
 
 class LookupForm(helper.forms.DbModelForm):
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/sponsor/profile.py
--- a/app/soc/views/sponsor/profile.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/sponsor/profile.py	Mon Oct 13 21:54:51 2008 +0000
@@ -22,10 +22,11 @@
   ]
 
 
+from soc.logic import out_of_band
+from soc.views import helper
+from soc.views import simple
+
 import soc.logic.models.sponsor
-from soc.logic import out_of_band
-from soc.views import simple
-from soc.views import helper
 import soc.views.helper.responses
 import soc.views.helper.templates
 
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/user/profile.py
--- a/app/soc/views/user/profile.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/user/profile.py	Mon Oct 13 21:54:51 2008 +0000
@@ -23,23 +23,24 @@
 
 
 from google.appengine.api import users
+
 from django import http
+from django import newforms as forms
 from django import shortcuts
-from django import newforms as forms
 from django.utils.translation import ugettext_lazy
 
+from soc.logic import models
+from soc.logic import out_of_band
+from soc.logic import validate
+from soc.logic.site import id_user
+from soc.views import helper
+from soc.views import simple
+
 import soc.logic
-from soc.logic import models
-from soc.logic import validate
-from soc.logic import out_of_band
-from soc.logic.site import id_user
-from soc.views import helper
+import soc.models.user
 import soc.views.helper.forms
 import soc.views.helper.requests
 import soc.views.helper.responses
-from soc.views import simple
-
-import soc.models.user
 
 
 class UserForm(helper.forms.DbModelForm):
diff -r c4f1a07ee340 -r 9efdc7bc3565 app/soc/views/user/roles.py
--- a/app/soc/views/user/roles.py	Mon Oct 13 21:34:07 2008 +0000
+++ b/app/soc/views/user/roles.py	Mon Oct 13 21:54:51 2008 +0000
@@ -27,7 +27,9 @@
 
 
 from google.appengine.api import users
+
 from django import http
+
 from soc.views.helpers import response_helpers