diff --git a/src/c3nav/editor/models/change.py b/src/c3nav/editor/models/change.py index 3ceea965..143f4cc5 100644 --- a/src/c3nav/editor/models/change.py +++ b/src/c3nav/editor/models/change.py @@ -8,7 +8,8 @@ from django.db import models from django.db.models import Q from django.utils.translation import ugettext_lazy as _ -from c3nav.editor.wrappers import ModelInstanceWrapper, is_created_pk +from c3nav.editor.utils import is_created_pk +from c3nav.editor.wrappers import ModelInstanceWrapper class Change(models.Model): diff --git a/src/c3nav/editor/models/changeset.py b/src/c3nav/editor/models/changeset.py index 95224a4a..baa0a606 100644 --- a/src/c3nav/editor/models/changeset.py +++ b/src/c3nav/editor/models/changeset.py @@ -12,7 +12,8 @@ from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy from c3nav.editor.models.change import Change -from c3nav.editor.wrappers import ModelWrapper, is_created_pk +from c3nav.editor.utils import is_created_pk +from c3nav.editor.wrappers import ModelWrapper from c3nav.mapdata.models import LocationSlug from c3nav.mapdata.models.locations import LocationRedirect diff --git a/src/c3nav/editor/utils.py b/src/c3nav/editor/utils.py new file mode 100644 index 00000000..515099a6 --- /dev/null +++ b/src/c3nav/editor/utils.py @@ -0,0 +1,2 @@ +def is_created_pk(pk): + return isinstance(pk, str) and pk.startswith('c') and pk[1:].isnumeric() diff --git a/src/c3nav/editor/views/changes.py b/src/c3nav/editor/views/changes.py index 308f9de7..177e2514 100644 --- a/src/c3nav/editor/views/changes.py +++ b/src/c3nav/editor/views/changes.py @@ -8,8 +8,8 @@ from django.utils.formats import date_format from django.utils.translation import ugettext_lazy as _ from c3nav.editor.models import ChangeSet +from c3nav.editor.utils import is_created_pk from c3nav.editor.views.base import sidebar_view -from c3nav.editor.wrappers import is_created_pk from c3nav.mapdata.models.locations import LocationRedirect, LocationSlug diff --git a/src/c3nav/editor/wrappers.py b/src/c3nav/editor/wrappers.py index 94046bbc..d448366b 100644 --- a/src/c3nav/editor/wrappers.py +++ b/src/c3nav/editor/wrappers.py @@ -11,10 +11,7 @@ from django.db.models.query_utils import DeferredAttribute from django.utils.functional import cached_property from c3nav.editor.forms import create_editor_form - - -def is_created_pk(pk): - return isinstance(pk, str) and pk.startswith('c') and pk[1:].isnumeric() +from c3nav.editor.utils import is_created_pk class BaseWrapper: