Fixed #19689 -- Renamed `Model._meta.module_name` to `model_name`.

5 files changed, 32 insertions, 21 deletions

diff --git a/django/db/models/base.py b/django/db/models/base.py
index 38afc60991..5f058654bf 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -191,7 +191,7 @@ class ModelBase(type):
                 if base in o2o_map:
                     field = o2o_map[base]
                 elif not is_proxy:
-                    attr_name = '%s_ptr' % base._meta.module_name
+                    attr_name = '%s_ptr' % base._meta.model_name
                     field = OneToOneField(base, name=attr_name,
                             auto_created=True, parent_link=True)
                     new_class.add_to_class(attr_name, field)
@@ -973,7 +973,7 @@ def method_get_order(ordered_obj, self):
 ##############################################
 
 def get_absolute_url(opts, func, self, *args, **kwargs):
-    return settings.ABSOLUTE_URL_OVERRIDES.get('%s.%s' % (opts.app_label, opts.module_name), func)(self, *args, **kwargs)
+    return settings.ABSOLUTE_URL_OVERRIDES.get('%s.%s' % (opts.app_label, opts.model_name), func)(self, *args, **kwargs)
 
 
 ########
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
index ae792a30e7..bd2e288410 100644
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -118,7 +118,7 @@ class RelatedField(object):
             self.do_related_class(other, cls)
 
     def set_attributes_from_rel(self):
-        self.name = self.name or (self.rel.to._meta.object_name.lower() + '_' + self.rel.to._meta.pk.name)
+        self.name = self.name or (self.rel.to._meta.model_name + '_' + self.rel.to._meta.pk.name)
         if self.verbose_name is None:
             self.verbose_name = self.rel.to._meta.verbose_name
         self.rel.field_name = self.rel.field_name or self.rel.to._meta.pk.name
@@ -222,7 +222,7 @@ class RelatedField(object):
         # related object in a table-spanning query. It uses the lower-cased
         # object_name by default, but this can be overridden with the
         # "related_name" option.
-        return self.rel.related_name or self.opts.object_name.lower()
+        return self.rel.related_name or self.opts.model_name
 
 
 class SingleRelatedObjectDescriptor(object):
@@ -983,7 +983,7 @@ class ForeignKey(RelatedField, Field):
 
     def __init__(self, to, to_field=None, rel_class=ManyToOneRel, **kwargs):
         try:
-            to_name = to._meta.object_name.lower()
+            to_name = to._meta.model_name
         except AttributeError:  # to._meta doesn't exist, so it must be RECURSIVE_RELATIONSHIP_CONSTANT
             assert isinstance(to, six.string_types), "%s(%r) is invalid. First parameter to ForeignKey must be either a model, a model name, or the string %r" % (self.__class__.__name__, to, RECURSIVE_RELATIONSHIP_CONSTANT)
         else:
@@ -1174,7 +1174,7 @@ def create_many_to_many_intermediary_model(field, klass):
         from_ = 'from_%s' % to.lower()
         to = 'to_%s' % to.lower()
     else:
-        from_ = klass._meta.object_name.lower()
+        from_ = klass._meta.model_name
         to = to.lower()
     meta = type('Meta', (object,), {
         'db_table': field._get_m2m_db_table(klass._meta),
diff --git a/django/db/models/loading.py b/django/db/models/loading.py
index 56edc36bec..c027105c5b 100644
--- a/django/db/models/loading.py
+++ b/django/db/models/loading.py
@@ -239,7 +239,7 @@ class AppCache(object):
         for model in models:
             # Store as 'name: model' pair in a dictionary
             # in the app_models dictionary
-            model_name = model._meta.object_name.lower()
+            model_name = model._meta.model_name
             model_dict = self.app_models.setdefault(app_label, SortedDict())
             if model_name in model_dict:
                 # The same model may be imported via different paths (e.g.
diff --git a/django/db/models/options.py b/django/db/models/options.py
index 952596b514..a302e2d73a 100644
--- a/django/db/models/options.py
+++ b/django/db/models/options.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 
 import re
 from bisect import bisect
+import warnings
 
 from django.conf import settings
 from django.db.models.fields.related import ManyToManyRel
@@ -28,7 +29,7 @@ class Options(object):
     def __init__(self, meta, app_label=None):
         self.local_fields, self.local_many_to_many = [], []
         self.virtual_fields = []
-        self.module_name, self.verbose_name = None, None
+        self.model_name, self.verbose_name = None, None
         self.verbose_name_plural = None
         self.db_table = ''
         self.ordering = []
@@ -78,7 +79,7 @@ class Options(object):
         self.installed = re.sub('\.models$', '', cls.__module__) in settings.INSTALLED_APPS
         # First, construct the default values for these options.
         self.object_name = cls.__name__
-        self.module_name = self.object_name.lower()
+        self.model_name = self.object_name.lower()
         self.verbose_name = get_verbose_name(self.object_name)
 
         # Next, apply any overridden values from 'class Meta'.
@@ -116,11 +117,21 @@ class Options(object):
             self.verbose_name_plural = string_concat(self.verbose_name, 's')
         del self.meta
 
-        # If the db_table wasn't provided, use the app_label + module_name.
+        # If the db_table wasn't provided, use the app_label + model_name.
         if not self.db_table:
-            self.db_table = "%s_%s" % (self.app_label, self.module_name)
+            self.db_table = "%s_%s" % (self.app_label, self.model_name)
             self.db_table = truncate_name(self.db_table, connection.ops.max_name_length())
 
+    @property
+    def module_name(self):
+        """
+        This property has been deprecated in favor of `model_name`. refs #19689
+        """
+        warnings.warn(
+            "Options.module_name has been deprecated in favor of model_name",
+            PendingDeprecationWarning, stacklevel=2)
+        return self.model_name
+
     def _prepare(self, model):
         if self.order_with_respect_to:
             self.order_with_respect_to = self.get_field(self.order_with_respect_to)
@@ -193,7 +204,7 @@ class Options(object):
         return '<Options for %s>' % self.object_name
 
     def __str__(self):
-        return "%s.%s" % (smart_text(self.app_label), smart_text(self.module_name))
+        return "%s.%s" % (smart_text(self.app_label), smart_text(self.model_name))
 
     def verbose_name_raw(self):
         """
@@ -217,7 +228,7 @@ class Options(object):
         case insensitive, so we make sure we are case insensitive here.
         """
         if self.swappable:
-            model_label = '%s.%s' % (self.app_label, self.object_name.lower())
+            model_label = '%s.%s' % (self.app_label, self.model_name)
             swapped_for = getattr(settings, self.swappable, None)
             if swapped_for:
                 try:
@@ -371,13 +382,13 @@ class Options(object):
         return cache
 
     def get_add_permission(self):
-        return 'add_%s' % self.object_name.lower()
+        return 'add_%s' % self.model_name
 
     def get_change_permission(self):
-        return 'change_%s' % self.object_name.lower()
+        return 'change_%s' % self.model_name
 
     def get_delete_permission(self):
-        return 'delete_%s' % self.object_name.lower()
+        return 'delete_%s' % self.model_name
 
     def get_all_related_objects(self, local_only=False, include_hidden=False,
                                 include_proxy_eq=False):
diff --git a/django/db/models/related.py b/django/db/models/related.py
index 26932137ad..53645bedb9 100644
--- a/django/db/models/related.py
+++ b/django/db/models/related.py
@@ -16,8 +16,8 @@ class RelatedObject(object):
         self.model = model
         self.opts = model._meta
         self.field = field
-        self.name = '%s:%s' % (self.opts.app_label, self.opts.module_name)
-        self.var_name = self.opts.object_name.lower()
+        self.name = '%s:%s' % (self.opts.app_label, self.opts.model_name)
+        self.var_name = self.opts.model_name
 
     def get_choices(self, include_blank=True, blank_choice=BLANK_CHOICE_DASH,
                     limit_to_currently_related=False):
@@ -31,7 +31,7 @@ class RelatedObject(object):
         queryset = self.model._default_manager.all()
         if limit_to_currently_related:
             queryset = queryset.complex_filter(
-                {'%s__isnull' % self.parent_model._meta.module_name: False})
+                {'%s__isnull' % self.parent_model._meta.model_name: False})
         lst = [(x._get_pk_val(), smart_text(x)) for x in queryset]
         return first_choice + lst
 
@@ -56,9 +56,9 @@ class RelatedObject(object):
             # If this is a symmetrical m2m relation on self, there is no reverse accessor.
             if getattr(self.field.rel, 'symmetrical', False) and self.model == self.parent_model:
                 return None
-            return self.field.rel.related_name or (self.opts.object_name.lower() + '_set')
+            return self.field.rel.related_name or (self.opts.model_name + '_set')
         else:
-            return self.field.rel.related_name or (self.opts.object_name.lower())
+            return self.field.rel.related_name or (self.opts.model_name)
 
     def get_cache_name(self):
         return "_%s_cache" % self.get_accessor_name()