diff options
Diffstat (limited to 'tests/modeltests')
40 files changed, 142 insertions, 120 deletions
diff --git a/tests/modeltests/basic/models.py b/tests/modeltests/basic/models.py index 81656cf2df..d2220320a0 100644 --- a/tests/modeltests/basic/models.py +++ b/tests/modeltests/basic/models.py @@ -8,7 +8,7 @@ This is a basic model with only two non-primary-key fields. from django.db import models class Article(models.Model): - headline = models.CharField(maxlength=100, default='Default headline') + headline = models.CharField(max_length=100, default='Default headline') pub_date = models.DateTimeField() class Meta: diff --git a/tests/modeltests/choices/models.py b/tests/modeltests/choices/models.py index cb1bd481cd..550e655e46 100644 --- a/tests/modeltests/choices/models.py +++ b/tests/modeltests/choices/models.py @@ -17,8 +17,8 @@ GENDER_CHOICES = ( ) class Person(models.Model): - name = models.CharField(maxlength=20) - gender = models.CharField(maxlength=1, choices=GENDER_CHOICES) + name = models.CharField(max_length=20) + gender = models.CharField(max_length=1, choices=GENDER_CHOICES) def __unicode__(self): return self.name diff --git a/tests/modeltests/custom_columns/models.py b/tests/modeltests/custom_columns/models.py index fb2487802c..e1d0bc6e94 100644 --- a/tests/modeltests/custom_columns/models.py +++ b/tests/modeltests/custom_columns/models.py @@ -18,8 +18,8 @@ ManyToMany field. This has no effect on the API for querying the database. from django.db import models class Author(models.Model): - first_name = models.CharField(maxlength=30, db_column='firstname') - last_name = models.CharField(maxlength=30, db_column='last') + first_name = models.CharField(max_length=30, db_column='firstname') + last_name = models.CharField(max_length=30, db_column='last') def __unicode__(self): return u'%s %s' % (self.first_name, self.last_name) @@ -29,7 +29,7 @@ class Author(models.Model): ordering = ('last_name','first_name') class Article(models.Model): - headline = models.CharField(maxlength=100) + headline = models.CharField(max_length=100) authors = models.ManyToManyField(Author, db_table='my_m2m_table') def __unicode__(self): diff --git a/tests/modeltests/custom_managers/models.py b/tests/modeltests/custom_managers/models.py index 0b9edc88b9..40bf77e273 100644 --- a/tests/modeltests/custom_managers/models.py +++ b/tests/modeltests/custom_managers/models.py @@ -18,8 +18,8 @@ class PersonManager(models.Manager): return self.filter(fun=True) class Person(models.Model): - first_name = models.CharField(maxlength=30) - last_name = models.CharField(maxlength=30) + first_name = models.CharField(max_length=30) + last_name = models.CharField(max_length=30) fun = models.BooleanField() objects = PersonManager() @@ -33,8 +33,8 @@ class PublishedBookManager(models.Manager): return super(PublishedBookManager, self).get_query_set().filter(is_published=True) class Book(models.Model): - title = models.CharField(maxlength=50) - author = models.CharField(maxlength=30) + title = models.CharField(max_length=50) + author = models.CharField(max_length=30) is_published = models.BooleanField() published_objects = PublishedBookManager() authors = models.ManyToManyField(Person, related_name='books') @@ -49,7 +49,7 @@ class FastCarManager(models.Manager): return super(FastCarManager, self).get_query_set().filter(top_speed__gt=150) class Car(models.Model): - name = models.CharField(maxlength=10) + name = models.CharField(max_length=10) mileage = models.IntegerField() top_speed = models.IntegerField(help_text="In miles per hour.") cars = models.Manager() diff --git a/tests/modeltests/custom_methods/models.py b/tests/modeltests/custom_methods/models.py index 5a6581805a..b0ca4131a5 100644 --- a/tests/modeltests/custom_methods/models.py +++ b/tests/modeltests/custom_methods/models.py @@ -8,7 +8,7 @@ from django.db import models import datetime class Article(models.Model): - headline = models.CharField(maxlength=100) + headline = models.CharField(max_length=100) pub_date = models.DateField() def __unicode__(self): diff --git a/tests/modeltests/custom_pk/models.py b/tests/modeltests/custom_pk/models.py index 276fecc371..53bbadbfd4 100644 --- a/tests/modeltests/custom_pk/models.py +++ b/tests/modeltests/custom_pk/models.py @@ -8,10 +8,10 @@ this behavior by explicitly adding ``primary_key=True`` to a field. from django.db import models class Employee(models.Model): - employee_code = models.CharField(maxlength=10, primary_key=True, + employee_code = models.CharField(max_length=10, primary_key=True, db_column = 'code') - first_name = models.CharField(maxlength=20) - last_name = models.CharField(maxlength=20) + first_name = models.CharField(max_length=20) + last_name = models.CharField(max_length=20) class Meta: ordering = ('last_name', 'first_name') @@ -19,7 +19,7 @@ class Employee(models.Model): return u"%s %s" % (self.first_name, self.last_name) class Business(models.Model): - name = models.CharField(maxlength=20, primary_key=True) + name = models.CharField(max_length=20, primary_key=True) employees = models.ManyToManyField(Employee) class Meta: verbose_name_plural = 'businesses' diff --git a/tests/modeltests/field_defaults/models.py b/tests/modeltests/field_defaults/models.py index 7eafa03798..23c4733b8f 100644 --- a/tests/modeltests/field_defaults/models.py +++ b/tests/modeltests/field_defaults/models.py @@ -13,7 +13,7 @@ from django.db import models from datetime import datetime class Article(models.Model): - headline = models.CharField(maxlength=100, default='Default headline') + headline = models.CharField(max_length=100, default='Default headline') pub_date = models.DateTimeField(default=datetime.now) def __unicode__(self): diff --git a/tests/modeltests/fixtures/models.py b/tests/modeltests/fixtures/models.py index c713aa723d..b59dc82884 100644 --- a/tests/modeltests/fixtures/models.py +++ b/tests/modeltests/fixtures/models.py @@ -11,7 +11,7 @@ FIXTURE_DIRS setting. from django.db import models class Article(models.Model): - headline = models.CharField(maxlength=100, default='Default headline') + headline = models.CharField(max_length=100, default='Default headline') pub_date = models.DateTimeField() def __unicode__(self): diff --git a/tests/modeltests/generic_relations/models.py b/tests/modeltests/generic_relations/models.py index d77a2ee43d..ce1d824ca8 100644 --- a/tests/modeltests/generic_relations/models.py +++ b/tests/modeltests/generic_relations/models.py @@ -28,8 +28,8 @@ class TaggedItem(models.Model): return self.tag class Animal(models.Model): - common_name = models.CharField(maxlength=150) - latin_name = models.CharField(maxlength=150) + common_name = models.CharField(max_length=150) + latin_name = models.CharField(max_length=150) tags = generic.GenericRelation(TaggedItem) @@ -37,7 +37,7 @@ class Animal(models.Model): return self.common_name class Vegetable(models.Model): - name = models.CharField(maxlength=150) + name = models.CharField(max_length=150) is_yucky = models.BooleanField(default=True) tags = generic.GenericRelation(TaggedItem) @@ -46,7 +46,7 @@ class Vegetable(models.Model): return self.name class Mineral(models.Model): - name = models.CharField(maxlength=150) + name = models.CharField(max_length=150) hardness = models.PositiveSmallIntegerField() # note the lack of an explicit GenericRelation here... diff --git a/tests/modeltests/get_latest/models.py b/tests/modeltests/get_latest/models.py index e54e5e32b7..099f1e28a6 100644 --- a/tests/modeltests/get_latest/models.py +++ b/tests/modeltests/get_latest/models.py @@ -11,7 +11,7 @@ into the future." from django.db import models class Article(models.Model): - headline = models.CharField(maxlength=100) + headline = models.CharField(max_length=100) pub_date = models.DateField() expire_date = models.DateField() class Meta: @@ -21,7 +21,7 @@ class Article(models.Model): return self.headline class Person(models.Model): - name = models.CharField(maxlength=30) + name = models.CharField(max_length=30) birthday = models.DateField() # Note that this model doesn't have "get_latest_by" set. diff --git a/tests/modeltests/get_object_or_404/models.py b/tests/modeltests/get_object_or_404/models.py index 573eaf2047..bd800317d3 100644 --- a/tests/modeltests/get_object_or_404/models.py +++ b/tests/modeltests/get_object_or_404/models.py @@ -15,7 +15,7 @@ from django.http import Http404 from django.shortcuts import get_object_or_404, get_list_or_404 class Author(models.Model): - name = models.CharField(maxlength=50) + name = models.CharField(max_length=50) def __unicode__(self): return self.name @@ -26,7 +26,7 @@ class ArticleManager(models.Manager): class Article(models.Model): authors = models.ManyToManyField(Author) - title = models.CharField(maxlength=50) + title = models.CharField(max_length=50) objects = models.Manager() by_a_sir = ArticleManager() diff --git a/tests/modeltests/get_or_create/models.py b/tests/modeltests/get_or_create/models.py index ed26daa852..9f025dc582 100644 --- a/tests/modeltests/get_or_create/models.py +++ b/tests/modeltests/get_or_create/models.py @@ -8,8 +8,8 @@ parameters. If an object isn't found, it creates one with the given parameters. from django.db import models class Person(models.Model): - first_name = models.CharField(maxlength=100) - last_name = models.CharField(maxlength=100) + first_name = models.CharField(max_length=100) + last_name = models.CharField(max_length=100) birthday = models.DateField() def __unicode__(self): diff --git a/tests/modeltests/invalid_models/models.py b/tests/modeltests/invalid_models/models.py index 90f2f54632..1afe660dd0 100644 --- a/tests/modeltests/invalid_models/models.py +++ b/tests/modeltests/invalid_models/models.py @@ -10,26 +10,26 @@ class FieldErrors(models.Model): charfield = models.CharField() decimalfield = models.DecimalField() filefield = models.FileField() - prepopulate = models.CharField(maxlength=10, prepopulate_from='bad') - choices = models.CharField(maxlength=10, choices='bad') - choices2 = models.CharField(maxlength=10, choices=[(1,2,3),(1,2,3)]) - index = models.CharField(maxlength=10, db_index='bad') + prepopulate = models.CharField(max_length=10, prepopulate_from='bad') + choices = models.CharField(max_length=10, choices='bad') + choices2 = models.CharField(max_length=10, choices=[(1,2,3),(1,2,3)]) + index = models.CharField(max_length=10, db_index='bad') class Target(models.Model): - tgt_safe = models.CharField(maxlength=10) - clash1 = models.CharField(maxlength=10) - clash2 = models.CharField(maxlength=10) + tgt_safe = models.CharField(max_length=10) + clash1 = models.CharField(max_length=10) + clash2 = models.CharField(max_length=10) - clash1_set = models.CharField(maxlength=10) + clash1_set = models.CharField(max_length=10) class Clash1(models.Model): - src_safe = models.CharField(maxlength=10, core=True) + src_safe = models.CharField(max_length=10, core=True) foreign = models.ForeignKey(Target) m2m = models.ManyToManyField(Target) class Clash2(models.Model): - src_safe = models.CharField(maxlength=10, core=True) + src_safe = models.CharField(max_length=10, core=True) foreign_1 = models.ForeignKey(Target, related_name='id') foreign_2 = models.ForeignKey(Target, related_name='src_safe') @@ -38,7 +38,7 @@ class Clash2(models.Model): m2m_2 = models.ManyToManyField(Target, related_name='src_safe') class Target2(models.Model): - clash3 = models.CharField(maxlength=10) + clash3 = models.CharField(max_length=10) foreign_tgt = models.ForeignKey(Target) clashforeign_set = models.ForeignKey(Target) @@ -46,7 +46,7 @@ class Target2(models.Model): clashm2m_set = models.ManyToManyField(Target) class Clash3(models.Model): - src_safe = models.CharField(maxlength=10, core=True) + src_safe = models.CharField(max_length=10, core=True) foreign_1 = models.ForeignKey(Target2, related_name='foreign_tgt') foreign_2 = models.ForeignKey(Target2, related_name='m2m_tgt') @@ -61,16 +61,16 @@ class ClashM2M(models.Model): m2m = models.ManyToManyField(Target2) class SelfClashForeign(models.Model): - src_safe = models.CharField(maxlength=10, core=True) - selfclashforeign = models.CharField(maxlength=10) + src_safe = models.CharField(max_length=10, core=True) + selfclashforeign = models.CharField(max_length=10) selfclashforeign_set = models.ForeignKey("SelfClashForeign") foreign_1 = models.ForeignKey("SelfClashForeign", related_name='id') foreign_2 = models.ForeignKey("SelfClashForeign", related_name='src_safe') class ValidM2M(models.Model): - src_safe = models.CharField(maxlength=10) - validm2m = models.CharField(maxlength=10) + src_safe = models.CharField(max_length=10) + validm2m = models.CharField(max_length=10) # M2M fields are symmetrical by default. Symmetrical M2M fields # on self don't require a related accessor, so many potential @@ -84,8 +84,8 @@ class ValidM2M(models.Model): m2m_4 = models.ManyToManyField('self') class SelfClashM2M(models.Model): - src_safe = models.CharField(maxlength=10) - selfclashm2m = models.CharField(maxlength=10) + src_safe = models.CharField(max_length=10) + selfclashm2m = models.CharField(max_length=10) # Non-symmetrical M2M fields _do_ have related accessors, so # there is potential for clashes. @@ -100,14 +100,14 @@ class SelfClashM2M(models.Model): class Model(models.Model): "But it's valid to call a model Model." year = models.PositiveIntegerField() #1960 - make = models.CharField(maxlength=10) #Aston Martin - name = models.CharField(maxlength=10) #DB 4 GT + make = models.CharField(max_length=10) #Aston Martin + name = models.CharField(max_length=10) #DB 4 GT class Car(models.Model): - colour = models.CharField(maxlength=5) + colour = models.CharField(max_length=5) model = models.ForeignKey(Model) -model_errors = """invalid_models.fielderrors: "charfield": CharFields require a "maxlength" attribute. +model_errors = """invalid_models.fielderrors: "charfield": CharFields require a "max_length" attribute. invalid_models.fielderrors: "decimalfield": DecimalFields require a "decimal_places" attribute. invalid_models.fielderrors: "decimalfield": DecimalFields require a "max_digits" attribute. invalid_models.fielderrors: "filefield": FileFields require an "upload_to" attribute. diff --git a/tests/modeltests/lookup/models.py b/tests/modeltests/lookup/models.py index 63e45cfb4c..aa90d1e5ec 100644 --- a/tests/modeltests/lookup/models.py +++ b/tests/modeltests/lookup/models.py @@ -8,7 +8,7 @@ from django.db import models from django.conf import settings class Article(models.Model): - headline = models.CharField(maxlength=100) + headline = models.CharField(max_length=100) pub_date = models.DateTimeField() class Meta: ordering = ('-pub_date', 'headline') diff --git a/tests/modeltests/m2m_and_m2o/models.py b/tests/modeltests/m2m_and_m2o/models.py index b5adc63b9d..0ab7a72d57 100644 --- a/tests/modeltests/m2m_and_m2o/models.py +++ b/tests/modeltests/m2m_and_m2o/models.py @@ -7,7 +7,7 @@ Make sure to set ``related_name`` if you use relationships to the same table. from django.db import models class User(models.Model): - username = models.CharField(maxlength=20) + username = models.CharField(max_length=20) class Issue(models.Model): num = models.IntegerField() diff --git a/tests/modeltests/m2m_intermediary/models.py b/tests/modeltests/m2m_intermediary/models.py index 5e56f44872..0f93d5a154 100644 --- a/tests/modeltests/m2m_intermediary/models.py +++ b/tests/modeltests/m2m_intermediary/models.py @@ -13,14 +13,14 @@ writer"). from django.db import models class Reporter(models.Model): - first_name = models.CharField(maxlength=30) - last_name = models.CharField(maxlength=30) + first_name = models.CharField(max_length=30) + last_name = models.CharField(max_length=30) def __unicode__(self): return u"%s %s" % (self.first_name, self.last_name) class Article(models.Model): - headline = models.CharField(maxlength=100) + headline = models.CharField(max_length=100) pub_date = models.DateField() def __unicode__(self): @@ -29,7 +29,7 @@ class Article(models.Model): class Writer(models.Model): reporter = models.ForeignKey(Reporter) article = models.ForeignKey(Article) - position = models.CharField(maxlength=100) + position = models.CharField(max_length=100) def __unicode__(self): return u'%s (%s)' % (self.reporter, self.position) diff --git a/tests/modeltests/m2m_multiple/models.py b/tests/modeltests/m2m_multiple/models.py index 78c35aafc2..26a0a2e798 100644 --- a/tests/modeltests/m2m_multiple/models.py +++ b/tests/modeltests/m2m_multiple/models.py @@ -10,7 +10,7 @@ Set ``related_name`` to designate what the reverse relationship is called. from django.db import models class Category(models.Model): - name = models.CharField(maxlength=20) + name = models.CharField(max_length=20) class Meta: ordering = ('name',) @@ -18,7 +18,7 @@ class Category(models.Model): return self.name class Article(models.Model): - headline = models.CharField(maxlength=50) + headline = models.CharField(max_length=50) pub_date = models.DateTimeField() primary_categories = models.ManyToManyField(Category, related_name='primary_article_set') secondary_categories = models.ManyToManyField(Category, related_name='secondary_article_set') diff --git a/tests/modeltests/m2m_recursive/models.py b/tests/modeltests/m2m_recursive/models.py index 28d98f0600..98f5ce526a 100644 --- a/tests/modeltests/m2m_recursive/models.py +++ b/tests/modeltests/m2m_recursive/models.py @@ -15,7 +15,7 @@ there will be a clash, and tests that symmetry is preserved where appropriate. from django.db import models class Person(models.Model): - name = models.CharField(maxlength=20) + name = models.CharField(max_length=20) friends = models.ManyToManyField('self') idols = models.ManyToManyField('self', symmetrical=False, related_name='stalkers') diff --git a/tests/modeltests/m2o_recursive/models.py b/tests/modeltests/m2o_recursive/models.py index 7421061489..c38200a25b 100644 --- a/tests/modeltests/m2o_recursive/models.py +++ b/tests/modeltests/m2o_recursive/models.py @@ -13,7 +13,7 @@ Set ``related_name`` to designate what the reverse relationship is called. from django.db import models class Category(models.Model): - name = models.CharField(maxlength=20) + name = models.CharField(max_length=20) parent = models.ForeignKey('self', null=True, related_name='child_set') def __unicode__(self): diff --git a/tests/modeltests/m2o_recursive2/models.py b/tests/modeltests/m2o_recursive2/models.py index a8460d6149..47af18ba0e 100644 --- a/tests/modeltests/m2o_recursive2/models.py +++ b/tests/modeltests/m2o_recursive2/models.py @@ -10,7 +10,7 @@ Set ``related_name`` to designate what the reverse relationship is called. from django.db import models class Person(models.Model): - full_name = models.CharField(maxlength=20) + full_name = models.CharField(max_length=20) mother = models.ForeignKey('self', null=True, related_name='mothers_child_set') father = models.ForeignKey('self', null=True, related_name='fathers_child_set') diff --git a/tests/modeltests/manipulators/models.py b/tests/modeltests/manipulators/models.py index 46063828b9..2ee81f62b3 100644 --- a/tests/modeltests/manipulators/models.py +++ b/tests/modeltests/manipulators/models.py @@ -7,14 +7,14 @@ Each model gets an AddManipulator and ChangeManipulator by default. from django.db import models class Musician(models.Model): - first_name = models.CharField(maxlength=30) - last_name = models.CharField(maxlength=30) + first_name = models.CharField(max_length=30) + last_name = models.CharField(max_length=30) def __unicode__(self): return u"%s %s" % (self.first_name, self.last_name) class Album(models.Model): - name = models.CharField(maxlength=100) + name = models.CharField(max_length=100) musician = models.ForeignKey(Musician) release_date = models.DateField(blank=True, null=True) diff --git a/tests/modeltests/many_to_many/models.py b/tests/modeltests/many_to_many/models.py index 446a39b472..198c95c4d5 100644 --- a/tests/modeltests/many_to_many/models.py +++ b/tests/modeltests/many_to_many/models.py @@ -10,7 +10,7 @@ and a publication has multiple articles. from django.db import models class Publication(models.Model): - title = models.CharField(maxlength=30) + title = models.CharField(max_length=30) def __unicode__(self): return self.title @@ -19,7 +19,7 @@ class Publication(models.Model): ordering = ('title',) class Article(models.Model): - headline = models.CharField(maxlength=100) + headline = models.CharField(max_length=100) publications = models.ManyToManyField(Publication) def __unicode__(self): diff --git a/tests/modeltests/many_to_one/models.py b/tests/modeltests/many_to_one/models.py index 1356b1924b..d5d07a1e21 100644 --- a/tests/modeltests/many_to_one/models.py +++ b/tests/modeltests/many_to_one/models.py @@ -7,15 +7,15 @@ To define a many-to-one relationship, use ``ForeignKey()`` . from django.db import models class Reporter(models.Model): - first_name = models.CharField(maxlength=30) - last_name = models.CharField(maxlength=30) + first_name = models.CharField(max_length=30) + last_name = models.CharField(max_length=30) email = models.EmailField() def __unicode__(self): return u"%s %s" % (self.first_name, self.last_name) class Article(models.Model): - headline = models.CharField(maxlength=100) + headline = models.CharField(max_length=100) pub_date = models.DateField() reporter = models.ForeignKey(Reporter) diff --git a/tests/modeltests/many_to_one_null/models.py b/tests/modeltests/many_to_one_null/models.py index 1469dbb5ca..60c5888371 100644 --- a/tests/modeltests/many_to_one_null/models.py +++ b/tests/modeltests/many_to_one_null/models.py @@ -8,13 +8,13 @@ To define a many-to-one relationship that can have a null foreign key, use from django.db import models class Reporter(models.Model): - name = models.CharField(maxlength=30) + name = models.CharField(max_length=30) def __unicode__(self): return self.name class Article(models.Model): - headline = models.CharField(maxlength=100) + headline = models.CharField(max_length=100) reporter = models.ForeignKey(Reporter, null=True) class Meta: diff --git a/tests/modeltests/model_forms/models.py b/tests/modeltests/model_forms/models.py index a21bef02ce..d27f0b0e54 100644 --- a/tests/modeltests/model_forms/models.py +++ b/tests/modeltests/model_forms/models.py @@ -31,20 +31,20 @@ ARTICLE_STATUS = ( ) class Category(models.Model): - name = models.CharField(maxlength=20) - url = models.CharField('The URL', maxlength=40) + name = models.CharField(max_length=20) + url = models.CharField('The URL', max_length=40) def __unicode__(self): return self.name class Writer(models.Model): - name = models.CharField(maxlength=50, help_text='Use both first and last names.') + name = models.CharField(max_length=50, help_text='Use both first and last names.') def __unicode__(self): return self.name class Article(models.Model): - headline = models.CharField(maxlength=50) + headline = models.CharField(max_length=50) pub_date = models.DateField() created = models.DateField(editable=False) writer = models.ForeignKey(Writer) @@ -63,7 +63,7 @@ class Article(models.Model): class PhoneNumber(models.Model): phone = models.PhoneNumberField() - description = models.CharField(maxlength=20) + description = models.CharField(max_length=20) def __unicode__(self): return self.phone @@ -332,6 +332,28 @@ Create a new article, with no categories, via the form. >>> new_art.categories.all() [] +Create a new article, with categories, via the form, but use commit=False. +The m2m data won't be saved until save_m2m() is invoked on the form. +>>> ArticleForm = form_for_model(Article) +>>> f = ArticleForm({'headline': u'The walrus was Paul', 'pub_date': u'1967-11-01', +... 'writer': u'1', 'article': u'Test.', 'categories': [u'1', u'2']}) +>>> new_art = f.save(commit=False) + +# Manually save the instance +>>> new_art.save() +>>> new_art.id +4 + +# The instance doesn't have m2m data yet +>>> new_art = Article.objects.get(id=4) +>>> new_art.categories.all() +[] + +# Save the m2m data on the form +>>> f.save_m2m() +>>> new_art.categories.all() +[<Category: Entertainment>, <Category: It's a test>] + Here, we define a custom Form. Because it happens to have the same fields as the Category model, we can use save_instance() to apply its changes to an existing Category instance. diff --git a/tests/modeltests/model_inheritance/models.py b/tests/modeltests/model_inheritance/models.py index 8fbd518928..ca00e96418 100644 --- a/tests/modeltests/model_inheritance/models.py +++ b/tests/modeltests/model_inheritance/models.py @@ -7,8 +7,8 @@ Model inheritance isn't yet supported. from django.db import models class Place(models.Model): - name = models.CharField(maxlength=50) - address = models.CharField(maxlength=80) + name = models.CharField(max_length=50) + address = models.CharField(max_length=80) def __unicode__(self): return u"%s the place" % self.name diff --git a/tests/modeltests/mutually_referential/models.py b/tests/modeltests/mutually_referential/models.py index 5a3897d21a..7cf7bf8bb2 100644 --- a/tests/modeltests/mutually_referential/models.py +++ b/tests/modeltests/mutually_referential/models.py @@ -7,11 +7,11 @@ To define a many-to-one relationship, use ``ForeignKey()`` . from django.db.models import * class Parent(Model): - name = CharField(maxlength=100, core=True) + name = CharField(max_length=100, core=True) bestchild = ForeignKey("Child", null=True, related_name="favoured_by") class Child(Model): - name = CharField(maxlength=100) + name = CharField(max_length=100) parent = ForeignKey(Parent) __test__ = {'API_TESTS':""" diff --git a/tests/modeltests/one_to_one/models.py b/tests/modeltests/one_to_one/models.py index 99228d21a8..2f3f22e628 100644 --- a/tests/modeltests/one_to_one/models.py +++ b/tests/modeltests/one_to_one/models.py @@ -9,8 +9,8 @@ In this example, a ``Place`` optionally can be a ``Restaurant``. from django.db import models class Place(models.Model): - name = models.CharField(maxlength=50) - address = models.CharField(maxlength=80) + name = models.CharField(max_length=50) + address = models.CharField(max_length=80) def __unicode__(self): return u"%s the place" % self.name @@ -25,18 +25,18 @@ class Restaurant(models.Model): class Waiter(models.Model): restaurant = models.ForeignKey(Restaurant) - name = models.CharField(maxlength=50) + name = models.CharField(max_length=50) def __unicode__(self): return u"%s the waiter at %s" % (self.name, self.restaurant) class ManualPrimaryKey(models.Model): - primary_key = models.CharField(maxlength=10, primary_key=True) - name = models.CharField(maxlength = 50) + primary_key = models.CharField(max_length=10, primary_key=True) + name = models.CharField(max_length = 50) class RelatedModel(models.Model): link = models.OneToOneField(ManualPrimaryKey) - name = models.CharField(maxlength = 50) + name = models.CharField(max_length = 50) __test__ = {'API_TESTS':""" # Create a couple of Places. diff --git a/tests/modeltests/or_lookups/models.py b/tests/modeltests/or_lookups/models.py index 142df16081..ee2cfd2b95 100644 --- a/tests/modeltests/or_lookups/models.py +++ b/tests/modeltests/or_lookups/models.py @@ -14,7 +14,7 @@ a get_sql method). from django.db import models class Article(models.Model): - headline = models.CharField(maxlength=50) + headline = models.CharField(max_length=50) pub_date = models.DateTimeField() class Meta: diff --git a/tests/modeltests/ordering/models.py b/tests/modeltests/ordering/models.py index 1c4e08c11c..3e651d4ee7 100644 --- a/tests/modeltests/ordering/models.py +++ b/tests/modeltests/ordering/models.py @@ -16,7 +16,7 @@ undefined -- not random, just undefined. from django.db import models class Article(models.Model): - headline = models.CharField(maxlength=100) + headline = models.CharField(max_length=100) pub_date = models.DateTimeField() class Meta: ordering = ('-pub_date', 'headline') diff --git a/tests/modeltests/pagination/models.py b/tests/modeltests/pagination/models.py index 2834d293e4..a7af2a7089 100644 --- a/tests/modeltests/pagination/models.py +++ b/tests/modeltests/pagination/models.py @@ -9,7 +9,7 @@ objects into easily readable pages. from django.db import models class Article(models.Model): - headline = models.CharField(maxlength=100, default='Default headline') + headline = models.CharField(max_length=100, default='Default headline') pub_date = models.DateTimeField() def __unicode__(self): diff --git a/tests/modeltests/properties/models.py b/tests/modeltests/properties/models.py index 4ba6b1a808..5326e4ec5f 100644 --- a/tests/modeltests/properties/models.py +++ b/tests/modeltests/properties/models.py @@ -7,8 +7,8 @@ Use properties on models just like on any other Python object. from django.db import models class Person(models.Model): - first_name = models.CharField(maxlength=30) - last_name = models.CharField(maxlength=30) + first_name = models.CharField(max_length=30) + last_name = models.CharField(max_length=30) def _get_full_name(self): return "%s %s" % (self.first_name, self.last_name) diff --git a/tests/modeltests/reserved_names/models.py b/tests/modeltests/reserved_names/models.py index acec978d86..a11b8d9f88 100644 --- a/tests/modeltests/reserved_names/models.py +++ b/tests/modeltests/reserved_names/models.py @@ -10,14 +10,14 @@ reserved-name usage. from django.db import models class Thing(models.Model): - when = models.CharField(maxlength=1, primary_key=True) - join = models.CharField(maxlength=1) - like = models.CharField(maxlength=1) - drop = models.CharField(maxlength=1) - alter = models.CharField(maxlength=1) - having = models.CharField(maxlength=1) - where = models.DateField(maxlength=1) - has_hyphen = models.CharField(maxlength=1, db_column='has-hyphen') + when = models.CharField(max_length=1, primary_key=True) + join = models.CharField(max_length=1) + like = models.CharField(max_length=1) + drop = models.CharField(max_length=1) + alter = models.CharField(max_length=1) + having = models.CharField(max_length=1) + where = models.DateField(max_length=1) + has_hyphen = models.CharField(max_length=1, db_column='has-hyphen') class Meta: db_table = 'select' diff --git a/tests/modeltests/reverse_lookup/models.py b/tests/modeltests/reverse_lookup/models.py index 957c1dfb96..80408ad761 100644 --- a/tests/modeltests/reverse_lookup/models.py +++ b/tests/modeltests/reverse_lookup/models.py @@ -7,20 +7,20 @@ This demonstrates the reverse lookup features of the database API. from django.db import models class User(models.Model): - name = models.CharField(maxlength=200) + name = models.CharField(max_length=200) def __unicode__(self): return self.name class Poll(models.Model): - question = models.CharField(maxlength=200) + question = models.CharField(max_length=200) creator = models.ForeignKey(User) def __unicode__(self): return self.question class Choice(models.Model): - name = models.CharField(maxlength=100) + name = models.CharField(max_length=100) poll = models.ForeignKey(Poll, related_name="poll_choice") related_poll = models.ForeignKey(Poll, related_name="related_choice") diff --git a/tests/modeltests/save_delete_hooks/models.py b/tests/modeltests/save_delete_hooks/models.py index 292cfd8e9e..c1b1d8f08b 100644 --- a/tests/modeltests/save_delete_hooks/models.py +++ b/tests/modeltests/save_delete_hooks/models.py @@ -8,8 +8,8 @@ the methods. from django.db import models class Person(models.Model): - first_name = models.CharField(maxlength=20) - last_name = models.CharField(maxlength=20) + first_name = models.CharField(max_length=20) + last_name = models.CharField(max_length=20) def __unicode__(self): return u"%s %s" % (self.first_name, self.last_name) diff --git a/tests/modeltests/select_related/models.py b/tests/modeltests/select_related/models.py index 235712ef27..43efab3a7d 100644 --- a/tests/modeltests/select_related/models.py +++ b/tests/modeltests/select_related/models.py @@ -12,48 +12,48 @@ from django.db import models # Who remembers high school biology? class Domain(models.Model): - name = models.CharField(maxlength=50) + name = models.CharField(max_length=50) def __unicode__(self): return self.name class Kingdom(models.Model): - name = models.CharField(maxlength=50) + name = models.CharField(max_length=50) domain = models.ForeignKey(Domain) def __unicode__(self): return self.name class Phylum(models.Model): - name = models.CharField(maxlength=50) + name = models.CharField(max_length=50) kingdom = models.ForeignKey(Kingdom) def __unicode__(self): return self.name class Klass(models.Model): - name = models.CharField(maxlength=50) + name = models.CharField(max_length=50) phylum = models.ForeignKey(Phylum) def __unicode__(self): return self.name class Order(models.Model): - name = models.CharField(maxlength=50) + name = models.CharField(max_length=50) klass = models.ForeignKey(Klass) def __unicode__(self): return self.name class Family(models.Model): - name = models.CharField(maxlength=50) + name = models.CharField(max_length=50) order = models.ForeignKey(Order) def __unicode__(self): return self.name class Genus(models.Model): - name = models.CharField(maxlength=50) + name = models.CharField(max_length=50) family = models.ForeignKey(Family) def __unicode__(self): return self.name class Species(models.Model): - name = models.CharField(maxlength=50) + name = models.CharField(max_length=50) genus = models.ForeignKey(Genus) def __unicode__(self): return self.name diff --git a/tests/modeltests/serializers/models.py b/tests/modeltests/serializers/models.py index b7543f9348..2ee6cfce67 100644 --- a/tests/modeltests/serializers/models.py +++ b/tests/modeltests/serializers/models.py @@ -8,7 +8,7 @@ to and from "flat" data (i.e. strings). from django.db import models class Category(models.Model): - name = models.CharField(maxlength=20) + name = models.CharField(max_length=20) class Meta: ordering = ('name',) @@ -17,7 +17,7 @@ class Category(models.Model): return self.name class Author(models.Model): - name = models.CharField(maxlength=20) + name = models.CharField(max_length=20) class Meta: ordering = ('name',) @@ -27,7 +27,7 @@ class Author(models.Model): class Article(models.Model): author = models.ForeignKey(Author) - headline = models.CharField(maxlength=50) + headline = models.CharField(max_length=50) pub_date = models.DateTimeField() categories = models.ManyToManyField(Category) diff --git a/tests/modeltests/str/models.py b/tests/modeltests/str/models.py index 6bd6a7e448..644c6025ab 100644 --- a/tests/modeltests/str/models.py +++ b/tests/modeltests/str/models.py @@ -17,7 +17,7 @@ if you prefer. You must be careful to encode the results correctly, though. from django.db import models class Article(models.Model): - headline = models.CharField(maxlength=100) + headline = models.CharField(max_length=100) pub_date = models.DateTimeField() def __str__(self): @@ -26,7 +26,7 @@ class Article(models.Model): return self.headline class InternationalArticle(models.Model): - headline = models.CharField(maxlength=100) + headline = models.CharField(max_length=100) pub_date = models.DateTimeField() def __unicode__(self): diff --git a/tests/modeltests/transactions/models.py b/tests/modeltests/transactions/models.py index d7eba6e4d3..06d21bbdd4 100644 --- a/tests/modeltests/transactions/models.py +++ b/tests/modeltests/transactions/models.py @@ -10,8 +10,8 @@ manually. from django.db import models class Reporter(models.Model): - first_name = models.CharField(maxlength=30) - last_name = models.CharField(maxlength=30) + first_name = models.CharField(max_length=30) + last_name = models.CharField(max_length=30) email = models.EmailField() def __unicode__(self): diff --git a/tests/modeltests/validation/models.py b/tests/modeltests/validation/models.py index 5be2f867a4..aacd041678 100644 --- a/tests/modeltests/validation/models.py +++ b/tests/modeltests/validation/models.py @@ -12,7 +12,7 @@ from django.db import models class Person(models.Model): is_child = models.BooleanField() - name = models.CharField(maxlength=20) + name = models.CharField(max_length=20) birthdate = models.DateField() favorite_moment = models.DateTimeField() email = models.EmailField() |