Merge branch 'migrate_from_pil_to_pillow' of https://github.com/Kami/mitmproxy into Kami-migrate_from_pil_to_pillow

Conflicts:
	requirements.txt

examples/upsidedownternet.py

@@ -1,4 +1,6 @@
-import Image, cStringIO
+import cStringIO
+from PIL import Image
+
 def response(context, flow):
     if flow.response.headers["content-type"] == ["image/png"]:
         s = cStringIO.StringIO(flow.response.content)

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

requirements.txt

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

setup.py

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