[PATCH 4/7] trivial: Cleanup of 'views/__init__.py'

[Stephen Finucane]

Resolve some issues with the aforementioned file. These are mostly
stylistic changes.

Signed-off-by: Stephen Finucane <stephen.finucane at intel.com>
---
 patchwork/views/__init__.py | 90 +++++++++++++++++++++++++--------------------
 1 file changed, 50 insertions(+), 40 deletions(-)

diff --git a/patchwork/views/__init__.py b/patchwork/views/__init__.py
index b64f604..be442bd 100644
--- a/patchwork/views/__init__.py
+++ b/patchwork/views/__init__.py
@@ -17,44 +17,51 @@
 # along with Patchwork; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-
-from base import *
-from patchwork.utils import Order, get_patch_ids, bundle_actions, set_bundle
-from patchwork.paginator import Paginator
-from patchwork.forms import MultiplePatchForm
-from patchwork.models import Comment
-import re
 import datetime
+import email.utils
+import re
 
 try:
-    from email.mime.nonmultipart import MIMENonMultipart
     from email.encoders import encode_7or8bit
-    from email.parser import HeaderParser
     from email.header import Header
+    from email.mime.nonmultipart import MIMENonMultipart
+    from email.parser import HeaderParser
     import email.utils
 except ImportError:
     # Python 2.4 compatibility
-    from email.MIMENonMultipart import MIMENonMultipart
     from email.Encoders import encode_7or8bit
-    from email.Parser import HeaderParser
     from email.Header import Header
+    from email.MIMENonMultipart import MIMENonMultipart
+    from email.Parser import HeaderParser
     import email.Utils
     email.utils = email.Utils
 
-def generic_list(request, project, view,
-        view_args = {}, filter_settings = [], patches = None,
-        editable_order = False):
+from base import *
+from patchwork.forms import MultiplePatchForm
+from patchwork.models import Comment, Patch
+from patchwork.paginator import Paginator
+from patchwork.requestcontext import PatchworkRequestContext
+from patchwork.utils import Order, get_patch_ids, bundle_actions, set_bundle
 
-    context = PatchworkRequestContext(request,
-            list_view = view,
-            list_view_params = view_args)
 
+def generic_list(request, project, view, view_args=None, filter_settings=None,
+                 patches=None, editable_order=False):
+    if view_args is None:
+        view_args = {}
+    if filter_settings is None:
+        filter_settings = []
+
+    context = PatchworkRequestContext(request,
+                                      list_view=view,
+                                      list_view_params=view_args)
     context.project = project
+
     data = {}
     if request.method == 'GET':
         data = request.GET
     elif request.method == 'POST':
         data = request.POST
+
     order = Order(data.get('order'), editable=editable_order)
 
     # Explicitly set data to None because request.POST will be an empty dict
@@ -63,8 +70,10 @@ def generic_list(request, project, view,
     # there's been a form submission.
     if request.method != 'POST':
         data = None
-    user = request.user
+
     properties_form = None
+
+    user = request.user
     if project.is_editable(user):
 
         # we only pass the post data to the MultiplePatchForm if that was
@@ -73,7 +82,7 @@ def generic_list(request, project, view,
         if data and data.get('form', '') == 'patchlistform':
             data_tmp = data
 
-        properties_form = MultiplePatchForm(project, data = data_tmp)
+        properties_form = MultiplePatchForm(project, data=data_tmp)
 
     if request.method == 'POST' and data.get('form') == 'patchlistform':
         action = data.get('action', '').lower()
@@ -83,7 +92,7 @@ def generic_list(request, project, view,
         if data.get('bundle_name', False):
             action = 'create'
 
-        ps = Patch.objects.filter(id__in = get_patch_ids(data))
+        ps = Patch.objects.filter(id__in=get_patch_ids(data))
 
         if action in bundle_actions:
             errors = set_bundle(user, project, action, data, ps, context)
@@ -126,11 +135,11 @@ def generic_list(request, project, view,
     paginator = Paginator(request, patches)
 
     context.update({
-            'page':             paginator.current_page,
-            'patchform':        properties_form,
-            'project':          project,
-            'order':            order,
-            })
+        'page': paginator.current_page,
+        'patchform': properties_form,
+        'project': project,
+        'order': order,
+    })
 
     return context
 
@@ -141,28 +150,29 @@ def process_multiplepatch_form(form, user, action, patches, context):
         return ['The submitted form data was invalid']
 
     if len(patches) == 0:
-        context.add_message("No patches selected; nothing updated")
+        context.add_message('No patches selected; nothing updated')
         return errors
 
     changed_patches = 0
     for patch in patches:
         if not patch.is_editable(user):
-            errors.append("You don't have permissions to edit patch '%s'"
-                            % patch.name)
+            errors.append("You don't have permissions to edit patch '%s'" % (
+                patch.name))
             continue
 
         changed_patches += 1
         form.save(patch)
 
     if changed_patches == 1:
-        context.add_message("1 patch updated")
+        context.add_message('1 patch updated')
     elif changed_patches > 1:
-        context.add_message("%d patches updated" % changed_patches)
+        context.add_message('%d patches updated' % changed_patches)
     else:
-        context.add_message("No patches updated")
+        context.add_message('No patches updated')
 
     return errors
 
+
 class PatchMbox(MIMENonMultipart):
     patch_charset = 'utf-8'
     def __init__(self, _text):
@@ -171,29 +181,30 @@ class PatchMbox(MIMENonMultipart):
         self.set_payload(_text.encode(self.patch_charset))
         encode_7or8bit(self)
 
+
 def patch_to_mbox(patch):
     postscript_re = re.compile('\n-{2,3} ?\n')
 
     comment = None
     try:
-        comment = Comment.objects.get(patch = patch, msgid = patch.msgid)
-    except Exception:
+        comment = Comment.objects.get(patch=patch, msgid=patch.msgid)
+    except Comment.DoesNotExist:
         pass
 
     body = ''
     if comment:
-        body = comment.content.strip() + "\n"
+        body = comment.content.strip() + '\n'
 
     parts = postscript_re.split(body, 1)
     if len(parts) == 2:
         (body, postscript) = parts
-        body = body.strip() + "\n"
+        body = body.strip() + '\n'
         postscript = postscript.rstrip()
     else:
         postscript = ''
 
-    for comment in Comment.objects.filter(patch = patch) \
-            .exclude(msgid = patch.msgid):
+    for comment in Comment.objects.filter(patch=patch).exclude(
+            msgid=patch.msgid):
         body += comment.patch_responses()
 
     if postscript:
@@ -208,13 +219,12 @@ def patch_to_mbox(patch):
     mail = PatchMbox(body)
     mail['Subject'] = patch.name
     mail['From'] = email.utils.formataddr((
-                    str(Header(patch.submitter.name, mail.patch_charset)),
-                    patch.submitter.email))
+        str(Header(patch.submitter.name, mail.patch_charset)),
+        patch.submitter.email))
     mail['X-Patchwork-Id'] = str(patch.id)
     mail['Message-Id'] = patch.msgid
     mail.set_unixfrom('From patchwork ' + patch.date.ctime())
 
-
     copied_headers = ['To', 'Cc', 'Date']
     orig_headers = HeaderParser().parsestr(str(patch.headers))
     for header in copied_headers:
-- 
2.0.0