diff options
author | Magnus Hagander | 2019-02-24 11:25:43 +0000 |
---|---|---|
committer | Magnus Hagander | 2019-02-24 11:25:43 +0000 |
commit | 4fd0d9fd1a49de259eb2bd3219d0fcd268803c3a (patch) | |
tree | 6dd5334b470afd768ea24a983c03cbab21a34ea1 | |
parent | e08a73cb028c7b58099be08316613a3939458fe7 (diff) |
Update to python 3
-rw-r--r-- | pgmailmgr/mailmgr/admin.py | 2 | ||||
-rw-r--r-- | pgmailmgr/mailmgr/forms.py | 2 | ||||
-rw-r--r-- | pgmailmgr/mailmgr/models.py | 10 | ||||
-rw-r--r-- | pgmailmgr/mailmgr/views.py | 4 | ||||
-rw-r--r-- | pgmailmgr/settings.py | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/pgmailmgr/mailmgr/admin.py b/pgmailmgr/mailmgr/admin.py index 30dd056..16d63d9 100644 --- a/pgmailmgr/mailmgr/admin.py +++ b/pgmailmgr/mailmgr/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from models import * +from .models import * admin.site.register(LocalDomain) admin.site.register(Forwarder) diff --git a/pgmailmgr/mailmgr/forms.py b/pgmailmgr/mailmgr/forms.py index 1d72f00..766c1f9 100644 --- a/pgmailmgr/mailmgr/forms.py +++ b/pgmailmgr/mailmgr/forms.py @@ -2,7 +2,7 @@ from django import forms from django.forms import ValidationError from django.db import connection -from models import * +from .models import * class VirtualUserForm(forms.ModelForm): diff --git a/pgmailmgr/mailmgr/models.py b/pgmailmgr/mailmgr/models.py index 1172605..df90706 100644 --- a/pgmailmgr/mailmgr/models.py +++ b/pgmailmgr/mailmgr/models.py @@ -10,7 +10,7 @@ class LocalDomain(models.Model): unix_user = models.IntegerField(null=False, blank=False, default=0) unix_group = models.IntegerField(null=False, blank=False, default=0) - def __unicode__(self): + def __str__(self): return self.domain_name trigger_update = True @@ -27,7 +27,7 @@ class Forwarder(models.Model): local_domain = models.ForeignKey(LocalDomain, null=False, blank=False, db_column='local_domain_id') remote_name = models.CharField(max_length=200, null=False, blank=False) - def __unicode__(self): + def __str__(self): return "%s@%s -> %s" % (self.local_part, self.local_domain.domain_name, self.remote_name) trigger_update = True @@ -46,7 +46,7 @@ class VirtualUser(models.Model): passwd = models.CharField(max_length=100, null=False, blank=False, verbose_name="Password") full_name = models.CharField(max_length=200, null=False, blank=True) - def __unicode__(self): + def __str__(self): return "%s@%s (%s)" % (self.local_part, self.local_domain.domain_name, self.full_name or '') trigger_update = True @@ -63,7 +63,7 @@ class UserPermissions(models.Model): domain = models.ForeignKey(LocalDomain, null=False) pattern = models.CharField(max_length=100, null=False, blank=False) - def __unicode__(self): + def __str__(self): return "%s -> %s pattern '%s'" % (self.user, self.domain, self.pattern) @@ -72,7 +72,7 @@ class Log(models.Model): when = models.DateTimeField(null=False, auto_now=True) what = models.CharField(max_length=2048, null=False, blank=False) - def __unicode__(self): + def __str__(self): return "%s (%s): %s" % (self.when, self.user, self.what) class Meta: diff --git a/pgmailmgr/mailmgr/views.py b/pgmailmgr/mailmgr/views.py index 48d2093..5497fb9 100644 --- a/pgmailmgr/mailmgr/views.py +++ b/pgmailmgr/mailmgr/views.py @@ -5,8 +5,8 @@ from django.contrib import messages from django.db import transaction -from models import * -from forms import * +from .models import * +from .forms import * def log(user, what): diff --git a/pgmailmgr/settings.py b/pgmailmgr/settings.py index 75c3b98..381729e 100644 --- a/pgmailmgr/settings.py +++ b/pgmailmgr/settings.py @@ -161,4 +161,4 @@ DEBUG = False SESSION_COOKIE_SECURE = True SESSION_COOKIE_DOMAIN = "webmail.postgresql.org" -from settings_local import * +from .settings_local import * |