diff options
| author | Mathieu Mitchell <mmitchell@iweb.com> | 2012-11-23 11:48:24 -0500 |
|---|---|---|
| committer | Mathieu Mitchell <mmitchell@iweb.com> | 2012-11-23 11:48:24 -0500 |
| commit | 15c367ffb499daab3cdf9dace618bd484bc38103 (patch) | |
| tree | 96e78450f37a30774b451abb6e0d30b710438f46 /libmproxy/console | |
| parent | 75ce5772ea54c6b32226589f8154c32f2f2d702c (diff) | |
| download | mitmproxy-15c367ffb499daab3cdf9dace618bd484bc38103.tar.gz mitmproxy-15c367ffb499daab3cdf9dace618bd484bc38103.tar.bz2 mitmproxy-15c367ffb499daab3cdf9dace618bd484bc38103.zip | |
Workaround for PIL's ambiguious import method and/or easy_install PIL packaging problem.
PIL documents two different way to import it's modules:
* import Image (http://www.pythonware.com/library/pil/handbook/introduction.htm)
* from PIL import Image (http://www.pythonware.com/library/pil/handbook/image.htm)
The same problem was noted in Django at https://code.djangoproject.com/ticket/6054
Diffstat (limited to 'libmproxy/console')
| -rw-r--r-- | libmproxy/console/contentview.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py index 1e9b9160..2e93727a 100644 --- 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 |