Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-22 07:08:10 +00:00
Code Issues Projects Releases Wiki Activity

Migrate from Pil to the latest version of Pillow.

Browse Source
This commit is contained in:
Tomaz Muraus 2014-01-03 21:03:58 +01:00
parent b9d4eb103e
commit e9c2c0ac3a
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libmproxy/console/contentview.py
View File

@ -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

4
requirements.txt
View File

@ -1,7 +1,7 @@
Flask>=0.9
Jinja2>=2.7
MarkupSafe>=0.18
PIL>=1.1.7
Pillow>=2.3.0,<2.4
Werkzeug>=0.8.3
lxml>=3.2.1
netlib>=0.9.2
@ -13,4 +13,4 @@ pyasn1>=0.1.7
requests>=1.2.2
urwid>=1.1.1
wsgiref>=0.1.2
jsbeautifier>=1.4.0
jsbeautifier>=1.4.0

2
setup.py
View File

@ -97,7 +97,7 @@ setup(
"urwid>=1.1",
"pyasn1>0.1.2",
"pyopenssl>=0.13",
"PIL",
"Pillow>=2.3.0,<2.4",
"lxml",
"flask"
],