pyflakes/pep8 adjustments

tests/example.py

@@ -24,28 +24,23 @@ def load_content(ex):
 
 ex_linuxdoc = Namespace(
     doctype=tldp.doctypes.linuxdoc.Linuxdoc,
-               filename=opj(sampledocs, 'linuxdoc-simple.sgml'),
-              )
+    filename=opj(sampledocs, 'linuxdoc-simple.sgml'),)
 
 ex_docbooksgml = Namespace(
     doctype=tldp.doctypes.docbooksgml.DocbookSGML,
-                  filename=opj(sampledocs, 'docbooksgml-simple.sgml'),
-                 )
+    filename=opj(sampledocs, 'docbooksgml-simple.sgml'),)
 
 ex_docbook4xml = Namespace(
     doctype=tldp.doctypes.docbook4xml.Docbook4XML,
-                 filename=opj(sampledocs, 'docbook4xml-simple.xml'),
-                )
+    filename=opj(sampledocs, 'docbook4xml-simple.xml'),)
 
 ex_docbook5xml = Namespace(
     doctype=tldp.doctypes.docbook5xml.Docbook5XML,
-                 filename=opj(sampledocs, 'docbook5xml-simple.xml'),
-                )
+    filename=opj(sampledocs, 'docbook5xml-simple.xml'),)
 
 ex_asciidoc = Namespace(
     doctype=tldp.doctypes.asciidoc.Asciidoc,
-           filename=opj(sampledocs, 'asciidoc-complete.txt'),
-          )
+    filename=opj(sampledocs, 'asciidoc-complete.txt'),)
 #
 # ex_rst = Namespace(
 #           doctype=tldp.doctypes.rst.RestructuredText,
@@ -60,20 +55,17 @@ ex_asciidoc = Namespace(
 ex_linuxdoc_dir = Namespace(
     doctype=tldp.doctypes.linuxdoc.Linuxdoc,
     filename=opj(sampledocs, 'Linuxdoc-Larger',
-                            'Linuxdoc-Larger.sgml'),
-              )
+                             'Linuxdoc-Larger.sgml'),)
 
 ex_docbook4xml_dir = Namespace(
     doctype=tldp.doctypes.docbook4xml.Docbook4XML,
     filename=opj(sampledocs, 'DocBook-4.2-WHYNOT',
-                            'DocBook-4.2-WHYNOT.xml'),
-              )
+                             'DocBook-4.2-WHYNOT.xml'),)
 
 ex_docbooksgml_dir = Namespace(
     doctype=tldp.doctypes.docbooksgml.DocbookSGML,
     filename=opj(sampledocs, 'DocBookSGML-Larger',
-                            'DocBookSGML-Larger.sgml'),
-              )
+                             'DocBookSGML-Larger.sgml'),)
 
 # -- a bit ugly, but grab each dict
 sources = [y for x, y in locals().items() if x.startswith('ex_')]
@@ -81,18 +73,14 @@ sources = [y for x, y in locals().items() if x.startswith('ex_')]
 for ex in sources:
     load_content(ex)
 
-
 unknown_doctype = Namespace(
     doctype=None,
-               filename=opj(sampledocs, 'Unknown-Doctype.xqf'),
-              )
+    filename=opj(sampledocs, 'Unknown-Doctype.xqf'),)
 
 broken_docbook4xml = Namespace(
     doctype=tldp.doctypes.docbook4xml.Docbook4XML,
-                 filename=opj(sampledocs, 'docbook4xml-broken.xml'),
-                )
+    filename=opj(sampledocs, 'docbook4xml-broken.xml'),)
+
 load_content(broken_docbook4xml)
 
-
-
 # -- end of file

tests/test_cascadingconfig.py

@@ -86,8 +86,7 @@ class CascadingConfigBasicTest(CCTestTools):
             env=dict(),
             cfg='',
             exp_config=Namespace(size=9),
-          exp_args=[],
-        )
+            exp_args=[],)
 
         cc = CascadingConfig(c.tag, c.argparser, argv=c.argv, env=c.env)
         config, args = cc.parse()
@@ -105,8 +104,7 @@ class CascadingConfigBasicTest(CCTestTools):
             env=dict(),
             cfg='[tag]\nsize = 8',
             exp_config=Namespace(size=8),
-          exp_args=[],
-        )
+            exp_args=[],)
 
         self.writeconfig(c)
         c.env.setdefault('TAG_CONFIGFILE', c.configfile)
@@ -128,8 +126,7 @@ class CascadingConfigBasicTest(CCTestTools):
             env=dict(),
             cfg='[tag]\nsize = 8',
             exp_config=Namespace(size=8),
-          exp_args=[],
-        )
+            exp_args=[],)
         self.writeconfig(c)
         c.argv.extend(['--configfile', c.configfile])
         cc = CascadingConfig(c.tag, c.argparser, argv=c.argv, env=c.env)
@@ -150,8 +147,7 @@ class CascadingConfigBasicTest(CCTestTools):
             env=dict(TAG_SIZE=7, ),
             cfg='[tag]\nsize = 8',
             exp_config=Namespace(size=7),
-          exp_args=[],
-        )
+            exp_args=[],)
         self.writeconfig(c)
         c.argv.extend(['--configfile', c.configfile])
         cc = CascadingConfig(c.tag, c.argparser, argv=c.argv, env=c.env)
@@ -172,8 +168,7 @@ class CascadingConfigBasicTest(CCTestTools):
             env=dict(TAG_SIZE=7, ),
             cfg='[tag]\nsize = 8',
             exp_config=Namespace(size=6),
-          exp_args=[],
-        )
+            exp_args=[],)
         self.writeconfig(c)
         c.argv.extend(['--configfile', c.configfile])
         cc = CascadingConfig(c.tag, c.argparser, argv=c.argv, env=c.env)
@@ -191,8 +186,7 @@ class CascadingConfigBasicTest(CCTestTools):
             env=dict(),
             cfg='',
             exp_config=Namespace(source=''),
-          exp_args=[],
-        )
+            exp_args=[],)
         cc = CascadingConfig(c.tag, c.argparser, argv=c.argv, env=c.env)
         config, args = cc.parse()
         self.assertEqual(c.exp_config, config)
@@ -209,8 +203,7 @@ class CascadingConfigBasicTest(CCTestTools):
             env=dict(),
             cfg='',
             exp_config=Namespace(source=['/some/path']),
-          exp_args=[],
-        )
+            exp_args=[],)
         cc = CascadingConfig(c.tag, c.argparser, argv=c.argv, env=c.env)
         config, args = cc.parse()
         self.assertEqual(c.exp_config, config)

tests/test_utils.py

@@ -61,6 +61,7 @@ class Test_arg_isstr(unittest.TestCase):
         self.assertEqual('s', arg_isstr('s'))
         self.assertEqual(None, arg_isstr(7))
 
+
 class Test_arg_isloglevel(unittest.TestCase):
 
     def test_arg_isloglevel_integer(self):

tests/tldptesttools.py

@@ -3,7 +3,6 @@ from __future__ import absolute_import, division, print_function
 from __future__ import unicode_literals
 
 import os
-import time
 import codecs
 import random
 import shutil