Renamed ManyToOne to ManyToOneRel to be consistent with ManyToManyRel

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2649 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 13 insertions, 13 deletions

diff --git a/django/core/meta/__init__.py b/django/core/meta/__init__.py
index b99c15a833..0196ac08b2 100644
--- a/django/core/meta/__init__.py
+++ b/django/core/meta/__init__.py
@@ -494,7 +494,7 @@ class Options:
                 # subsequently loaded object with related links will override this
                 # relationship we're adding.
                 link_field = copy.copy(relatedlinks.RelatedLink._meta.get_field('object_id'))
-                link_field.rel = ManyToOne(self.get_model_module().Klass, 'id',
+                link_field.rel = ManyToOneRel(self.get_model_module().Klass, 'id',
                     num_in_admin=3, min_num_in_admin=3, edit_inline=TABULAR,
                     lookup_overrides={
                         'content_type__package__label__exact': self.app_label,
@@ -748,7 +748,7 @@ class ModelBase(type):
                 f.rel.field_name = f.rel.field_name or f.rel.to.pk.name
             # Add "get_thingie" methods for many-to-one related objects.
             # EXAMPLES: Choice.get_poll(), Story.get_dateline()
-            if isinstance(f.rel, ManyToOne):
+            if isinstance(f.rel, ManyToOneRel):
                 func = curry(method_get_many_to_one, f)
                 func.__doc__ = "Returns the associated `%s.%s` object." % (f.rel.to.app_label, f.rel.to.module_name)
                 attrs['get_%s' % f.name] = func
@@ -946,7 +946,7 @@ class Model:
 def method_init(opts, self, *args, **kwargs):
     if kwargs:
         for f in opts.fields:
-            if isinstance(f.rel, ManyToOne):
+            if isinstance(f.rel, ManyToOneRel):
                 try:
                     # Assume object instance was passed in.
                     rel_obj = kwargs.pop(f.name)
@@ -1927,7 +1927,7 @@ def manipulator_flatten_data(opts, klass, add, change, self):
 def manipulator_validator_unique_together(field_name_list, opts, self, field_data, all_data):
     from django.utils.text import get_text_list
     field_list = [opts.get_field(field_name) for field_name in field_name_list]
-    if isinstance(field_list[0].rel, ManyToOne):
+    if isinstance(field_list[0].rel, ManyToOneRel):
         kwargs = {'%s__%s__iexact' % (field_name_list[0], field_list[0].rel.field_name): field_data}
     else:
         kwargs = {'%s__iexact' % field_name_list[0]: field_data}
@@ -1940,7 +1940,7 @@ def manipulator_validator_unique_together(field_name_list, opts, self, field_dat
             # This will be caught by another validator, assuming the field
             # doesn't have blank=True.
             return
-        if isinstance(f.rel, ManyToOne):
+        if isinstance(f.rel, ManyToOneRel):
             kwargs['%s__pk' % f.name] = field_val
         else:
             kwargs['%s__iexact' % f.name] = field_val
@@ -1962,7 +1962,7 @@ def manipulator_validator_unique_for_date(from_field, date_field, opts, lookup_t
     if date_val is None:
         return # Date was invalid. This will be caught by another validator.
     lookup_kwargs = {'%s__year' % date_field.name: date_val.year}
-    if isinstance(from_field.rel, ManyToOne):
+    if isinstance(from_field.rel, ManyToOneRel):
         lookup_kwargs['%s__pk' % from_field.name] = field_data
     else:
         lookup_kwargs['%s__iexact' % from_field.name] = field_data
diff --git a/django/core/meta/fields.py b/django/core/meta/fields.py
index 926b306318..1f72d4d436 100644
--- a/django/core/meta/fields.py
+++ b/django/core/meta/fields.py
@@ -47,7 +47,7 @@ def manipulator_valid_rel_key(f, self, field_data, all_data):
 
 def manipulator_validator_unique(f, opts, self, field_data, all_data):
     "Validates that the value is unique for this field."
-    if f.rel and isinstance(f.rel, ManyToOne):
+    if f.rel and isinstance(f.rel, ManyToOneRel):
         lookup_type = '%s__%s__exact' % (f.name, f.rel.get_related_field().name)
     else:
         lookup_type = '%s__exact' % f.name
@@ -133,7 +133,7 @@ class Field(object):
 
         # Set db_index to True if the field has a relationship and doesn't explicitly set db_index.
         if db_index is None:
-            if isinstance(rel, OneToOne) or isinstance(rel, ManyToOne):
+            if isinstance(rel, OneToOne) or isinstance(rel, ManyToOneRel):
                 self.db_index = True
             else:
                 self.db_index = False
@@ -152,7 +152,7 @@ class Field(object):
         self.attname, self.column = self.get_attname_column()
 
     def get_attname_column(self):
-        if isinstance(self.rel, ManyToOne):
+        if isinstance(self.rel, ManyToOneRel):
             attname = '%s_id' % self.name
         else:
             attname = self.name
@@ -222,7 +222,7 @@ class Field(object):
         params = {'validator_list': self.validator_list[:]}
         if self.maxlength and not self.choices: # Don't give SelectFields a maxlength parameter.
             params['maxlength'] = self.maxlength
-        if isinstance(self.rel, ManyToOne):
+        if isinstance(self.rel, ManyToOneRel):
             params['member_name'] = name_prefix + self.attname
             if self.rel.raw_id_admin:
                 field_objs = self.get_manipulator_field_objs()
@@ -698,7 +698,7 @@ class ForeignKey(Field):
             warnings.warn("edit_inline_type is deprecated. Use edit_inline instead.")
             kwargs['edit_inline'] = kwargs.pop('edit_inline_type')
 
-        kwargs['rel'] = ManyToOne(to, to_field,
+        kwargs['rel'] = ManyToOneRel(to, to_field,
             num_in_admin=kwargs.pop('num_in_admin', 3),
             min_num_in_admin=kwargs.pop('min_num_in_admin', None),
             max_num_in_admin=kwargs.pop('max_num_in_admin', None),
@@ -821,7 +821,7 @@ class OneToOneField(IntegerField):
         kwargs['primary_key'] = True
         IntegerField.__init__(self, **kwargs)
 
-class ManyToOne:
+class ManyToOneRel:
     def __init__(self, to, field_name, num_in_admin=3, min_num_in_admin=None,
         max_num_in_admin=None, num_extra_on_change=1, edit_inline=False,
         related_name=None, limit_choices_to=None, lookup_overrides=None, raw_id_admin=False):
@@ -855,7 +855,7 @@ class ManyToManyRel:
         self.raw_id_admin = raw_id_admin
         assert not (self.raw_id_admin and self.filter_interface), "ManyToManyRels may not use both raw_id_admin and filter_interface"
 
-class OneToOne(ManyToOne):
+class OneToOne(ManyToOneRel):
     def __init__(self, to, field_name, num_in_admin=0, edit_inline=False,
         related_name=None, limit_choices_to=None, lookup_overrides=None,
         raw_id_admin=False):