From eb83137395456bf6c34739a1d384b039d911f12b Mon Sep 17 00:00:00 2001
From: ArmstrongJ <approximatrix@gmail.com>
Date: Mon, 12 Dec 2011 09:22:19 -0500
Subject: [PATCH 1/2] Added 2to3 support to setup for compatability with Python
 3.x

---
 setup.py | 60 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/setup.py b/setup.py
index e29b15f9..d3be060c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,27 +1,33 @@
-from setuptools import setup, find_packages
-
-version = '2.1.5'
-
-setup(
-    name='textile',
-    version=version,
-    description='Textile processing for python.',
-    author='Chris Drackett',
-    author_email='chris@chrisdrackett.com',
-    url='http://github.com/chrisdrackett/python-textile',
-    packages=find_packages(),
-    classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Environment :: Web Environment',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-    ],
-    keywords='textile,text',
-    test_suite = 'nose.collector',
-    tests_require = ['nose'],
-    include_package_data=True,
-    zip_safe=False,
-)
+from setuptools import setup, find_packages
+import sys
+
+version = '2.1.5'
+
+extra = {}
+if sys.version_info >= (3,):
+    extra['use_2to3'] = True
+
+setup(
+    name='textile',
+    version=version,
+    description='Textile processing for python.',
+    author='Chris Drackett',
+    author_email='chris@chrisdrackett.com',
+    url='http://github.com/chrisdrackett/python-textile',
+    packages=find_packages(),
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Web Environment',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+    ],
+    keywords='textile,text',
+    test_suite = 'nose.collector',
+    tests_require = ['nose'],
+    include_package_data=True,
+    zip_safe=False,
+    **extra
+)

From f6440b05aa761362e49fd5d58d720f5e8f3e5902 Mon Sep 17 00:00:00 2001
From: Toshio Ernie Kuratomi <a.badger@gmail.com>
Date: Wed, 30 Jan 2013 19:14:07 +0100
Subject: [PATCH 2/2] Use the form of import of PIL that is pillow compatible.

---
 textile/tests/__init__.py  | 2 +-
 textile/tools/imagesize.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/textile/tests/__init__.py b/textile/tests/__init__.py
index 4cc87209..8380970a 100644
--- a/textile/tests/__init__.py
+++ b/textile/tests/__init__.py
@@ -426,7 +426,7 @@ def testSanitize(self):
 
     def testImageSize(self):
         try:
-            import ImageFile
+            from PIL import ImageFile
         except ImportError:
             raise SkipTest()
 
diff --git a/textile/tools/imagesize.py b/textile/tools/imagesize.py
index fb7cfee9..bbccd3cf 100644
--- a/textile/tools/imagesize.py
+++ b/textile/tools/imagesize.py
@@ -14,7 +14,7 @@ def getimagesize(url):
     """
 
     try:
-        import ImageFile
+        from PIL import ImageFile
         import urllib2
     except ImportError:
         return ''
@@ -36,6 +36,6 @@ def getimagesize(url):
 def setup_module(module):
     from nose.plugins.skip import SkipTest
     try:
-        import ImageFile
+        from PIL import ImageFile
     except ImportError:
         raise SkipTest()