Merge pull request rewardz#6 from jonathan-golorry/django3

Using six to add Django 3.0 support

model_helpers.py

@@ -1,8 +1,9 @@
+import six
+
 from django.core.exceptions import ValidationError
 from os import path as fs_path
 from time import strftime
 from django.utils.text import slugify
-from django.utils import six
 from django.utils.translation import ugettext as _
 from django.core.cache import cache
 from django.conf import settings

tests/test_key_value_field.py

@@ -1,7 +1,8 @@
+import six
+
 from nose import tools as test
 from sample.models import Team
 from django.core.exceptions import ValidationError
-from django.utils import six
 
 
 def test_key_value_field():