From df5e59be34f10083a7170693cb6cd8dfd72373bd Mon Sep 17 00:00:00 2001 From: Jesse Sopel Date: Tue, 3 May 2016 10:07:45 -0400 Subject: [PATCH] [FIX] Compatibility Fixes for Python3 --- wagtail_modeltranslation/models.py | 4 +++- wagtail_modeltranslation/patch_wagtailadmin.py | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wagtail_modeltranslation/models.py b/wagtail_modeltranslation/models.py index 2a0c034..9783e1d 100755 --- a/wagtail_modeltranslation/models.py +++ b/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 diff --git a/wagtail_modeltranslation/patch_wagtailadmin.py b/wagtail_modeltranslation/patch_wagtailadmin.py index 088625f..33cccef 100644 --- a/wagtail_modeltranslation/patch_wagtailadmin.py +++ b/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 @@ -89,7 +91,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 +172,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: