diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2005-08-05 22:43:35 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2005-08-05 22:43:35 +0000 |
| commit | a537a4efa1de8333c07817189b6de2711da89ff0 (patch) | |
| tree | 187378dbbd880a5b0fed731c75a03d028fb173d1 | |
| parent | 59c3ebc6dddab2a52b5c4079fb78871b35b5dcaa (diff) | |
Changed 'django-admin startapp' so that it doesn't create the 'urls' directory. People have said they're a bit overwhelmed by the multiple url directories, and this one isn't necessary for basic Django usage. You can always make it yourself if you know what you're doing and want to decouple/distribute your apps.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/conf/app_template/urls/__init__.py | 0 | ||||
| -rw-r--r-- | django/conf/app_template/urls/app_name.py | 5 | ||||
| -rw-r--r-- | docs/tutorial01.txt | 3 | ||||
| -rw-r--r-- | docs/tutorial03.txt | 7 |
4 files changed, 4 insertions, 11 deletions
diff --git a/django/conf/app_template/urls/__init__.py b/django/conf/app_template/urls/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 --- a/django/conf/app_template/urls/__init__.py +++ /dev/null diff --git a/django/conf/app_template/urls/app_name.py b/django/conf/app_template/urls/app_name.py deleted file mode 100644 index de814a56d1..0000000000 --- a/django/conf/app_template/urls/app_name.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.conf.urls.defaults import * - -urlpatterns = patterns('{{ project_name }}.apps.{{ app_name }}.views', -# (r'', ''), -) diff --git a/docs/tutorial01.txt b/docs/tutorial01.txt index 60f370e5a9..b53dea1634 100644 --- a/docs/tutorial01.txt +++ b/docs/tutorial01.txt @@ -122,9 +122,6 @@ That'll create a directory structure like this:: models/ __init__.py polls.py - urls/ - __init__.py - polls.py views/ __init__.py diff --git a/docs/tutorial03.txt b/docs/tutorial03.txt index 5b42c960fe..57d411c157 100644 --- a/docs/tutorial03.txt +++ b/docs/tutorial03.txt @@ -369,9 +369,10 @@ We've been editing the URLs in ``myproject/settings/urls/main.py``, but the URL design of an app is specific to the app, not to the Django installation -- so let's move the URLs within the app directory. -Just copy the file ``myproject/settings/urls/main.py`` to -``myproject/apps/polls/urls/polls.py``, which had already been created, as a -stub, by ``django-admin.py startapp``. +Create a directory ``myproject/apps/polls/urls/``, and put a blank file called +``__init__.py`` into it. (The ``__init__.py`` file is necessary for Python to +treat the directory as a package.) Then copy the file +``myproject/settings/urls/main.py`` to ``myproject/apps/polls/urls/polls.py``. Then, change ``myproject/settings/urls/main.py`` to remove the poll-specific URLs and insert an ``include()``:: |