Merge pull request #91 from plone/jensens/cleanup

Cleanup code analysis errors
plone · May 17, 2018 · a712134 · a712134 · jenkins-plone-org · May 17, 2018
2 parents e12b682 + 8ea0418
commit a712134
Show file tree

Hide file tree

Showing 10 changed files with 198 additions and 153 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,6 +14,9 @@ New features:
 
 Bug fixes:
 
+- Cleanup code analysis problems.
+  [jensens]
+
 - Fix SingleCheckBoxBoolWidget description to render structure
   [allusa]
 

diff --git a/plone/app/z3cform/converters.py b/plone/app/z3cform/converters.py
@@ -321,7 +321,7 @@ def toWidgetValue(self, value):
             'internal': u'',
             'external': u'',
             'email': u'',
-            'email_subject': u''
+            'email_subject': u'',
         }
         if not value:
             return result

diff --git a/plone/app/z3cform/templates.py b/plone/app/z3cform/templates.py
@@ -16,7 +16,7 @@ def path(filepart):
     return os.path.join(
         os.path.dirname(plone.app.z3cform.__file__),
         'templates',
-        filepart
+        filepart,
     )
 
 # Override the layout wrapper view default template with a more Plone-looking

diff --git a/plone/app/z3cform/tests/layer.py b/plone/app/z3cform/tests/layer.py
@@ -31,5 +31,5 @@ def setUpPloneSite(self, portal):
 PAZ3CForm_FIXTURE = PAZ3CFormLayer()
 PAZ3CForm_INTEGRATION_TESTING = IntegrationTesting(
     bases=(PAZ3CForm_FIXTURE,),
-    name='plone.app.z3cform:Integration'
+    name='plone.app.z3cform:Integration',
 )
diff --git a/plone/app/z3cform/tests/test_utils.py b/plone/app/z3cform/tests/test_utils.py
@@ -11,18 +11,20 @@ def test_simple(self):
         test_compare = 1
         test_out = call_callables(
             test_in,
-            'funny return value'
+            'funny return value',
         )
         self.assertEqual(test_out, test_compare)
 
     def test_simple_function(self):
         from plone.app.z3cform.utils import call_callables
 
-        def test_in(x): return x
+        def test_in(x):
+            return x
+
         test_compare = 'funny return value'
         test_out = call_callables(
             test_in,
-            'funny return value'
+            'funny return value',
         )
         self.assertEqual(test_out, test_compare)
 
@@ -33,7 +35,7 @@ def test_list(self):
         test_compare = [1, 2, 3, 'funny return value']
         test_out = call_callables(
             test_in,
-            'funny return value'
+            'funny return value',
         )
         self.assertEqual(test_out, test_compare)
 
@@ -44,7 +46,7 @@ def test_tuple(self):
         test_compare = (1, 2, 3, 'funny return value')
         test_out = call_callables(
             test_in,
-            'funny return value'
+            'funny return value',
         )
         self.assertEqual(test_out, test_compare)
 
@@ -63,8 +65,8 @@ def test_complex(self):
                     'subsubnormal': 789,
                     'subsublist': [7, 8, 9, lambda x: x],
                     'subsubtuple': (7, 8, 9, lambda x: x),
-                }
-            }
+                },
+            },
         }
 
         test_compare = {
@@ -79,13 +81,13 @@ def test_complex(self):
                     'subsubnormal': 789,
                     'subsublist': [7, 8, 9, 'funny return value'],
                     'subsubtuple': (7, 8, 9, 'funny return value'),
-                }
-            }
+                },
+            },
         }
 
         test_out = call_callables(
             test_in,
-            'funny return value'
+            'funny return value',
         )
 
         self.assertEqual(test_out, test_compare)
@@ -108,17 +110,17 @@ def test_is_same_domain(self):
         # Those use the same protocol and are on the same domaain
         self.assertTrue(is_same_domain(
             'https://plone.org/doc1',
-            'https://plone.org/doc2/doc3'
+            'https://plone.org/doc2/doc3',
         ))
 
         # These are two completly different URLs
         self.assertTrue(not is_same_domain(
             'https://domain1.com',
-            'https://anotherdomain.com'
+            'https://anotherdomain.com',
         ))
 
         # Here, different transport protocols are used. Returning False.
         self.assertTrue(not is_same_domain(
             'https://plone.org',
-            'http://plone.org'
+            'http://plone.org',
         ))