Support for Django >= 2.2; swap travis for gh actions

Author: dakrauth

.github/workflows/test.yml

@@ -0,0 +1,23 @@
+name: Test
+
+on: push
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.7, 3.8]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox tox-gh-actions
+    - name: Test with tox
+      run: tox

.travis.yml

@@ -1,12 +1,16 @@
 # django-xml
 
-[![Build Status](https://travis-ci.org/theatlantic/django-xml.svg?branch=master)](https://travis-ci.org/theatlantic/django-xml)
-
-
 **django-xml** is a python module which provides an abstraction to
 [lxml](http://lxml.de/)'s XPath and XSLT functionality in a manner resembling
 django database models.
 
+## Note
+
+* Version 2.0 drops support for Django < 1.11
+* Version 2.0.1 drops support for Python 3.4
+* Version 3.0 adds support for Django>=2.2, drops support for Python < 3.7
+
+
 ## Contents
 
  * [Installation](#installation)

README.md

@@ -1,16 +1,15 @@
-from __future__ import absolute_import
-from .loading import (get_apps, get_app, get_xml_models, get_xml_model,
+from .loading import (get_apps, get_app, get_xml_models, get_xml_model,  # noqa
                       register_xml_models,)
-from . import signals
-from .base import XmlModel
-from .decorators import lxml_extension
-from .fields import (XmlElementField, XmlPrimaryElementField,
+from . import signals  # noqa
+from .base import XmlModel  # noqa
+from .decorators import lxml_extension  # noqa
+from .fields import (XmlElementField, XmlPrimaryElementField,  # noqa
                      XPathSingleNodeField, XPathTextField, XPathIntegerField,
                      XPathFloatField, XPathDateTimeField, XPathListField,
                      XPathTextListField, XPathIntegerListField,
                      XPathFloatListField, XPathDateTimeListField, XsltField,
                      XPathHtmlField, XPathHtmlListField,
                      XPathInnerHtmlField, XPathInnerHtmlListField,
                      XPathBooleanField, XPathBooleanListField, SchematronField,)
-from .related import (EmbeddedXPathField, EmbeddedXPathListField,
+from .related import (EmbeddedXPathField, EmbeddedXPathListField,  # noqa
                       EmbeddedXsltField, EmbeddedSchematronField,)

README.rst

@@ -1,26 +1,21 @@
-from __future__ import absolute_import
 import re
 import sys
 import codecs
 import functools
 import copy
-import six
 
 from lxml import etree
 
 from django.core.exceptions import (ObjectDoesNotExist, FieldError,
                                     MultipleObjectsReturned,)
 from django.db.models.base import subclass_exception
 from django.utils.encoding import force_text
-from django.utils.encoding import smart_bytes, smart_text
+from django.utils.encoding import smart_bytes, smart_str
 
 from .signals import xmlclass_prepared
 from .options import Options, DEFAULT_NAMES
 from .loading import register_xml_models, get_xml_model
 
-# Alias smart_str based on Python version
-smart_str = smart_text if six.PY3 else smart_bytes
-
 
 class XmlModelBase(type):
     """
@@ -147,8 +142,7 @@ def _prepare(cls):
         xmlclass_prepared.send(sender=cls)
 
 
-@six.add_metaclass(XmlModelBase)
-class XmlModel(object):
+class XmlModel(metaclass=XmlModelBase):
 
     def __init__(self, root_element_tree):
         fields_iter = iter(self._meta.fields)
@@ -184,8 +178,8 @@ def _merge_xpath_kwargs(self, ns=None, ext=None):
 
         xpath_kwargs = {
             'namespaces': getattr(opts, 'namespaces', {}),
-            'extensions': dict([(k, functools.partial(method, self))
-                                for k, method in six.iteritems(opts.extensions)]),}
+            'extensions': {k: functools.partial(method, self)
+                                for k, method in opts.extensions.items()}}
 
         if ns is not None:
             xpath_kwargs['namespaces'].update(ns)
@@ -234,14 +228,12 @@ def create_from_file(cls, xml_file):
 
     def __repr__(self):
         try:
-            u = six.text_type(self)
+            u = str(self)
         except (UnicodeEncodeError, UnicodeDecodeError):
             u = '[Bad Unicode data]'
         return smart_str(u'<%s: %s>' % (self.__class__.__name__, u))
 
     def __str__(self):
-        if hasattr(self, '__unicode__'):
-            return force_text(self).encode('utf-8')
         return '%s object' % self.__class__.__name__
 
     def __eq__(self, other):

djxml/xmlmodels/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-import six
 import functools
 
 from lxml import etree
@@ -85,9 +83,8 @@ def __get__(self, instance, instance_type=None):
             namespaces.update(getattr(instance._meta, 'namespaces', {}))
             namespaces.update(getattr(self.field, 'extra_namespaces', {}))
 
-            extensions = {}
-            for k, method in six.iteritems(instance._meta.extensions):
-                extensions[k] = functools.partial(method, instance)
+            extensions = {k: functools.partial(method, instance)
+                for k, method in instance._meta.extensions.items()}
             extensions.update(self.field.extensions)
 
             xpath_eval = etree.XPathEvaluator(tree, namespaces=namespaces,
@@ -119,9 +116,8 @@ def __get__(self, instance, instance_type=None):
             tree = instance._get_etree_val()
             xslt_tree = self.field.get_xslt_tree(instance)
 
-            extensions = {}
-            for k, method in six.iteritems(instance._meta.extensions):
-                extensions[k] = functools.partial(method, instance)
+            extensions = {k: functools.partial(method, instance)
+                for k, method in instance._meta.extensions.items()}
             extensions.update(self.field.extensions)
 
             transform = etree.XSLT(xslt_tree, extensions=extensions)

djxml/xmlmodels/base.py

@@ -1,6 +1,4 @@
-from __future__ import absolute_import
 from django.core.exceptions import ValidationError
-from django.utils import six
 
 class XmlModelException(Exception):
     pass
@@ -21,17 +19,17 @@ def __str__(self):
         return str(self.apply_exception)
 
     def __unicode__(self):
-        msg = six.text_type(self.apply_exception)
+        msg = str(self.apply_exception)
         debug_output = self.get_debug_output()
         if len(debug_output) > 0:
-            msg += u"\n\n" + debug_output
+            msg += "\n\n" + debug_output
         return msg
 
     def get_debug_output(self):
         debug_lines = []
         for entry in self.error_log:
-            entry_filename = u'%s ' % entry.filename if entry.filename != '<string>' else ''
-            debug_line = u'%(msg)s [%(file)sline %(line)s, col %(col)s]' % {
+            entry_filename = '%s ' % entry.filename if entry.filename != '<string>' else ''
+            debug_line = '%(msg)s [%(file)sline %(line)s, col %(col)s]' % {
                 'file': entry_filename,
                 'line': entry.line,
                 'col': entry.column,