Fix PIL imports on OS X

src/calibre/ebooks/pdb/ereader/writer.py

@@ -11,7 +11,12 @@ __docformat__ = 'restructuredtext en'
 import struct
 import zlib
 
-import Image
+try:
+    from PIL import Image
+    Image
+except ImportError:
+    import Image
+
 import cStringIO
 
 from calibre.ebooks.pdb.formatwriter import FormatWriter

src/calibre/ebooks/pml/output.py

@@ -6,7 +6,12 @@ __docformat__ = 'restructuredtext en'
 
 import os
 
-import Image
+try:
+    from PIL import Image
+    Image
+except ImportError:
+    import Image
+
 import cStringIO
 
 from calibre.customize.conversion import OutputFormatPlugin

src/calibre/ebooks/rb/writer.py

@@ -1,4 +1,3 @@
-import os.path
 # -*- coding: utf-8 -*-
 
 __license__ = 'GPL 3'
@@ -9,7 +8,12 @@ import os
 import struct
 import zlib
 
-import Image
+try:
+    from PIL import Image
+    Image
+except ImportError:
+    import Image
+
 import cStringIO
 
 from calibre.ebooks.rb.rbml import RBMLizer

src/calibre/ebooks/rtf/rtfml.py

@@ -11,7 +11,12 @@ Transform OEB content into RTF markup
 import os
 import re
 
-import Image
+try:
+    from PIL import Image
+    Image
+except ImportError:
+    import Image
+
 import cStringIO
 
 from calibre.ebooks.oeb.base import XHTML, XHTML_NS, barename, namespace, \