Depend on six for now, replace ugettext with gettext

.travis.yml

@@ -42,6 +42,6 @@ matrix:
     - env: REQ="https://github.com/django/django/archive/master.zip#egg=Django"
 install:
   - pip install -U pip wheel
-  - pip install $REQ Pillow FeinCMS django-admin-ordering django-mptt xlsxdocument
+  - pip install $REQ Pillow FeinCMS django-admin-ordering django-mptt six xlsxdocument
   - python setup.py install
 script: cd tests && ./manage.py test -v2 testapp

README.rst

@@ -135,7 +135,7 @@ Define ``FORM_DESIGNER_FIELD_TYPES`` in your settings file like::
 In ``your_project.form_designer_config.py`` something like::
 
     from django import forms
-    from django.utils.translation import ugettext_lazy as _
+    from django.utils.translation import gettext_lazy as _
 
     FIELD_TYPES = [
         {"type": "text", "verbose_name": _("text"), "field": forms.CharField},

form_designer/admin.py

@@ -1,13 +1,13 @@
 import json
+import six
 
 from django import forms
 from django.conf.urls import url
 from django.contrib import admin
 from django.db.models import Model
 from django.shortcuts import get_object_or_404
-from django.utils import six
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from admin_ordering.admin import OrderableAdmin
 from form_designer import models

form_designer/apps.py

@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class FormDesignerConfig(AppConfig):

form_designer/contents.py

@@ -1,7 +1,7 @@
 from django.db import models
 from django.template.loader import render_to_string
 from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms.admin.item_editor import FeinCMSInline
 

form_designer/default_field_types.py

@@ -2,7 +2,7 @@
 
 from django import forms
 from django.apps import apps
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 def disallow_choices(field):

form_designer/models.py

@@ -12,7 +12,7 @@
 from django.utils.html import format_html, format_html_join
 from django.utils.module_loading import import_string
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from form_designer.utils import JSONFieldDescriptor
 

setup.py

@@ -22,7 +22,7 @@ def read(filename):
     platforms=["OS Independent"],
     packages=find_packages(exclude=["tests"]),
     include_package_data=True,
-    install_requires=["django-admin-ordering", "xlsxdocument"],
+    install_requires=["django-admin-ordering", "six", "xlsxdocument"],
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",

tests/testapp/test_forms.py

@@ -183,6 +183,7 @@ def test_admin(self):
 
         # Basic smoke test
         form = Form.objects.get()
+        self.assertEqual(set(form.config), {"email", "save_fs"})
         form_class = form.form_class()
 
         self.assertEqual(form.title, "Test form")

tox.ini

@@ -26,6 +26,7 @@ deps =
     FeinCMS
     django-admin-ordering
     django-mptt
+    six
     xlsxdocument
     coverage
 changedir = {toxinidir}