schema-evolution: update from HEAD (v5821)

git-svn-id: http://code.djangoproject.com/svn/django/branches/schema-evolution@5822 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 4 insertions, 4 deletions

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'