Merge pull request #51 from DMOJ/master

Django 1.9 and django-reversion 1.10.0 support

reversion_compare/admin.py

@@ -28,7 +28,11 @@
 from django.utils.text import capfirst
 from django.utils.translation import ugettext as _
 
-import reversion
+try:
+    from reversion import revisions as reversion
+except ImportError:
+    import reversion
+
 from reversion.admin import VersionAdmin
 
 from reversion_compare.forms import SelectDiffForm

reversion_compare/compare.py

@@ -16,7 +16,11 @@
 from django.db import models
 from django.utils.translation import ugettext as _
 
-import reversion
+try:
+    from reversion import revisions as reversion
+except ImportError:
+    import reversion
+
 from reversion.models import has_int_pk
 
 logger = logging.getLogger(__name__)

setup.py

@@ -198,7 +198,7 @@ def get_authors():
     packages=find_packages(),
     include_package_data=True,  # include package data under svn source control
     install_requires=[
-        "Django>=1.7,<1.9",
+        "Django>=1.7,<1.10",
         "django-reversion>=1.8",
     ],
     tests_require=[

tests/models.py

@@ -22,7 +22,11 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-import reversion
+try:
+    from reversion import revisions as reversion
+except ImportError:
+    import reversion
+
 
 
 from django.db import models

tests/test_custom_model.py

@@ -30,7 +30,11 @@
     ) % err
     raise ImportError(msg)
 
-import reversion
+try:
+    from reversion import revisions as reversion
+except ImportError:
+    import reversion
+
 from reversion.models import Revision
 
 from tests.models import CustomModel

tests/test_factory_car_models.py

@@ -36,8 +36,15 @@
     raise ImportError(msg)
 from django_tools.unittest_utils.BrowserDebug import debug_response
 
-import reversion
-from reversion import get_for_object
+try:
+    from reversion import revisions as reversion
+except ImportError:
+    import reversion
+
+try:
+    from reversion.revisions import get_for_object
+except ImportError:
+    from reversion import get_for_object
 from reversion.models import Revision, Version
 
 from reversion_compare import helpers

tests/test_factory_car_reverse_models.py

@@ -36,8 +36,15 @@
     raise ImportError(msg)
 from django_tools.unittest_utils.BrowserDebug import debug_response
 
-import reversion
-from reversion import get_for_object
+try:
+    from reversion import revisions as reversion
+except ImportError:
+    import reversion
+
+try:
+    from reversion.revisions import get_for_object
+except ImportError:
+    from reversion import get_for_object
 from reversion.models import Revision, Version
 
 from reversion_compare import helpers

tests/test_onetoone_field.py

@@ -27,7 +27,10 @@
     ) % err
     raise ImportError(msg)
 
-from reversion import get_for_object
+try:
+    from reversion.revisions import get_for_object
+except ImportError:
+    from reversion import get_for_object
 
 from .test_utils.test_cases import BaseTestCase
 from .test_utils.test_data import TestData

tests/test_person_pet_models.py

@@ -28,8 +28,15 @@
     ) % err
     raise ImportError(msg)
 
-import reversion
-from reversion import get_for_object
+try:
+    from reversion import revisions as reversion
+except ImportError:
+    import reversion
+
+try:
+    from reversion.revisions import get_for_object
+except ImportError:
+    from reversion import get_for_object
 from reversion.models import Revision, Version
 
 from tests.models import Person, Pet

tests/test_simple_model.py

@@ -37,8 +37,15 @@
     raise ImportError(msg)
 from django_tools.unittest_utils.BrowserDebug import debug_response
 
-import reversion
-from reversion import get_for_object
+try:
+    from reversion import revisions as reversion
+except ImportError:
+    import reversion
+
+try:
+    from reversion.revisions import get_for_object
+except ImportError:
+    from reversion import get_for_object
 from reversion.models import Revision, Version
 
 from reversion_compare import helpers

tests/test_utils/test_cases.py

@@ -31,7 +31,11 @@
     raise ImportError(msg)
 from django_tools.unittest_utils.BrowserDebug import debug_response
 
-import reversion
+try:
+    from reversion import revisions as reversion
+except ImportError:
+    import reversion
+
 from reversion.models import Revision, Version
 
 from reversion_compare import helpers

tests/test_utils/test_data.py

@@ -35,7 +35,11 @@
     ) % err
     raise ImportError(msg)
 
-import reversion
+try:
+    from reversion import revisions as reversion
+except ImportError:
+    import reversion
+
 
 from tests.models import SimpleModel, Person, Pet, \
     Factory, Car, VariantModel, CustomModel, Identity

tests/test_variant_model.py

@@ -31,8 +31,15 @@
     raise ImportError(msg)
 from django_tools.unittest_utils.BrowserDebug import debug_response
 
-import reversion
-from reversion import get_for_object
+try:
+    from reversion import revisions as reversion
+except ImportError:
+    import reversion
+
+try:
+    from reversion.revisions import get_for_object
+except ImportError:
+    from reversion import get_for_object
 from reversion.models import Revision
 
 from tests.models import VariantModel

tests/test_view.py

@@ -33,8 +33,15 @@
     raise ImportError(msg)
 from django_tools.unittest_utils.BrowserDebug import debug_response
 
-import reversion
-from reversion import get_for_object
+try:
+    from reversion import revisions as reversion
+except ImportError:
+    import reversion
+
+try:
+    from reversion.revisions import get_for_object
+except ImportError:
+    from reversion import get_for_object
 from reversion.models import Revision, Version
 
 from reversion_compare import helpers