Merge pull request #77 from sopelj/master

[FIX] Compatibility Fixes for Python3

wagtail_modeltranslation/models.py

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import
+
 import logging
 
 import django
 import warnings
-from patch_wagtailadmin import WagtailTranslator
+from .patch_wagtailadmin import WagtailTranslator
 from wagtail.wagtailcore.models import Page
 from wagtail.wagtailsnippets.models import get_snippet_models
 

wagtail_modeltranslation/patch_wagtailadmin.py

@@ -3,6 +3,8 @@ import copy
 import logging
 import operator
 
+from six import iteritems
+
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse
@@ -28,6 +30,11 @@ try:
 except ImportError:
     pass
 
+try:
+    from functools import reduce
+except ImportError:
+    pass
+
 logger = logging.getLogger('wagtail.core')
 
 
@@ -89,7 +96,7 @@ class WagtailTranslator(object):
                 f.required = True
 
         # Do the same to the formsets
-        for related_name, formset in form.formsets.iteritems():
+        for related_name, formset in iteritems(form.formsets):
             if (formset.model in WagtailTranslator._required_fields and
                     WagtailTranslator._required_fields[formset.model]):
                 for fname, f in formset.form.base_fields.items():
@@ -170,7 +177,7 @@ class WagtailTranslator(object):
                 if fname == field_name:
                     return f.required
         else:
-            for related_name, formset in cls._base_model_form.formsets.iteritems():
+            for related_name, formset in iteritems(cls._base_model_form.formsets):
                 if formset.model == cls._current_model:
                     for fname, f in formset.form.base_fields.items():
                         if fname == field_name:

wagtail_modeltranslation/templatetags/modeltranslation.py

@@ -1,6 +1,7 @@
 # coding: utf-8
 
 import re
+from six import iteritems
 
 from django import template
 from django.core.urlresolvers import resolve
@@ -34,7 +35,7 @@ def change_lang(context, lang=None, *args, **kwargs):
             translated_url = '/' + lang + '/' + path_components[0] + '/'
             if request.GET:
                 translated_url += '?'
-                for key, value in request.GET.iteritems():
+                for key, value in iteritems(request.GET):
                     translated_url += key + '=' + value
             return translated_url
 

wagtail_modeltranslation/templatetags/wagtail_modeltranslation.py

@@ -1,6 +1,7 @@
 # coding: utf-8
 
 import re
+from six import iteritems
 
 from django import template
 from django.core.urlresolvers import resolve
@@ -34,7 +35,7 @@ def change_lang(context, lang=None, *args, **kwargs):
             translated_url = '/' + lang + '/' + path_components[0] + '/'
             if request.GET:
                 translated_url += '?'
-                for key, value in request.GET.iteritems():
+                for key, value in iteritems(request.GET):
                     translated_url += key + '=' + value
             return translated_url
 

wagtail_modeltranslation/wagtail_hooks.py

@@ -1,6 +1,7 @@
 # coding: utf-8
 
 import json
+from six import iteritems
 
 from django.utils.html import format_html, format_html_join
 from django.conf import settings
@@ -54,7 +55,7 @@ def return_translation_target_field_rendered_html(request, page_id):
         target_field_patched = []
         for item in origin_field_serialized:
             patched_item = None
-            for att in item.iteritems():
+            for att in iteritems(item):
                 target_value = att[1]
                 if att[0] == 'name':
                     target_value = att[1].replace(