We do not have to support _meta.module_name anymore

matthiask · matthiask · commit 18473ec7b8cc · 2014-09-29T13:25:33.000+02:00
diff --git a/feincms/_internal.py b/feincms/_internal.py
@@ -8,7 +8,7 @@
 
 
 __all__ = (
-    'get_model', 'get_models', 'get_model_name', 'get_permission_codename',
+    'get_model', 'get_models', 'get_permission_codename',
     'monkeypatch_method', 'monkeypatch_property', 'monkeypatch_class',
 )
 
@@ -72,16 +72,9 @@ def <method2>(...): ...
     return base
 
 
-def get_model_name(opts):
-    try:
-        return opts.model_name
-    except AttributeError:
-        return opts.module_name
-
-
 def get_permission_codename(action, opts):
     """
     Backport of django.contrib.auth.get_permission_codename for older versions
     of Django.
     """
-    return '%s_%s' % (action, get_model_name(opts))
+    return '%s_%s' % (action, opts.model_name)
diff --git a/feincms/content/comments/models.py b/feincms/content/comments/models.py
@@ -23,7 +23,6 @@
 from django.utils.translation import ugettext_lazy as _
 
 from feincms.admin.item_editor import ItemEditorForm
-from feincms._internal import get_model_name
 
 
 # ------------------------------------------------------------------------
@@ -60,7 +59,7 @@ def __init__(self, *args, **kwargs):
                                 _('public') if c.is_public
                                 else _('not public')),
                             'app': comments_model._meta.app_label,
-                            'model': get_model_name(comments_model._meta),
+                            'model': comments_model._meta.model_name,
                         }
                     f.help_text = r
 
diff --git a/feincms/models.py b/feincms/models.py
@@ -28,7 +28,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from feincms import ensure_completely_loaded
-from feincms._internal import get_model, get_model_name
+from feincms._internal import get_model
 from feincms.extensions import ExtensionsMixin
 from feincms.utils import copy_model_instance
 
@@ -525,7 +525,7 @@ def fe_identifier(self):
 
                 return '%s-%s-%s-%s-%s' % (
                     cls._meta.app_label,
-                    get_model_name(cls._meta),
+                    cls._meta.model_name,
                     self.__class__.__name__.lower(),
                     self.parent_id,
                     self.id,
diff --git a/feincms/module/page/forms.py b/feincms/module/page/forms.py
@@ -13,7 +13,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from feincms import ensure_completely_loaded
-from feincms._internal import get_model, get_model_name
+from feincms._internal import get_model
 
 from mptt.forms import MPTTAdminForm
 
@@ -175,7 +175,7 @@ def clean(self):
         if redirect_to and re.match(r'^\d+$', redirect_to):
             opts = self.page_model._meta
             cleaned_data['redirect_to'] = '%s.%s:%s' % (
-                opts.app_label, get_model_name(opts), redirect_to)
+                opts.app_label, opts.model_name, redirect_to)
 
         if 'active' in cleaned_data and not cleaned_data['active']:
             # If the current item is inactive, we do not need to conduct
