diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-01-05 11:15:27 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-01-05 11:15:27 +1300 |
| commit | 8a599be0602382e0ea5ffbc4018db07b0f379ae7 (patch) | |
| tree | e8bfab41aec5ef0293b2690e9dd5a3a5ac79d748 /libmproxy/console | |
| parent | ac31039ad3c5a7f808065cab426d3d9aeab0004c (diff) | |
| parent | 1fa6bcbd5ab5e51f9e4250024c848933ea0911e7 (diff) | |
| download | mitmproxy-8a599be0602382e0ea5ffbc4018db07b0f379ae7.tar.gz mitmproxy-8a599be0602382e0ea5ffbc4018db07b0f379ae7.tar.bz2 mitmproxy-8a599be0602382e0ea5ffbc4018db07b0f379ae7.zip | |
Merge branch 'migrate_from_pil_to_pillow' of https://github.com/Kami/mitmproxy into Kami-migrate_from_pil_to_pillow
Conflicts:
requirements.txt
Diffstat (limited to 'libmproxy/console')
| -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 b03d06c5..70f39d83 100644 --- a/libmproxy/console/contentview.py +++ b/libmproxy/console/contentview.py @@ -2,11 +2,8 @@ import logging 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 |