Merge pull request #69 from mat128/master

PIL imports -- packaging
2012-11-24 16:28:44 -08:00 · 2012-11-24 16:28:44 -08:00 · 64bf97bfb0
parent 75ce5772ea 15c367ffb4
commit 64bf97bfb0
1 changed files with 7 additions and 2 deletions
--- a/libmproxy/console/contentview.py
+++ b/libmproxy/console/contentview.py
@ -1,7 +1,12 @@
 import re, cStringIO, traceback, json
 import urwid
-from PIL import Image
-from PIL.ExifTags import TAGS
+
+try: from PIL import Image
+except ImportError: import Image
+
+try: from PIL.ExifTags import TAGS
+except ImportError: from ExifTags import TAGS
+
 import lxml.html, lxml.etree
 import netlib.utils
 import common