Merge branch 'python_versions'

Conflicts:
	.travis.yml

.travis.yml

@@ -1,13 +1,21 @@
 language: python
 python:
   - "2.7"
-branches:
-  only:
-    - master
+  - "3.2"
+  - "3.3"
 env:
 #  - DJANGO=1.4.9 test database creation not working
   - DJANGO=1.5.5
   - DJANGO=1.6
+matrix:
+  exclude:
+    - python: "3.2"
+      env: DJANGO=1.5.5
+    - python: "3.3"
+      env: DJANGO=1.5.5
+branches:
+  only:
+    - master
 install:
   - pip install -q Django==$DJANGO --use-mirrors
   - pip install -r requirements-dev.txt

achilles/actions.py

@@ -51,7 +51,7 @@ def run_actions(request, actions):
             # Mark as error
             data[a['id']] = {
                 'error': e.__class__.__name__,
-                'message': unicode(e),
+                'message': str(e),
             }
 
 

achilles/common.py

@@ -42,7 +42,7 @@ def achilles_renders():
     Return a dict of enabled plugin' render functions
     """
     return {k: import_by_path('%s.render' % p)
-            for k, p in achilles_plugins().iteritems()}
+            for k, p in achilles_plugins().items()}
 
 
 # This method is borrowed from Django 1.6:

achilles/tests/test_common.py

@@ -42,7 +42,7 @@ def test_achilles_renders(self):
         plugins = achilles_plugins()
         renders = achilles_renders()
 
-        self.assertListEqual(plugins.keys(), renders.keys())
+        self.assertEqual(plugins.keys(), renders.keys())
 
 
 class LibraryTests(TestCase):

setup.py

@@ -1,5 +1,7 @@
 # encoding: utf-8
 import os
+import sys
+
 from setuptools import setup, find_packages
 
 
@@ -8,6 +10,14 @@
 def dump(filename):
     return open(os.path.join(os.path.dirname(__file__), filename))
 
+extra = {}
+
+# Use 2to3 for Python 3 support
+if sys.version_info >= (3, 0):
+    extra.update(
+        use_2to3=True,
+    )
+
 setup(
     name='django-achilles',
     version=version,
@@ -32,4 +42,5 @@ def dump(filename):
         'Intended Audience :: Developers',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],
+    **extra
 )