Change imports to support both PIL and PILwoTk.

Add a missing import and remove some unused ones.

src/z3c/rml/attr.py

@@ -30,7 +30,6 @@
 import zope.interface
 import zope.schema
 from lxml import etree
-from xml.sax import saxutils
 
 from z3c.rml import interfaces
 

src/z3c/rml/platypus.py

@@ -18,6 +18,7 @@
 __docformat__ = "reStructuredText"
 import reportlab.platypus.flowables
 import reportlab.rl_config
+from reportlab.rl_config import overlapAttachedSpace
 import zope.interface
 
 from z3c.rml import interfaces

src/z3c/rml/tests/test_rml.py

@@ -16,13 +16,16 @@
 $Id$
 """
 import os
-import PIL
 import subprocess
 import unittest
 import sys
 import z3c.rml.tests
 from z3c.rml import rml2pdf, attr
 
+try:
+    import Image
+except ImportError:
+    from PIL import Image
 
 def gs_command(path):
     return ('gs', '-q', '-sNOPAUSE', '-sDEVICE=png256',
@@ -72,8 +75,8 @@ def __init__(self, basePath, testPath):
         unittest.TestCase.__init__(self)
 
     def assertSameImage(self, baseImage, testImage):
-        base = PIL.Image.open(baseImage).getdata()
-        test = PIL.Image.open(testImage).getdata()
+        base = Image.open(baseImage).getdata()
+        test = Image.open(testImage).getdata()
         for i in range(len(base)):
             if (base[i] - test[i]) != 0:
                 self.fail('Image is not the same.')

src/z3c/rml/tests/test_subprocess.py

@@ -16,13 +16,9 @@
 $Id: test_rml.py 74170 2007-04-16 08:42:13Z srichter $
 """
 import os
-import PIL
-import popen2
 import unittest
-import sys
 import z3c.rml.tests
 from z3c.rml import rml2pdfscript
-from z3c.rml import attr
 from z3c.rml.tests.test_rml import ComparePDFTestCase
 from z3c.rml.tests.test_rml import RMLRenderingTestCase