diff options
| author | Tomaz Muraus <tomaz@tomaz.me> | 2014-01-03 21:03:58 +0100 |
|---|---|---|
| committer | Tomaz Muraus <tomaz@tomaz.me> | 2014-01-03 21:13:14 +0100 |
| commit | e9c2c0ac3a845078ee908ecc6997e24b9f8fe291 (patch) | |
| tree | 967d2109b138817d6342e5d73abb33ab2e94e1d9 /libmproxy/console/contentview.py | |
| parent | b9d4eb103e6b45cc331b0fc3cd5a0c693f1b669e (diff) | |
| download | mitmproxy-e9c2c0ac3a845078ee908ecc6997e24b9f8fe291.tar.gz mitmproxy-e9c2c0ac3a845078ee908ecc6997e24b9f8fe291.tar.bz2 mitmproxy-e9c2c0ac3a845078ee908ecc6997e24b9f8fe291.zip | |
Migrate from Pil to the latest version of Pillow.
Diffstat (limited to 'libmproxy/console/contentview.py')
| -rw-r--r-- | libmproxy/console/contentview.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py index 8dd8ad1d..962b49de 100644 --- a/libmproxy/console/contentview.py +++ b/libmproxy/console/contentview.py @@ -1,11 +1,8 @@ import re, cStringIO, traceback, json import urwid -try: from PIL import Image -except ImportError: import Image - -try: from PIL.ExifTags import TAGS -except ImportError: from ExifTags import TAGS +from PIL import Image +from PIL.ExifTags import TAGS import lxml.html, lxml.etree import netlib.utils |