diff options
| author | Aldo Cortesi <aldo@corte.si> | 2012-11-24 16:28:44 -0800 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2012-11-24 16:28:44 -0800 |
| commit | 64bf97bfb06dccf4d848468b65093330d5eaf63b (patch) | |
| tree | 96e78450f37a30774b451abb6e0d30b710438f46 | |
| parent | 75ce5772ea54c6b32226589f8154c32f2f2d702c (diff) | |
| parent | 15c367ffb499daab3cdf9dace618bd484bc38103 (diff) | |
| download | mitmproxy-64bf97bfb06dccf4d848468b65093330d5eaf63b.tar.gz mitmproxy-64bf97bfb06dccf4d848468b65093330d5eaf63b.tar.bz2 mitmproxy-64bf97bfb06dccf4d848468b65093330d5eaf63b.zip | |
Merge pull request #69 from mat128/master
PIL imports -- packaging
| -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 |