From 0ee37b1cd31a4af4fb0cd314ac7b97237a3710ee Mon Sep 17 00:00:00 2001 From: Tom Price Date: Thu, 31 Mar 2016 12:07:07 +0100 Subject: [PATCH] Fix issues with python2 imports --- RIGS/admin.py | 14 +++++++------- RIGS/forms.py | 2 +- RIGS/models.py | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/RIGS/admin.py b/RIGS/admin.py index 18dc554e..f8107a9e 100644 --- a/RIGS/admin.py +++ b/RIGS/admin.py @@ -2,15 +2,15 @@ from django.contrib import admin from RIGS import models, forms from django.contrib.auth.admin import UserAdmin from django.utils.translation import ugettext_lazy as _ -import reversion +from reversion.admin import VersionAdmin # Register your models here. -admin.site.register(models.Person, reversion.VersionAdmin) -admin.site.register(models.Organisation, reversion.VersionAdmin) -admin.site.register(models.VatRate, reversion.VersionAdmin) -admin.site.register(models.Venue, reversion.VersionAdmin) -admin.site.register(models.Event, reversion.VersionAdmin) -admin.site.register(models.EventItem, reversion.VersionAdmin) +admin.site.register(models.Person, VersionAdmin) +admin.site.register(models.Organisation, VersionAdmin) +admin.site.register(models.VatRate, VersionAdmin) +admin.site.register(models.Venue, VersionAdmin) +admin.site.register(models.Event, VersionAdmin) +admin.site.register(models.EventItem, VersionAdmin) admin.site.register(models.Invoice) admin.site.register(models.Payment) diff --git a/RIGS/forms.py b/RIGS/forms.py index e1e95012..d1b826c3 100644 --- a/RIGS/forms.py +++ b/RIGS/forms.py @@ -45,7 +45,7 @@ class ProfileChangeForm(UserChangeForm): # Events Shit class EventForm(forms.ModelForm): - datetime_input_formats = formats.get_format_lazy("DATETIME_INPUT_FORMATS") + settings.DATETIME_INPUT_FORMATS + datetime_input_formats = formats.get_format_lazy("DATETIME_INPUT_FORMATS") + list(settings.DATETIME_INPUT_FORMATS) meet_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False) access_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False) diff --git a/RIGS/models.py b/RIGS/models.py index fc06911f..05066323 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -6,7 +6,7 @@ from django.contrib.auth.models import AbstractUser from django.conf import settings from django.utils.functional import cached_property from django.utils.encoding import python_2_unicode_compatible -import reversion +from reversion import revisions as reversion import string import random from collections import Counter @@ -552,4 +552,4 @@ class Payment(models.Model): method = models.CharField(max_length=2, choices=METHODS, null=True, blank=True) def __str__(self): - return "%s: %d" % (self.get_method_display(), self.amount) \ No newline at end of file + return "%s: %d" % (self.get_method_display(), self.amount)