Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #69 from mat128/master 

PIL imports -- packaging
This commit is contained in:
Aldo Cortesi 2012-11-24 16:28:44 -08:00
parent 75ce5772ea 15c367ffb4
commit 64bf97bfb0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libmproxy/console/contentview.py
View File

@ -1,7 +1,12 @@
import re, cStringIO, traceback, json import re, cStringIO, traceback, json
import urwid 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 lxml.html, lxml.etree
import netlib.utils import netlib.utils
import common import common