Added Django 2.1, 2.2 to test matrix with simple fixes

Author: David Krauth

djxml/xmlmodels/base.py

@@ -70,14 +70,24 @@ def __new__(cls, name, bases, attrs):
 
         new_class.add_to_class('_meta', Options(meta, **kwargs))
 
-        new_class.add_to_class('DoesNotExist', subclass_exception('DoesNotExist',
-                tuple(x.DoesNotExist
-                        for x in parents if hasattr(x, '_meta'))
-                                or (ObjectDoesNotExist,), module))
-        new_class.add_to_class('MultipleObjectsReturned', subclass_exception('MultipleObjectsReturned',
-                tuple(x.MultipleObjectsReturned
-                        for x in parents if hasattr(x, '_meta'))
-                                or (MultipleObjectsReturned,), module))
+        new_class.add_to_class(
+            'DoesNotExist',
+            subclass_exception(
+                'DoesNotExist',
+                tuple(
+                    x.DoesNotExist for x in parents if hasattr(x, '_meta')
+                ) or (ObjectDoesNotExist,),
+                module,
+                attached_to=new_class))
+        new_class.add_to_class(
+            'MultipleObjectsReturned',
+            subclass_exception(
+                'MultipleObjectsReturned',
+                tuple(
+                    x.MultipleObjectsReturned for x in parents if hasattr(x, '_meta')
+                ) or (MultipleObjectsReturned,),
+                module,
+                attached_to=new_class))
 
         # Bail out early if we have already created this class.
         m = get_xml_model(new_class._meta.app_label, name, False)

setup.py

@@ -19,7 +19,7 @@
 
 setup(
     name='django-xml',
-    version="2.0.2",
+    version="2.1.0",
     install_requires=[
         'lxml',
         'pytz',

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    {py27}-django{111}
-    {py35,py36,py37}-django{111,20}
+    py27-django111
+    {py35,py36,py37}-django{111,20,21,22}
 
 [testenv]
 commands =
@@ -10,12 +10,14 @@ deps =
     six>=1.9.0
     django111: Django>=1.11,<2
     django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
+    django22: Django>=2.2,<3.0
 
 [testenv:pep8]
 description = Run PEP8 pycodestyle (flake8) against the djxml/ package directory
 skipsdist = true
 skip_install = true
-basepython = python3.6
+basepython = python3.7
 deps = pycodestyle
 commands = pycodestyle djxml