Changeset 2571

Timestamp:

03/27/06 17:20:59 (3 years ago)

Author:

adrian

Message:

magic-removal: Fixed Option.verbose_name_plural behavior so that it's always calculated based on verbose_name, regardless of whether a custom verbose_name was given. Thanks for reporting, ChaosKCW

Files:

• django/branches/magic-removal/django/db/models/options.py (modified) (3 diffs)

django/branches/magic-removal/django/db/models/options.py

@@ -11 +11 @@
-get_verbose_name = lambda class_name: re.sub('([A-Z])', ' \\1', class_name).lower().strip()
-
-verbose_name_plural', '
+
-                 'unique_together', 'permissions', 'get_latest_by',
-                 'order_with_respect_to', 'app_label')
@@ -36 +36 @@
-    def contribute_to_class(self, cls, name):
-        cls._meta = self
+        # First, construct the default values for these options.
-        self.object_name = cls.__name__
-        self.module_name = self.object_name.lower()
-        # If the verbose_name wasn't given, use the class name,
-        # converted from "InitialCaps" to "lowercase with spaces".
-        self.verbose_name = get_verbose_name(self.object_name)
-self.verbose_name_plural = self.verbose_name + 's'
+# Next, apply any overridden values from 'class Meta'.
-        if self.meta:
-            meta_attrs = self.meta.__dict__
@@ -48 +47 @@
-            for attr_name in DEFAULT_NAMES:
-                setattr(self, attr_name, meta_attrs.pop(attr_name, getattr(self, attr_name)))
+            # verbose_name_plural is a special case because it uses a 's'
+            # by default.
+            setattr(self, 'verbose_name_plural', meta_attrs.pop('verbose_name_plural', self.verbose_name + 's'))
+            # Any leftover attributes must be invalid.
-            if meta_attrs != {}:
-                raise TypeError, "'class Meta' got invalid attribute(s): %s" % ','.join(meta_attrs.keys())