multi-auth: Merged to [3085]

git-svn-id: http://code.djangoproject.com/svn/django/branches/multi-auth@3086 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 31 insertions, 0 deletions

diff --git a/tests/modeltests/str/__init__.py b/tests/modeltests/str/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/modeltests/str/__init__.py
diff --git a/tests/modeltests/str/models.py b/tests/modeltests/str/models.py
new file mode 100644
index 0000000000..4e4228ac89
--- /dev/null
+++ b/tests/modeltests/str/models.py
@@ -0,0 +1,31 @@
+"""
+2. Adding __str__() to models
+
+Although it's not a strict requirement, each model should have a ``__str__()``
+method to return a "human-readable" representation of the object. Do this not
+only for your own sanity when dealing with the interactive prompt, but also
+because objects' representations are used throughout Django's
+automatically-generated admin.
+"""
+
+from django.db import models
+
+class Article(models.Model):
+    headline = models.CharField(maxlength=100)
+    pub_date = models.DateTimeField()
+
+    def __str__(self):
+        return self.headline
+
+API_TESTS = """
+# Create an Article.
+>>> from datetime import datetime
+>>> a = Article(headline='Area man programs in Python', pub_date=datetime(2005, 7, 28))
+>>> a.save()
+
+>>> str(a)
+'Area man programs in Python'
+
+>>> a
+<Article: Area man programs in Python>
+"""