Merge pull request #14 from odelseth/django-3-compatibility

Django 3 compatibility

This should address #13 and #15.

django_encrypted_filefield/constants.py

@@ -1,6 +1,6 @@
 import os
+import six
 from django.conf import settings
-from django.utils import six
 
 
 def _get_setting(name):

django_encrypted_filefield/tests/test_constants.py

@@ -1,5 +1,5 @@
+import six
 from django.test import TestCase, override_settings
-from django.utils import six
 from django_encrypted_filefield.constants import _get_setting, get_bytes
 
 try:

requirements.txt

@@ -4,3 +4,4 @@ Django>=1.11
 cryptography>=1.7.1
 requests>=2.12.4
 python-magic>=0.4.12,<0.5.0
+six>=1.0.0