trivial: use django.utils copy of the six compatibility module (#29695)

passerelle/apps/actesweb/models.py

@@ -18,11 +18,11 @@ from __future__ import unicode_literals
 import json
 import os
 import tempfile
-import six
 import contextlib
 
 from django.core.files.storage import default_storage
 from django.template.loader import get_template
+from django.utils import six
 from django.utils.dateparse import parse_date
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _

passerelle/apps/atos_genesys/models.py

@@ -17,10 +17,10 @@
 import urlparse
 import requests
 import xml.etree.ElementTree as ET
-import six
 import jsonfield
 
 from django.db import models
+from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
 from passerelle.utils import xml as xmlutils

passerelle/apps/atos_genesys/utils.py

@@ -1,9 +1,9 @@
 import time
-import six
 from contextlib import contextmanager
 
 from django.db import transaction
 from django.core.cache import cache
+from django.utils import six
 
 from passerelle.utils.jsonresponse import APIError
 

tests/test_actesweb.py

@@ -20,10 +20,11 @@ import json
 import io
 import os
 import shutil
-import six
 
 import pytest
 
+from django.utils import six
+
 import utils
 from passerelle.apps.actesweb.models import ActesWeb