Django

Code

Changeset 5172

Show
Ignore:
Timestamp:
05/08/07 05:59:35 (1 year ago)
Author:
mtredinnick
Message:

Moved generic relations into django.contrib.contenttypes, since it depends on
that to work. Backwards incompatible change.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/management.py

    r5131 r5172  
    242242def _get_many_to_many_sql_for_model(model): 
    243243    from django.db import backend, get_creation_module 
    244     from django.db.models import GenericRel 
     244    from django.contrib.contenttypes import generic 
    245245 
    246246    data_types = get_creation_module().DATA_TYPES 
    …… 
    249249    final_output = [] 
    250250    for f in opts.many_to_many: 
    251         if not isinstance(f.rel, GenericRel): 
     251        if not isinstance(f.rel, generic.GenericRel): 
    252252            table_output = [style.SQL_KEYWORD('CREATE TABLE') + ' ' + \ 
    253253                style.SQL_TABLE(backend.quote_name(f.m2m_db_table())) + ' ('] 

  • django/trunk/django/db/models/__init__.py

    r4985 r5172  
    99from django.db.models.fields import * 
    1010from django.db.models.fields.related import ForeignKey, OneToOneField, ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel, TABULAR, STACKED 
    11 from django.db.models.fields.generic import GenericRelation, GenericRel, GenericForeignKey 
    1211from django.db.models import signals 
    1312from django.utils.functional import curry 

  • django/trunk/django/db/models/query.py

    r5154 r5172  
    11from django.db import backend, connection, transaction 
    22from django.db.models.fields import DateField, FieldDoesNotExist 
    3 from django.db.models.fields.generic import GenericRelation 
    4 from django.db.models import signals 
     3from django.db.models import signals, loading 
    54from django.dispatch import dispatcher 
    65from django.utils.datastructures import SortedDict 
     6from django.contrib.contenttypes import generic 
    77import operator 
    88import re 
    …… 
    10421042        pk_list = [pk for pk,instance in seen_objs[cls]] 
    10431043        for related in cls._meta.get_all_related_many_to_many_objects(): 
    1044             if not isinstance(related.field, GenericRelation): 
     1044            if not isinstance(related.field, generic.GenericRelation): 
    10451045                for offset in range(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE): 
    10461046                    cursor.execute("DELETE FROM %s WHERE %s IN (%s)" % \ 
    …… 
    10501050                        pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE]) 
    10511051        for f in cls._meta.many_to_many: 
    1052             if isinstance(f, GenericRelation): 
     1052            if isinstance(f, generic.GenericRelation): 
    10531053                from django.contrib.contenttypes.models import ContentType 
    10541054                query_extra = 'AND %s=%%s' % f.rel.to._meta.get_field(f.content_type_field_name).column 

  • django/trunk/tests/modeltests/generic_relations/models.py

    r4796 r5172  
    1212from django.db import models 
    1313from django.contrib.contenttypes.models import ContentType 
     14from django.contrib.contenttypes import generic 
    1415 
    1516class TaggedItem(models.Model): 
    …… 
    1920    object_id = models.PositiveIntegerField() 
    2021     
    21     content_object = models.GenericForeignKey() 
     22    content_object = generic.GenericForeignKey() 
    2223     
    2324    class Meta: 
    …… 
    3132    latin_name = models.CharField(maxlength=150) 
    3233     
    33     tags = models.GenericRelation(TaggedItem) 
     34    tags = generic.GenericRelation(TaggedItem) 
    3435 
    3536    def __str__(self): 
    …… 
    4041    is_yucky = models.BooleanField(default=True) 
    4142     
    42     tags = models.GenericRelation(TaggedItem) 
     43    tags = generic.GenericRelation(TaggedItem) 
    4344     
    4445    def __str__(self): 

  • django/trunk/tests/regressiontests/serializers_regress/models.py

    r4752 r5172  
    77 
    88from django.db import models 
     9from django.contrib.contenttypes import generic 
    910from django.contrib.contenttypes.models import ContentType 
    1011 
    …… 
    8182    object_id = models.PositiveIntegerField() 
    8283 
    83     content_object = models.GenericForeignKey() 
     84    content_object = generic.GenericForeignKey() 
    8485 
    8586    class Meta: 
    …… 
    8990    data = models.CharField(maxlength=30) 
    9091 
    91     tags = models.GenericRelation(Tag) 
     92    tags = generic.GenericRelation(Tag) 
    9293     
    9394# The following test classes are all for validation