Merge branch 'stable' of https://github.com/davidszotten/xhtml2pdf into davidszotten

Chris Glass · Chris Glass · commit 9c121d98e44d · 2011-05-19T13:07:28.000+02:00
Conflicts:
	sx/pisa3/pisa_context.py
	sx/pisa3/pisa_reportlab.py
	sx/w3c/css.py
diff --git a/sx/pisa3/pisa_reportlab.py b/sx/pisa3/pisa_reportlab.py
@@ -313,7 +313,8 @@ def getRGBData(self):
                 im = self._image
                 mode = self.mode = im.mode
                 if mode == 'RGBA':
-                    if PILImage.VERSION.startswith('1.1.7'): im.load()
+                    if Image.VERSION.startswith('1.1.7'):
+                        im.load()
                     self._dataA = PmlImageReader(im.split()[3])
                     im = im.convert('RGB')
                     self.mode = 'RGB'
