Author: gabrielhurley
Date: 2010-10-18 19:10:22 -0500 (Mon, 18 Oct 2010)
New Revision: 14270
Modified:
django/trunk/docs/intro/overview.txt
django/trunk/docs/ref/contrib/formtools/form-wizard.txt
django/trunk/docs/ref/contrib/sitemaps.txt
django/trunk/docs/topics/db/models.txt
django/trunk/docs/topics/db/queries.txt
django/trunk/docs/topics/generic-views.txt
django/trunk/docs/topics/http/urls.txt
Log:
Fixed #14426 -- Removed "mysite" import statements from examples that might
teach people "bad habits" in regards to creating reusable apps.
Modified: django/trunk/docs/intro/overview.txt
===================================================================
--- django/trunk/docs/intro/overview.txt 2010-10-18 23:58:06 UTC (rev
14269)
+++ django/trunk/docs/intro/overview.txt 2010-10-19 00:10:22 UTC (rev
14270)
@@ -21,7 +21,8 @@
The :doc:`data-model syntax </topics/db/models>` offers many rich ways of
representing your models -- so far, it's been solving two years' worth of
-database-schema problems. Here's a quick example::
+database-schema problems. Here's a quick example, which might be saved in
+the file ``mysite/news/models.py``::
class Reporter(models.Model):
full_name = models.CharField(max_length=70)
@@ -57,7 +58,8 @@
With that, you've got a free, and rich, :doc:`Python API </topics/db/queries>`
to
access your data. The API is created on the fly, no code generation necessary::
- >>> from mysite.models import Reporter, Article
+ # Import the models we created from our "news" app
+ >>> from news.models import Reporter, Article
# No reporters are in the system yet.
>>> Reporter.objects.all()
@@ -177,9 +179,9 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('',
- (r'^articles/(\d{4})/$', 'mysite.views.year_archive'),
- (r'^articles/(\d{4})/(\d{2})/$', 'mysite.views.month_archive'),
- (r'^articles/(\d{4})/(\d{2})/(\d+)/$', 'mysite.views.article_detail'),
+ (r'^articles/(\d{4})/$', 'news.views.year_archive'),
+ (r'^articles/(\d{4})/(\d{2})/$', 'news.views.month_archive'),
+ (r'^articles/(\d{4})/(\d{2})/(\d+)/$', 'news.views.article_detail'),
)
The code above maps URLs, as simple regular expressions, to the location of
@@ -195,7 +197,7 @@
which contains request metadata -- and the values captured in the regex.
For example, if a user requested the URL "/articles/2005/05/39323/", Django
-would call the function ``mysite.views.article_detail(request,
+would call the function ``news.views.article_detail(request,
'2005', '05', '39323')``.
Write your views
Modified: django/trunk/docs/ref/contrib/formtools/form-wizard.txt
===================================================================
--- django/trunk/docs/ref/contrib/formtools/form-wizard.txt 2010-10-18
23:58:06 UTC (rev 14269)
+++ django/trunk/docs/ref/contrib/formtools/form-wizard.txt 2010-10-19
00:10:22 UTC (rev 14270)
@@ -193,7 +193,7 @@
arguments when you instantiate the Wizard::
from django.conf.urls.defaults import *
- from mysite.testapp.forms import ContactForm1, ContactForm2, ContactWizard
+ from testapp.forms import ContactForm1, ContactForm2, ContactWizard
urlpatterns = patterns('',
(r'^contact/$', ContactWizard([ContactForm1, ContactForm2])),
Modified: django/trunk/docs/ref/contrib/sitemaps.txt
===================================================================
--- django/trunk/docs/ref/contrib/sitemaps.txt 2010-10-18 23:58:06 UTC (rev
14269)
+++ django/trunk/docs/ref/contrib/sitemaps.txt 2010-10-19 00:10:22 UTC (rev
14270)
@@ -95,7 +95,7 @@
your sitemap class might look::
from django.contrib.sitemaps import Sitemap
- from mysite.blog.models import Entry
+ from blog.models import Entry
class BlogSitemap(Sitemap):
changefreq = "never"
@@ -242,7 +242,7 @@
from django.conf.urls.defaults import *
from django.contrib.sitemaps import FlatPageSitemap, GenericSitemap
- from mysite.blog.models import Entry
+ from blog.models import Entry
info_dict = {
'queryset': Entry.objects.all(),
Modified: django/trunk/docs/topics/db/models.txt
===================================================================
--- django/trunk/docs/topics/db/models.txt 2010-10-18 23:58:06 UTC (rev
14269)
+++ django/trunk/docs/topics/db/models.txt 2010-10-19 00:10:22 UTC (rev
14270)
@@ -570,7 +570,7 @@
import the related model at the top of the model that holds your model. Then,
just refer to the other model class wherever needed. For example::
- from mysite.geography.models import ZipCode
+ from geography.models import ZipCode
class Restaurant(models.Model):
# ...
Modified: django/trunk/docs/topics/db/queries.txt
===================================================================
--- django/trunk/docs/topics/db/queries.txt 2010-10-18 23:58:06 UTC (rev
14269)
+++ django/trunk/docs/topics/db/queries.txt 2010-10-19 00:10:22 UTC (rev
14270)
@@ -60,7 +60,7 @@
Assuming models live in a file ``mysite/blog/models.py``, here's an example::
- >>> from mysite.blog.models import Blog
+ >>> from blog.models import Blog
>>> b = Blog(name='Beatles Blog', tagline='All the latest Beatles news.')
>>> b.save()
@@ -98,7 +98,7 @@
field; simply assign an object of the right type to the field in question.
This example updates the ``blog`` attribute of an ``Entry`` instance
``entry``::
- >>> from mysite.blog.models import Entry
+ >>> from blog.models import Entry
>>> entry = Entry.objects.get(pk=1)
>>> cheese_blog = Blog.objects.get(name="Cheddar Talk")
>>> entry.blog = cheese_blog
@@ -108,7 +108,7 @@
method on the field to add a record to the relation. This example adds the
``Author`` instance ``joe`` to the ``entry`` object::
- >>> from mysite.blog.models import Author
+ >>> from blog.models import Author
>>> joe = Author.objects.create(name="Joe")
>>> entry.authors.add(joe)
Modified: django/trunk/docs/topics/generic-views.txt
===================================================================
--- django/trunk/docs/topics/generic-views.txt 2010-10-18 23:58:06 UTC (rev
14269)
+++ django/trunk/docs/topics/generic-views.txt 2010-10-19 00:10:22 UTC (rev
14270)
@@ -72,7 +72,7 @@
from django.conf.urls.defaults import *
from django.views.generic.simple import direct_to_template
- **from mysite.books.views import about_pages**
+ **from books.views import about_pages**
urlpatterns = patterns('',
('^about/$', direct_to_template, {
@@ -152,7 +152,7 @@
from django.conf.urls.defaults import *
from django.views.generic import list_detail
- from mysite.books.models import Publisher
+ from books.models import Publisher
publisher_info = {
"queryset" : Publisher.objects.all(),
@@ -251,7 +251,7 @@
.. parsed-literal::
- from mysite.books.models import Publisher, **Book**
+ from books.models import Publisher, **Book**
publisher_info = {
"queryset" : Publisher.objects.all(),
@@ -376,7 +376,7 @@
.. parsed-literal::
- from mysite.books.views import books_by_publisher
+ from books.views import books_by_publisher
urlpatterns = patterns('',
(r'^publishers/$', list_detail.object_list, publisher_info),
@@ -387,7 +387,7 @@
from django.http import Http404
from django.views.generic import list_detail
- from mysite.books.models import Book, Publisher
+ from books.models import Book, Publisher
def books_by_publisher(request, name):
@@ -447,7 +447,7 @@
.. parsed-literal::
- from mysite.books.views import author_detail
+ from books.views import author_detail
urlpatterns = patterns('',
#...
@@ -457,7 +457,7 @@
Then we'd write our wrapper function::
import datetime
- from mysite.books.models import Author
+ from books.models import Author
from django.views.generic import list_detail
from django.shortcuts import get_object_or_404
Modified: django/trunk/docs/topics/http/urls.txt
===================================================================
--- django/trunk/docs/topics/http/urls.txt 2010-10-18 23:58:06 UTC (rev
14269)
+++ django/trunk/docs/topics/http/urls.txt 2010-10-19 00:10:22 UTC (rev
14270)
@@ -338,12 +338,12 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('',
- (r'^articles/(\d{4})/$', 'mysite.news.views.year_archive'),
- (r'^articles/(\d{4})/(\d{2})/$', 'mysite.news.views.month_archive'),
- (r'^articles/(\d{4})/(\d{2})/(\d+)/$',
'mysite.news.views.article_detail'),
+ (r'^articles/(\d{4})/$', 'news.views.year_archive'),
+ (r'^articles/(\d{4})/(\d{2})/$', 'news.views.month_archive'),
+ (r'^articles/(\d{4})/(\d{2})/(\d+)/$', 'news.views.article_detail'),
)
-In this example, each view has a common prefix -- ``'mysite.news.views'``.
+In this example, each view has a common prefix -- ``'news.views'``.
Instead of typing that out for each entry in ``urlpatterns``, you can use the
first argument to the ``patterns()`` function to specify a prefix to apply to
each view function.
@@ -352,7 +352,7 @@
from django.conf.urls.defaults import *
- urlpatterns = patterns('mysite.news.views',
+ urlpatterns = patterns('news.views',
(r'^articles/(\d{4})/$', 'year_archive'),
(r'^articles/(\d{4})/(\d{2})/$', 'month_archive'),
(r'^articles/(\d{4})/(\d{2})/(\d+)/$', 'article_detail'),
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
