Remove multi-statement lines, per pep8

diff --git a/pgweb/mailqueue/admin.py b/pgweb/mailqueue/admin.py
index 6529ea184250742fcb1f015d7844e4b4501a9847..b99a3b63b5112f96dcabe8e7fb3d1265d01fa028 100644 (file)
--- a/pgweb/mailqueue/admin.py
+++ b/pgweb/mailqueue/admin.py
@@ -16,12 +16,14 @@ class QueuedMailAdmin(admin.ModelAdmin):
             parser = Parser()
             msg = parser.parsestr(obj.fullmsg)
             b = msg.get_payload(decode=True)
-            if b: return b
+            if b:
+                return b
 
             pl = msg.get_payload()
             for p in pl:
                 b = p.get_payload(decode=True)
-                if b: return b
+                if b:
+                    return b
             return "Could not find body"
         except Exception, e:
             return "Failed to get body: %s" % e

diff --git a/pgweb/survey/models.py b/pgweb/survey/models.py
index 237d31771027f26177f33c9f499e24a75eb8d746..ad4cd62bfd6152293b69f19f0b6c1c61cc32634e 100644 (file)
--- a/pgweb/survey/models.py
+++ b/pgweb/survey/models.py
@@ -37,7 +37,8 @@ class Survey(models.Model):
     def questions(self):
         for i in range(1, 9):
             v = getattr(self, "opt%s" % i)
-            if not v: break
+            if not v:
+                break
             yield SurveyQuestion(i, v)
 
     @property
@@ -62,7 +63,8 @@ class Survey(models.Model):
     def _get_complete_answers(self):
         for i in range(1, 9):
             q = getattr(self, "opt%s" % i)
-            if not q: break
+            if not q:
+                break
             n = getattr(self.answers, "tot%s" % i)
             yield (q, n)
 

diff --git a/pgweb/util/helpers.py b/pgweb/util/helpers.py
index 60686ddb1f0e5443424a2f656cd26c23caa593cb..68628ce68d423417749421cc9e2b5102c59fd512 100644 (file)
--- a/pgweb/util/helpers.py
+++ b/pgweb/util/helpers.py
@@ -92,7 +92,8 @@ class PgXmlHelper(django.utils.xmlutils.SimplerXMLGenerator):
         self.skipempty = skipempty
 
     def add_xml_element(self, name, value):
-        if self.skipempty and value == '': return
+        if self.skipempty and value == '':
+            return
         self.startElement(name, {})
         self.characters(value)
         self.endElement(name)

diff --git a/pgweb/util/moderation.py b/pgweb/util/moderation.py
index 83d7f316648890f15e19c51cfaf2531940540a25..09ff63cf970cdd4bc01118b6355181a1a7f3d6fc 100644 (file)
--- a/pgweb/util/moderation.py
+++ b/pgweb/util/moderation.py
@@ -10,7 +10,8 @@ from pgweb.quotes.models import Quote
 # Pending moderation requests (including URLs for the admin interface))
 def _get_unapproved_list(objecttype):
     objects = objecttype.objects.filter(approved=False)
-    if not len(objects): return None
+    if not len(objects):
+        return None
     return {
         'name': objects[0]._meta.verbose_name_plural,
         'entries': [{'url': '/admin/%s/%s/%s/' % (x._meta.app_label, x._meta.model_name, x.pk), 'title': unicode(x)} for x in objects]

diff --git a/pgweb/util/signals.py b/pgweb/util/signals.py
index 85d6302385e36f4d1353b0ab88b68189482acbcd..879913d52700dc0db5e07ab8146609b4d488f5bc 100644 (file)
--- a/pgweb/util/signals.py
+++ b/pgweb/util/signals.py
@@ -43,7 +43,8 @@ def _get_full_text_diff(obj, oldobj):
             )
         )
     ) for n in fieldlist if _get_attr_value(oldobj, n) != _get_attr_value(obj, n)])
-    if not s: return None
+    if not s:
+        return None
     return s
 
 

diff --git a/pgweb/util/sitestruct.py b/pgweb/util/sitestruct.py
index 40d46bc95261db39320ebf7ecad8bf05306a5cd0..de028e313a65d208e468672f0b99d5b46ed4ef2a 100644 (file)
--- a/pgweb/util/sitestruct.py
+++ b/pgweb/util/sitestruct.py
@@ -20,4 +20,5 @@ def get_all_pages_struct(method='get_struct'):
                 continue
 
             if hasattr(m, method):
-                for x in getattr(m, method)(): yield x
+                for x in getattr(m, method)():
+                    yield x

diff --git a/tools/docs/docload.py b/tools/docs/docload.py
index 7a2e03021819b29dc54ff539c9e3b0e1da3f7a61..3a61391f863d994f1a71437b0c27fd2c28c758bc 100755 (executable)
--- a/tools/docs/docload.py
+++ b/tools/docs/docload.py
@@ -55,7 +55,8 @@ def load_doc_file(filename, f):
         title = tm.group(1)
     else:
         title = ""
-    if not quiet: print "--- file: %s (%s) ---" % (filename, title)
+    if not quiet:
+        print "--- file: %s (%s) ---" % (filename, title)
 
     s = tidy.parseString(contents.encode('utf-8'), **tidyopts)
     curs.execute("INSERT INTO docs (file, version, title, content) VALUES (%(f)s, %(v)s, %(t)s, %(c)s)", {
@@ -119,7 +120,8 @@ for member in tf:
         for inner_member in inner_tar:
             # Some old versions have index.html as a symlink - so let's
             # just ignore all symlinks to be on the safe side.
-            if inner_member.issym(): continue
+            if inner_member.issym():
+                continue
 
             if inner_member.name.endswith('.html') or inner_member.name.endswith('.htm'):
                 load_doc_file(inner_member.name, inner_tar.extractfile(inner_member))
@@ -140,4 +142,5 @@ if iscurrent:
 connection.commit()
 connection.close()
 
-if not quiet: print "Done (%i pages)." % pagecount
+if not quiet:
+    print "Done (%i pages)." % pagecount

diff --git a/tools/ftp/spider_ftp.py b/tools/ftp/spider_ftp.py
index d3d12dd655988de5e23e50a45ae768952e07a5ef..557baa75abcdb67544b8181028bc7cbf72f8471d 100755 (executable)
--- a/tools/ftp/spider_ftp.py
+++ b/tools/ftp/spider_ftp.py
@@ -30,8 +30,10 @@ def read_file(fn):
 def parse_directory(dirname, rootlen):
     mynode = {}
     for f in os.listdir(dirname):
-        if f.startswith(".") and not f == ".message": continue
-        if f == "sync_timestamp": continue
+        if f.startswith(".") and not f == ".message":
+            continue
+        if f == "sync_timestamp":
+            continue
 
         fn = os.path.join(dirname, f)
         if os.path.isdir(fn):
@@ -72,7 +74,8 @@ def Usage():
     sys.exit(1)
 
 
-if len(sys.argv) != 3: Usage()
+if len(sys.argv) != 3:
+    Usage()
 
 parse_directory(sys.argv[1], len(sys.argv[1]))