Python2/3 compatible

.travis.yml

@@ -1,11 +1,9 @@
 language:
-    python
-
+  python
 python:
-    3.6
-
+  - "2.7"
+  - "3.6"
 install:
-    pip install tox
-
+  pip install tox-travis
 script:
-    tox
+  tox

MANIFEST.in

@@ -1,2 +1,2 @@
-include LICENCE
+include LICENSE
 include README.rst

README.rst

@@ -4,13 +4,6 @@
 .. image:: https://badge.fury.io/py/django-side-effects.svg
     :target: https://badge.fury.io/py/django-side-effects
 
-**Python3 and Django 2.0**
-
-The latest version of Django, 1.11 is the last to support Python 2, and so
-in advance of the migration to Django 2.0 this package will also now only
-support Python 3 officially. If you need to support earlier Django versions
-please use the ``python27`` branch.
-
 Django Side Effects
 ===================
 

setup.py

@@ -8,24 +8,25 @@
 
 setup(
     name="django-side-effects",
-    version="0.2-dev",
+    version="0.2",
     packages=find_packages(),
     include_package_data=True,
+    install_requires=['Django>=1.8'],
     description='Django app for managing external side effects.',
     long_description=README,
     url='https://github.com/yunojuno/django-side-effects',
-    author='Hugo Rodger-Brown',
+    author='YunoJuno',
     author_email='[email protected]',
-    license='MIT',
-    maintainer='Hugo Rodger-Brown',
-    maintainer_email='[email protected]',
+    maintainer='YunoJuno',
+    maintainer_email='[email protected]',
     classifiers=[
         'Environment :: Web Environment',
         'Framework :: Django',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',

side_effects/apps.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 import logging
 
 from django.apps import AppConfig

side_effects/compat.py

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+"""Python 2/3 compatibility imports."""
+try:
+    from unittest import mock
+except ImportError:
+    import mock  # noqa

side_effects/management/commands/display_side_effects.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 import json
 

side_effects/registry.py

@@ -3,6 +3,8 @@
 This module contains the Registry class that is responsible for managing
 all of the registered side-effects.
 """
+from __future__ import unicode_literals
+
 from collections import defaultdict
 import logging
 import threading
@@ -88,7 +90,7 @@ def _run_func(func, *args, **kwargs):
     """Run a single side-effect function and handle errors."""
     try:
         func(*args, **kwargs)
-    except:
+    except Exception:
         logger.exception("Error running side_effect function '%s'", fname(func))
 
 

side_effects/tests.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-
-
-from unittest import mock
+from __future__ import unicode_literals
 
 from django.test import TestCase
 
 from . import registry, decorators
+from .compat import mock
 
 
 def test_func_no_docstring(arg1, kwarg1=None):

tox.ini

@@ -1,11 +1,13 @@
 [tox]
-envlist = py{36}-django{111}
+envlist = py{27,36}-django{18,19,110,111}
 
 [testenv]
-ignore_errors = True
-
 deps =
     coverage==4.2
+    py27: mock==2.0
+    django18: Django==1.8
+    django19: Django==1.9
+    django110: Django==1.10
     django111: Django==1.11
 
 commands=