Some whitespace fixes

src/z3c/rml/pagetemplate.py

@@ -20,11 +20,11 @@
     import zope.pagetemplate.pagetemplatefile
 except ImportError as err:
     raise
-    # zope.pagetemplate package has not been installed
-    import types
-    zope.pagetemplate = types.ModuleType('pagetemplate')
-    zope.pagetemplate.pagetemplatefile = types.ModuleType('pagetemplatefile')
-    zope.pagetemplate.pagetemplatefile.PageTemplateFile = object
+    ## zope.pagetemplate package has not been installed, uncomment this to mock
+    # import types
+    # zope.pagetemplate = types.ModuleType('pagetemplate')
+    # zope.pagetemplate.pagetemplatefile = types.ModuleType('pagetemplatefile')
+    # zope.pagetemplate.pagetemplatefile.PageTemplateFile = object
 
 
 class RMLPageTemplateFile(zope.pagetemplate.pagetemplatefile.PageTemplateFile):

src/z3c/rml/rml2pdfscript.py

@@ -113,4 +113,3 @@ def goSubProcess(xmlInputName, outputFileName, testing=False):
         canvas = excecuteSubProcess(sys.argv[2], sys.argv[3], sys.argv[4])
     else:
         canvas = excecuteSubProcess(sys.argv[2], sys.argv[3])
-

src/z3c/rml/template.py

@@ -138,6 +138,7 @@ class PageGraphics(directive.RMLDirective):
 
     def process(self):
         onPage = self.parent.pt.onPage
+
         def drawOnCanvas(canv, doc):
             onPage(canv, doc)
             canv.saveState()
@@ -173,7 +174,6 @@ class IPageTemplate(interfaces.IRMLDirectiveSignature):
         required=False)
 
 
-
 class PageTemplate(directive.RMLDirective):
     signature = IPageTemplate
     attrMapping = {'autoNextTemplate': 'autoNextPageTemplate'}
@@ -259,6 +259,7 @@ class ITemplate(interfaces.IRMLDirectiveSignature):
         description=u'The author of the PDF document.',
         required=False)
 
+
 class Template(directive.RMLDirective):
     signature = ITemplate
     factories = {
@@ -270,7 +271,7 @@ def process(self):
         args += self.parent.getAttributeValues(
             select=('debug', 'compression', 'invariant'),
             attrMapping={'debug': '_debug', 'compression': 'pageCompression'})
-        args += (('cropMarks',  self.parent.cropMarks),)
+        args += (('cropMarks', self.parent.cropMarks),)
 
         self.parent.doc = platypus.BaseDocTemplate(
             self.parent.outputFile, **dict(args))

src/z3c/rml/tests/module.py

@@ -20,6 +20,7 @@
 from reportlab.lib import colors
 from z3c.rml import attr, interfaces, SampleStyleSheet
 
+
 def myPreformatted(params):
     return reportlab.platypus.Preformatted('''
         Hey, this is a long text from a plugin. Hey, this is a long text from
@@ -34,6 +35,7 @@ def myPreformatted(params):
         is a long text from a plugin.''',
         SampleStyleSheet['Normal'])
 
+
 class LinkURL(reportlab.platypus.flowables.Flowable):
     def __init__(self, link):
         self.link = link
@@ -52,6 +54,7 @@ def linkURL(params):
             params[0], SampleStyleSheet['Normal']),
         LinkURL(*params))
 
+
 class IMarker(interfaces.IRMLDirectiveSignature):
     x = attr.Measurement()
     y = attr.Measurement()
@@ -64,6 +67,7 @@ class IMarker(interfaces.IRMLDirectiveSignature):
     arrowBarDx = attr.Measurement(required=False)
     arrowHeight = attr.Measurement(required=False)
 
+
 def symbols(canvas, params):
     args = eval('dict(%s)' %params)
     name = args.pop('name')

src/z3c/rml/tests/test_directive.py

