[Checkins] SVN: z3c.rml/trunk/src/z3c/rml/ Change imports to support both PIL and PILwoTk.

[Gediminas Paulauskas]

Log message for revision 121449:
  Change imports to support both PIL and PILwoTk.
  Add a missing import and remove some unused ones.
  

Changed:
  U   z3c.rml/trunk/src/z3c/rml/attr.py
  U   z3c.rml/trunk/src/z3c/rml/platypus.py
  U   z3c.rml/trunk/src/z3c/rml/tests/test_rml.py
  U   z3c.rml/trunk/src/z3c/rml/tests/test_subprocess.py

-=-
Modified: z3c.rml/trunk/src/z3c/rml/attr.py
===================================================================
--- z3c.rml/trunk/src/z3c/rml/attr.py	2011-04-19 15:05:26 UTC (rev 121448)
+++ z3c.rml/trunk/src/z3c/rml/attr.py	2011-04-19 16:00:38 UTC (rev 121449)
@@ -30,7 +30,6 @@
 import zope.interface
 import zope.schema
 from lxml import etree
-from xml.sax import saxutils
 
 from z3c.rml import interfaces
 

Modified: z3c.rml/trunk/src/z3c/rml/platypus.py
===================================================================
--- z3c.rml/trunk/src/z3c/rml/platypus.py	2011-04-19 15:05:26 UTC (rev 121448)
+++ z3c.rml/trunk/src/z3c/rml/platypus.py	2011-04-19 16:00:38 UTC (rev 121449)
@@ -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

Modified: z3c.rml/trunk/src/z3c/rml/tests/test_rml.py
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/test_rml.py	2011-04-19 15:05:26 UTC (rev 121448)
+++ z3c.rml/trunk/src/z3c/rml/tests/test_rml.py	2011-04-19 16:00:38 UTC (rev 121449)
@@ -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 @@
         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.')

Modified: z3c.rml/trunk/src/z3c/rml/tests/test_subprocess.py
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/test_subprocess.py	2011-04-19 15:05:26 UTC (rev 121448)
+++ z3c.rml/trunk/src/z3c/rml/tests/test_subprocess.py	2011-04-19 16:00:38 UTC (rev 121449)
@@ -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