Django used to provide a @python_2_unicode_compatible decorator, which

was then adopted into six and folded back into Django's copy.
Since modern versions of Django no longer provide the legacy version of

this decorator, this change moves the codebase to using the one in

six.

Unit tests pass on Django 1.11 and on 3.2 (with other in-progress changes).