@@ -22,6 +22,7 @@
 </document>
 '''
 
+
 def test_abort_on_invalid_tag():
     """
 
@@ -46,7 +47,7 @@ def test_abort_on_invalid_tag():
 
     """
 
+
 def test_suite():
     return doctest.DocTestSuite(
         optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
-

src/z3c/rml/tests/test_dtd.py

@@ -17,6 +17,7 @@
 import unittest
 from z3c.rml import dtd
 
+
 class DTDTestCase(unittest.TestCase):
 
     level = 2
@@ -28,4 +29,4 @@ def runTest(self):
 
 
 def test_suite():
-   return unittest.TestSuite([DTDTestCase()])
+    return unittest.TestSuite([DTDTestCase()])

src/z3c/rml/tests/test_pagetemplate.py

@@ -22,4 +22,3 @@ def test_suite():
     return doctest.DocFileSuite(
         '../pagetemplate.txt',
         optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
-

src/z3c/rml/tests/test_reference.py

@@ -17,6 +17,7 @@
 import unittest
 from z3c.rml import reference
 
+
 class ReferenceTestCase(unittest.TestCase):
 
     level = 3
@@ -28,4 +29,4 @@ def runTest(self):
 
 
 def test_suite():
-   return unittest.TestSuite([ReferenceTestCase()])
+    return unittest.TestSuite([ReferenceTestCase()])

src/z3c/rml/tests/test_rml.py

@@ -28,6 +28,7 @@
 
 LOG_FILE = os.path.join(os.path.dirname(__file__), 'render.log')
 
+
 def gs_command(path):
     return ('gs', '-q', '-sNOPAUSE', '-sDEVICE=png256',
             '-sOutputFile=%s[Page-%%d].png' % path[:-4],

src/z3c/rml/tests/test_subprocess.py

@@ -28,30 +28,30 @@ def runTest(self):
 
 
 def test_suite():
-   suite = unittest.TestSuite()
-   return suite
-   inputDir = os.path.join(os.path.dirname(z3c.rml.tests.__file__), 'input')
-   outputDir = os.path.join(os.path.dirname(z3c.rml.tests.__file__), 'output')
-   expectDir = os.path.join(os.path.dirname(z3c.rml.tests.__file__), 'expected')
-   for filename in os.listdir(inputDir):
-       if not filename.endswith(".rml"):
-           continue
-       inPath = os.path.join(inputDir, filename)
-       outPath = os.path.join(outputDir, filename[:-4] + '.pdf')
-       expectPath = os.path.join(expectDir, filename[:-4] + '.pdf')
-
-       # ** Test RML to PDF rendering **
-       # Create new type, so that we can get test matching
-       TestCase = type(filename[:-4], (RMLRenderingTestCase,), {})
-       case = TestCase(inPath, outPath)
-       suite.addTest(case)
-
-       # ** Test PDF rendering correctness **
-       TestCase = type('compare-'+filename[:-4], (ComparePDFTestCase,), {})
-       case = TestCase(expectPath, outPath)
-       suite.addTest(case)
-
-   return suite
+    suite = unittest.TestSuite()
+    if False:
+        inputDir = os.path.join(os.path.dirname(z3c.rml.tests.__file__), 'input')
+        outputDir = os.path.join(os.path.dirname(z3c.rml.tests.__file__), 'output')
+        expectDir = os.path.join(os.path.dirname(z3c.rml.tests.__file__), 'expected')
+        for filename in os.listdir(inputDir):
+            if not filename.endswith(".rml"):
+                continue
+            inPath = os.path.join(inputDir, filename)
+            outPath = os.path.join(outputDir, filename[:-4] + '.pdf')
+            expectPath = os.path.join(expectDir, filename[:-4] + '.pdf')
+
+            # ** Test RML to PDF rendering **
+            # Create new type, so that we can get test matching
+            TestCase = type(filename[:-4], (RMLRenderingTestCase,), {})
+            case = TestCase(inPath, outPath)
+            suite.addTest(case)
+
+            # ** Test PDF rendering correctness **
+            TestCase = type('compare-'+filename[:-4], (ComparePDFTestCase,), {})
+            case = TestCase(expectPath, outPath)
+            suite.addTest(case)
+
+    return suite
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')