mirror of
https://github.com/django/django.git
synced 2025-10-26 15:16:09 +00:00
http://code.djangoproject.com/svn/django/trunk ........ r5626 | russellm | 2007-07-07 10:16:23 +0800 (Sat, 07 Jul 2007) | 2 lines Added some uncredited authors that worked on the Oracle branch. ........ r5629 | mtredinnick | 2007-07-08 01:15:54 +0800 (Sun, 08 Jul 2007) | 8 lines Changed HttpRequest.path to be a Unicode object. It has already been URL-decoded by the time we see it anyway, so keeping it as a UTF-8 bytestring was causing unnecessary problems. Also added handling for non-ASCII URL fragments in feed creation (the portion that was outside the control of the Feed class was messed up). ........ r5630 | mtredinnick | 2007-07-08 02:24:27 +0800 (Sun, 08 Jul 2007) | 4 lines Fixed #4772 -- Fixed reverse URL creation to work with non-ASCII arguments. Also included a test for non-ASCII strings in URL patterns, although that already worked correctly. ........ r5631 | mtredinnick | 2007-07-08 02:39:23 +0800 (Sun, 08 Jul 2007) | 3 lines Corrected misleading comment from [5619]. Not sure what I was smoking at the time. ........ r5632 | mtredinnick | 2007-07-08 08:39:32 +0800 (Sun, 08 Jul 2007) | 5 lines Fixed reverse URL lookup using functions when the original URL pattern was a string. This is now just as fragile as it was prior to [5609], but works in a few cases that people were relying on, apparently. ........ r5636 | mtredinnick | 2007-07-08 19:22:53 +0800 (Sun, 08 Jul 2007) | 4 lines Fixed #4798-- Made sure that function keyword arguments are strings (for the keywords themselves) when using Unicode URL patterns. ........ r5638 | gwilson | 2007-07-10 10:34:42 +0800 (Tue, 10 Jul 2007) | 2 lines Fixed #4817 -- Removed leading forward slashes from some urlconf examples in the documentation. ........ r5639 | gwilson | 2007-07-10 10:45:11 +0800 (Tue, 10 Jul 2007) | 2 lines Fixed #4814 -- Fixed some whitespace issues in tutorial01, thanks John Shaffer. ........ r5640 | gwilson | 2007-07-10 11:26:26 +0800 (Tue, 10 Jul 2007) | 2 lines Fixed #4812 -- Fixed an octal escape in regular expression that is used in the `isValidEmail` validator, thanks batchman@free.fr. ........ r5641 | mtredinnick | 2007-07-10 20:02:06 +0800 (Tue, 10 Jul 2007) | 3 lines Fixed #4823 -- Fixed a Python 2.3 incompatibility from [5636] (it was even demonstrated by existing tests, so I really screwed this up). ........ r5642 | mtredinnick | 2007-07-10 20:03:36 +0800 (Tue, 10 Jul 2007) | 3 lines Fixed #4804 -- Fixed a problem when validating choice lists with non-ASCII data. Thanks, django@vonposer.de. ........ r5643 | mtredinnick | 2007-07-10 20:33:55 +0800 (Tue, 10 Jul 2007) | 4 lines Fixed #3760 -- Added the ability to manually set feed- and item-level id elements in Atom feeds. This is fully backwards compatible. Based on a patch from spark343@cs.ubc.ca. ........ r5644 | mtredinnick | 2007-07-11 14:55:12 +0800 (Wed, 11 Jul 2007) | 3 lines Fixed #4815 -- Fixed decoding of request parameters when the input encoding is not UTF-8. Thanks, Jordan Dimov. ........ r5645 | mtredinnick | 2007-07-11 15:00:27 +0800 (Wed, 11 Jul 2007) | 3 lines Fixed #4802 -- Updated French translation. Combined contribution from baptiste.goupil@gmail.com and rocherl@club-internet.fr. ........ r5646 | mtredinnick | 2007-07-11 15:12:50 +0800 (Wed, 11 Jul 2007) | 2 lines Fixed #4753 -- Small update to Spanish translation from Mario Gonzalez. ........ r5649 | jacob | 2007-07-12 08:33:44 +0800 (Thu, 12 Jul 2007) | 1 line Fixed #4615: corrected reverse URL resolution examples in tutorial 4. Thanks for the patch, simeonf. ........ r5650 | adrian | 2007-07-12 12:43:29 +0800 (Thu, 12 Jul 2007) | 1 line Added 'New in Django development version' note to docs/syndication_feeds.txt changes from [5643] ........ r5651 | adrian | 2007-07-12 12:44:45 +0800 (Thu, 12 Jul 2007) | 1 line Edited changes to docs/tutorial04.txt from [5649] ........ r5652 | adrian | 2007-07-12 13:23:47 +0800 (Thu, 12 Jul 2007) | 1 line Added helpful error message to SiteManager.get_current() if the user hasn't set SITE_ID ........ r5653 | adrian | 2007-07-12 13:28:04 +0800 (Thu, 12 Jul 2007) | 1 line Added RequestSite class to sites framework ........ r5654 | adrian | 2007-07-12 13:29:32 +0800 (Thu, 12 Jul 2007) | 1 line Improved syndication feed framework to use RequestSite if the sites framework is not installed -- i.e., the sites framework is no longer required to use the syndication feed framework. This is backwards incompatible if anybody has subclassed Feed and overridden __init__(), because the second parameter is now expected to be an HttpRequest object instead of request.path ........ r5658 | russellm | 2007-07-12 15:45:35 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4459 -- Added 'raw' argument to save method, to override any pre-save processing, and modified serializers to use a raw-save. This enables serialization of DateFields with auto_now/auto_now_add. Also modified serializers to invoke save() directly on the model baseclass, to avoid any (potentially order-dependent, data modifying) behavior in a custom save() method. ........ r5659 | russellm | 2007-07-12 19:24:16 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #3770 -- Remove null=True tag from OneToOne serialization test. OneToOne fields can't have a value of null. ........ r5660 | russellm | 2007-07-12 19:27:38 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #3768 -- Disabled NullBooleanField PK serialization test. We can't and don't test null PK values. ........ r5662 | russellm | 2007-07-12 20:33:24 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4837 -- Updated Debian packaging details. Thanks for the suggestion, Yasushi Masuda <whosaysni@gmail.com>. ........ r5663 | russellm | 2007-07-12 20:44:05 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4808 -- Added Chilean regions in localflavor. Thanks, Marijn Vriens <marijn@metronomo.cl>. ........ r5664 | russellm | 2007-07-12 20:48:27 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4745 -- Updated docs to point out that 0 is not a valid SITE_ID when running the tests. Thanks for the suggestion, Lars Stavholm <stava@telcotec.se>. ........ r5665 | russellm | 2007-07-12 20:50:02 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4763 -- Minor typo in cache documentations. Thanks, dan@coffeecode.net. ........ r5666 | russellm | 2007-07-12 20:55:28 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4627 -- Added details on MacPorts packaging of Django. Thanks, Paul Bissex. ........ r5667 | russellm | 2007-07-12 21:23:11 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4640 -- Fixed import to stringfilter in docs. Proposed solution to move stringfilter into django.template.__init__ introduces a circular import problem. ........ r5668 | russellm | 2007-07-12 21:32:00 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4722 -- Clarified discussion about PYTHONPATH in modpython docs. Thanks for the suggestion, Collin Grady <cgrady@the-magi.us>. ........ r5669 | russellm | 2007-07-12 21:37:59 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4755 -- Modified newforms MultipleChoiceField to use list comprehension, rather than iteration. ........ r5670 | russellm | 2007-07-12 21:41:27 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4764 -- Added reference to Locale middleware in middleware docs. Thanks, dan@coffeecode.net. ........ r5671 | russellm | 2007-07-12 21:55:19 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4768 -- Converted timesince and dateformat to use explicit floor division (pre-emptive avoidance of Python 3000 compatibility problem), and removed a redundant millisecond check. Thanks, John Shaffer <jshaffer2112@gmail.com>. ........ r5672 | russellm | 2007-07-12 22:00:13 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4775 -- Added some missing Hungarian accents to the urlify.js LATIN_MAP. Thanks, Pistahh <szekeres@iii.hu>. ........ r5673 | russellm | 2007-07-12 22:05:16 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4502 -- Clarified reference to view in tutorial. Thanks for the suggestion, Carl Karsten <carl@personnelware.com>. ........ r5674 | russellm | 2007-07-12 22:11:41 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4522 -- Clarified the allowed filter arguments on the time and date filters. Thanks for the suggestion, admackin@gmail.com. ........ r5675 | russellm | 2007-07-12 22:21:51 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4525 -- Fixed mistaken documentation on arguments to runfcgi. Thanks, Johan Bergstrom <bugs@bergstroem.nu>. ........ r5676 | russellm | 2007-07-12 22:41:32 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4538 -- Split the installation instructions to differentiate between installing a distribution package and installing an official release. Thanks to Carl Karsten for the idea, and Paul Bissex for the patch. ........ r5677 | russellm | 2007-07-12 23:26:37 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4526 -- Modified the test Client login method to fail when a user is inactive. Thanks, marcin@elksoft.pl. ........ r5678 | russellm | 2007-07-13 13:03:33 +0800 (Fri, 13 Jul 2007) | 2 lines Fixed #3505 -- Added handling for the error raised when the user forgets the comma in a single element tuple when defining AUTHENTICATION_BACKENDS. Thanks for the help identifying this problem, Mario Gonzalez <gonzalemario@gmail.com>. ........ r5679 | mtredinnick | 2007-07-13 16:52:07 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #2591 -- Fixed a problem with inspectdb with psycopg2 (only). Patch from Gary Wilson. ........ r5680 | mtredinnick | 2007-07-13 17:09:59 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4807 -- Fixed a couple of corner cases in decimal form input validation. Based on a suggestion from Chriss Moffit. ........ r5681 | mtredinnick | 2007-07-13 17:14:51 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4839 -- Added __repr__ methods to URL classes that show the pattern they contain. Thanks, Thomas G?\195?\188ttler. ........ r5682 | mtredinnick | 2007-07-13 18:56:30 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4842 -- Added slightly more robust error reporting. Thanks, Thomas G?\195?\188ttler. ........ r5683 | mtredinnick | 2007-07-13 19:05:01 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4846 -- Fixed some Python 2.3 encoding problems in the admin interface. Based on a patch from daybreaker12@gmail.com. ........ r5684 | mtredinnick | 2007-07-13 20:03:20 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4861 -- Removed some duplicated logic from the newforms RegexField by making it a subclass of CharField. Thanks, Collin Grady. ........ r5685 | mtredinnick | 2007-07-13 21:15:35 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4865 -- Replaced a stray generator comprehension with a list comprehension so that we don't break Python 2.3. ........ r5686 | mtredinnick | 2007-07-13 22:13:35 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4469 -- Added slightly more informative error messages to max- and min-length newform validation. Based on a patch from A. Murat Eren. ........ r5687 | mtredinnick | 2007-07-13 22:14:47 +0800 (Fri, 13 Jul 2007) | 2 lines Added author credit for [5686]. Refs #4469. ........ r5688 | mtredinnick | 2007-07-13 22:33:46 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4484 -- Fixed APPEND_SLASH handling to handle an empty path value. Thanks, VesselinK. ........ r5689 | mtredinnick | 2007-07-13 22:40:39 +0800 (Fri, 13 Jul 2007) | 2 lines Fixed #4556 -- Stylistic changes to [5500]. Thanks, glin@seznam.cz. ........ r5690 | gwilson | 2007-07-14 04:36:01 +0800 (Sat, 14 Jul 2007) | 2 lines Refs #2591 -- Removed int conversion and try/except since the value in the single-item list is already an int. I overlooked this in my original patch, which was applied in [5679]. ........ r5691 | adrian | 2007-07-14 05:20:07 +0800 (Sat, 14 Jul 2007) | 1 line Documented the 'commit' argument to save() methods on forms created via form_for_model() or form_for_instance() ........ r5692 | mtredinnick | 2007-07-14 13:27:22 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4869 -- Added a note that syncdb does not alter existing tables. Thanks, James Bennett. ........ r5693 | mtredinnick | 2007-07-14 20:48:24 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4863 -- Removed comment references to a no-longer present link. Pointed out by Thomas G?\195?\188ttler. ........ r5694 | mtredinnick | 2007-07-14 21:14:28 +0800 (Sat, 14 Jul 2007) | 2 lines Fixed #4862 -- Fixed invalid Javascript creation in popup windows in admin. ........ r5695 | mtredinnick | 2007-07-14 21:39:41 +0800 (Sat, 14 Jul 2007) | 2 lines Fixed a problem with translatable strings from [5686]. ........ r5696 | mtredinnick | 2007-07-14 22:47:14 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4731 -- Changed management.setup_environ() so that it no longer assumes the settings module is called "settings". Patch from SmileyChris. ........ r5697 | mtredinnick | 2007-07-14 22:50:35 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4870 -- Removed unneeded import and fixed a docstring in an example. Thanks, Collin Grady. ........ r5698 | adrian | 2007-07-15 00:58:54 +0800 (Sun, 15 Jul 2007) | 1 line Edited docs/db-api.txt changes from [5658] ........ r5699 | adrian | 2007-07-15 01:04:30 +0800 (Sun, 15 Jul 2007) | 1 line Negligible capitalization fix in test/client.py docstring ........ r5700 | russellm | 2007-07-15 12:41:59 +0800 (Sun, 15 Jul 2007) | 2 lines Clarified the documentation on the steps that happen during a save, and how raw save affects those steps. ........ r5701 | gwilson | 2007-07-15 13:03:28 +0800 (Sun, 15 Jul 2007) | 2 lines Fixed #4310 -- Fixed a regular expression bug in `strip_entities` function and added tests for several `django.utils.html` functions. Based on patch from Brian Harring. ........ r5702 | gwilson | 2007-07-15 13:11:06 +0800 (Sun, 15 Jul 2007) | 2 lines Fixed #4877 -- Fixed typo in testing documentation, patch from John Shaffer. ........ r5703 | gwilson | 2007-07-15 14:24:54 +0800 (Sun, 15 Jul 2007) | 2 lines Fixed #3012 -- Changed the locmem cache backend to use pickle instead of deepcopy to make it compatible with iterators (which cannot be copied). Patch from Sundance. ........ r5704 | gwilson | 2007-07-15 14:29:45 +0800 (Sun, 15 Jul 2007) | 2 lines Changed imports to adhere to PEP 8. ........ r5705 | mtredinnick | 2007-07-15 17:39:13 +0800 (Sun, 15 Jul 2007) | 3 lines Fixed #4880 -- Updated Spanish translation (includes re-encoding to UTF-8). Thanks, Jorge Gajon. ........ r5706 | mtredinnick | 2007-07-15 17:46:42 +0800 (Sun, 15 Jul 2007) | 3 lines Fixed #4882 -- Updated Argentinean Spanish translation (includes re-encoding to UTF-8). Thanks, Ramiro Morales. ........ r5707 | mtredinnick | 2007-07-15 18:08:05 +0800 (Sun, 15 Jul 2007) | 3 lines Re-encoded djangojs.po for French and German locales to UTF-8. These were the last two non-UTF-8 PO files. ........ r5708 | mtredinnick | 2007-07-15 18:10:44 +0800 (Sun, 15 Jul 2007) | 6 lines Fixed #4734 -- Changed message extraction to permit non-ACSII msgid strings. Thanks, krzysiek.pawlik@silvermedia.pl. This is slightly backwards-incompatible for translators: PO files are now assumed to be in UTF-8 encoding. ........ r5709 | adrian | 2007-07-16 03:34:21 +0800 (Mon, 16 Jul 2007) | 1 line Edited docs/db-api.txt changes from [5700] ........ r5710 | adrian | 2007-07-16 05:16:32 +0800 (Mon, 16 Jul 2007) | 1 line Improved docs/templates.txt section on the 'regroup' tag ........ r5711 | mtredinnick | 2007-07-16 11:48:03 +0800 (Mon, 16 Jul 2007) | 2 lines Updated AUTHORS for [5708]. ........ r5712 | mtredinnick | 2007-07-16 11:50:22 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4199 -- Changed date formatting in HTTP expires header to be spec compliant. Thanks, Chris Bennett. ........ r5713 | mtredinnick | 2007-07-16 12:45:45 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4884 -- Fixed an initialisation problem when assigned to settings before accessing them. Thanks, Noam Raphael. ........ r5714 | mtredinnick | 2007-07-16 12:47:52 +0800 (Mon, 16 Jul 2007) | 2 lines Fixed #4806 -- Updated Simplified Chinese translation. Thanks, limodou. ........ r5715 | mtredinnick | 2007-07-16 12:54:49 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4887 -- Fixed another place where template tag arguments are used directly as function keyword args. Thanks, Brian Rosner. ........ r5716 | gwilson | 2007-07-16 13:00:18 +0800 (Mon, 16 Jul 2007) | 2 lines Refs #3012 -- Removed iterator from `test_data_types` cache test that I added in [5703]. Iterators cannot be pickled either. Left the rest of [5703] there though since it fixed another issue that was causing the `test_data_types` cache test to fail with the `locmem` cache backend, the fact that functions cannot be copied. ........ r5717 | gwilson | 2007-07-16 13:28:13 +0800 (Mon, 16 Jul 2007) | 2 lines Cleaned up a couple unused imports and fixed docstrings to follow Python Style Guide. ........ r5718 | mtredinnick | 2007-07-16 17:36:10 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4845 -- Fixed some problems with Unicode usage and caching. Thanks, Jeremy Dunck. ........ r5719 | gwilson | 2007-07-16 21:47:43 +0800 (Mon, 16 Jul 2007) | 2 lines Removed unused variable and changed comments about `permalink` decorator into a docstring. ........ r5720 | gwilson | 2007-07-17 06:29:09 +0800 (Tue, 17 Jul 2007) | 2 lines Fixed #4851 -- Fixed description of an example query in `db-api` docs. ........ r5721 | mtredinnick | 2007-07-17 12:22:11 +0800 (Tue, 17 Jul 2007) | 2 lines Fixed #4898 -- Fixed a precendence problem when constructing HTTP Date header. ........ r5722 | mtredinnick | 2007-07-17 18:25:43 +0800 (Tue, 17 Jul 2007) | 3 lines Fixed #4899 -- Fixed a problem with PO file header generation caused by [5708]. Thanks, Ramiro Morales. ........ r5723 | mtredinnick | 2007-07-19 17:23:45 +0800 (Thu, 19 Jul 2007) | 2 lines Fixed #4917 -- Updated Swedish translation. Thanks, Pilip Lindborg. ........ r5724 | mtredinnick | 2007-07-19 17:24:36 +0800 (Thu, 19 Jul 2007) | 2 lines Fixed #3925 -- Added Slovak localflavor items. Thanks, Martin Kos?\195?\173r. ........ r5725 | adrian | 2007-07-20 14:28:56 +0800 (Fri, 20 Jul 2007) | 1 line Added a db_type() method to the database Field class. This is a hook for calculating the database column type for a given Field. Also converted all management.py CREATE TABLE statements to use db_type(), which made that code cleaner. The Field.get_internal_type() hook still exists, but we should consider removing it at some point, because db_type() is more general. Also added docs -- the beginnings of docs on how to create custom database Field classes. This is backwards-compatible. ........ r5726 | adrian | 2007-07-20 14:34:26 +0800 (Fri, 20 Jul 2007) | 1 line Simplified the indent level in management.py _get_sql_model_create() by using a 'continue' statement rather than nesting everything in an 'if' ........ r5727 | russellm | 2007-07-20 20:07:58 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4558 -- Modified XML serializer to handle whitespace better around None tags. Thanks to Bill Fenner <fenner@gmail.com> for the report and fix. ........ r5728 | russellm | 2007-07-20 20:15:02 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4897 -- Fixed minor typo in doctest comment. ........ r5729 | russellm | 2007-07-20 21:57:49 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #3782 -- Added support for the suite() method recommended by the Python unittest docs. Thanks for the suggestion, rene.puls@repro-mayr.de. ........ r5730 | russellm | 2007-07-20 22:07:54 +0800 (Fri, 20 Jul 2007) | 2 lines Refs #3782 -- Added documentation note that suite() handling is only in development version. ........ r5731 | russellm | 2007-07-20 22:32:20 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4901 -- Modified assertContains to provide a default check of 'any instances of text in content'. Thanks for the suggestion, nis@superlativ.dk. ........ r5732 | russellm | 2007-07-20 22:42:57 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4738 -- Modified the prompt that is displayed when a test database cannot be created. The existing prompt was misleading if the issue wasn't a pre-existing database. Thanks for the suggestion, John Shaffer <jshaffer2112@gmail.com>. ........ r5733 | adrian | 2007-07-20 23:40:54 +0800 (Fri, 20 Jul 2007) | 1 line Fixed negligible typo in docstring in tests/regressiontests/test_client_regress/models.py from [5731] ........ r5736 | adrian | 2007-07-21 05:24:30 +0800 (Sat, 21 Jul 2007) | 1 line Added some additional docs to docs/model-api.txt db_type() section ........ r5738 | russellm | 2007-07-21 11:30:38 +0800 (Sat, 21 Jul 2007) | 2 lines Fixed #4304 -- Modified sys.exit to os._exit to make sure development server quits when an error occurs attempting to bind to the requested port (e.g., if another server is already running). Thanks, Mario Gonzalez <gonzalemario@gmail.com>. ........ r5739 | russellm | 2007-07-21 12:36:28 +0800 (Sat, 21 Jul 2007) | 2 lines Minor fix to allow for count=0 in assertContains. ........ r5740 | russellm | 2007-07-21 13:15:19 +0800 (Sat, 21 Jul 2007) | 2 lines Added test cases for change [5739]. ........ r5741 | russellm | 2007-07-21 13:17:20 +0800 (Sat, 21 Jul 2007) | 2 lines Fixed #4402 -- Modified test client to allow multi-valued inputs on GET requests. Thanks for the suggestion, eddymul@gmail.com. ........ r5743 | gwilson | 2007-07-22 10:18:36 +0800 (Sun, 22 Jul 2007) | 2 lines Fixed #4945 -- Removed unused `GET_ITERATOR_CHUNK_SIZE` definition from manager.py. `GET_ITERATOR_CHUNK_SIZE` is already defined in query.py. Thanks zigiDev@mac.com. ........ r5744 | gwilson | 2007-07-22 11:09:24 +0800 (Sun, 22 Jul 2007) | 2 lines Added docstrings to shortcuts module and functions. ........ r5745 | gwilson | 2007-07-22 11:12:50 +0800 (Sun, 22 Jul 2007) | 2 lines Shortcut functions do not accept `QuerySet` objects, yet :) ........ r5746 | gwilson | 2007-07-22 11:41:11 +0800 (Sun, 22 Jul 2007) | 2 lines Fixed #4373 -- Modified the get_object_or_404/get_list_or_404 shortcuts to also accept `QuerySet`s. Thanks SuperJared. ........ r5747 | gwilson | 2007-07-22 11:45:03 +0800 (Sun, 22 Jul 2007) | 2 lines Corrected typo in [5746]. ........ r5750 | gwilson | 2007-07-23 12:45:01 +0800 (Mon, 23 Jul 2007) | 2 lines Fixed #4952 -- Fixed the `get_template_sources` functions of the `app_directories` and `filesystem` template loaders to not return paths outside of given template directories. Both functions now make use of a new `safe_join` utility function. Thanks to SmileyChris for help with the patch. ........ r5752 | russellm | 2007-07-23 20:14:32 +0800 (Mon, 23 Jul 2007) | 2 lines Fixed #3771 -- Modified the test runner to observe the --noinput argument controlling script interactivity. This means that test scripts can now be put in a buildbot environment. This is a backwards incompatible change for anyone that has written a custom test runner. Thanks for the suggestion, moof@metamoof.net. ........ r5753 | russellm | 2007-07-23 21:52:59 +0800 (Mon, 23 Jul 2007) | 2 lines Added documentation for a test runner argument that has always been present, but was undocumented. ........ r5756 | adrian | 2007-07-25 11:12:31 +0800 (Wed, 25 Jul 2007) | 1 line Changed docstring additions from [5744] to use active verbs ('returns' instead of 'return') ........ r5757 | adrian | 2007-07-25 11:15:05 +0800 (Wed, 25 Jul 2007) | 1 line Added 'New in Django development version' to docs/db-api.txt change from [5746] ........ r5758 | adrian | 2007-07-25 11:18:17 +0800 (Wed, 25 Jul 2007) | 1 line Changed safe_join() docstring from [5750] to use active verbs. See also [5756] ........ r5764 | gwilson | 2007-07-26 13:01:53 +0800 (Thu, 26 Jul 2007) | 2 lines Fixed #4971 -- Fixed some escaping and quoting problems in the databrowse contrib app. Based on patch from Johann Queuniet. ........ r5765 | adrian | 2007-07-27 01:16:34 +0800 (Fri, 27 Jul 2007) | 1 line Added section to docs/contributing.txt about docstring coding style ........ r5766 | mtredinnick | 2007-07-27 06:59:34 +0800 (Fri, 27 Jul 2007) | 2 lines Added support for database cache table in test database. ........ r5767 | adrian | 2007-07-28 05:53:02 +0800 (Sat, 28 Jul 2007) | 1 line Added unit test that confirms a bug in ValuesQuerySets that have extra(select) specified. If the select dictionary has several fields, Django assigns the wrong values to the select-field names ........ r5768 | adrian | 2007-07-28 06:07:42 +0800 (Sat, 28 Jul 2007) | 1 line Fixed bug with using values() and extra(select) in the same QuerySet, with a select dictionary containing more than a few elements. This bug was identified in unit test from [5767]. The problem was that we were relying on the dictionary's .items() ordering, which is undefined ........ r5769 | russellm | 2007-07-28 12:02:52 +0800 (Sat, 28 Jul 2007) | 2 lines Fixed #4460 -- Added the ability to be more specific in the test cases that are executed. This is a backwards incompatible change for any user with a custom test runner. See the wiki for details. ........ r5770 | russellm | 2007-07-28 15:27:53 +0800 (Sat, 28 Jul 2007) | 2 lines Fixed #4995 -- Fixed some problems in documentation ReST formatting. Thanks, Simon G. ........ r5771 | simon | 2007-07-29 02:30:40 +0800 (Sun, 29 Jul 2007) | 1 line After discussing with Malcolm, added set_unusable_password() and has_usable_password() methods to the User object, plus tests and updated documentation ........ r5774 | adrian | 2007-07-30 02:21:16 +0800 (Mon, 30 Jul 2007) | 1 line Added 'New in Django development version' to changes in docs/authentication.txt from [5771] ........ r5778 | gwilson | 2007-07-31 01:25:35 +0800 (Tue, 31 Jul 2007) | 4 lines Fixed call to `ugettext`, which is imported as `_`. Changed raise to conform to PEP 3109 and wrapped the long line. Added beginnings of tests for model fields. ........ r5782 | gwilson | 2007-08-01 13:41:32 +0800 (Wed, 01 Aug 2007) | 2 lines Fixed #4228 -- Removed hardcoding of `RadioFieldRenderer` in the `RadioSelect` Widget so that the display of `RadioSelect`s can be more easily customized. `BoundField.__unicode__` also no longer special cases `RadioSelect` since `RadioSelect.render()` now returns a string like every other Widget. ........ r5783 | gwilson | 2007-08-01 13:52:18 +0800 (Wed, 01 Aug 2007) | 2 lines Fixed #5037 -- Fixed use of wrong field type in a db-api docs example, thanks ubernostrum. ........ r5796 | gwilson | 2007-08-04 11:19:14 +0800 (Sat, 04 Aug 2007) | 2 lines Fixed #5078 -- Fixed several broken links to the syndication documentation. ........ r5797 | gwilson | 2007-08-04 11:36:58 +0800 (Sat, 04 Aug 2007) | 2 lines Changed the 0.95 release notes to point to the 0.95 documentation index. ........ r5798 | gwilson | 2007-08-04 11:39:24 +0800 (Sat, 04 Aug 2007) | 2 lines Changed several documentation links to be relative. ........ r5799 | gwilson | 2007-08-04 22:41:49 +0800 (Sat, 04 Aug 2007) | 2 lines Refs #3397 -- Corrected the Exception that is caught when ordering by non-fields (added in [4596]), thanks glin@seznam.cz. ........ r5800 | gwilson | 2007-08-04 22:52:13 +0800 (Sat, 04 Aug 2007) | 2 lines Fixed #5083 -- Fixed typo in newforms documentation, thanks Rik. ........ r5801 | gwilson | 2007-08-05 12:39:52 +0800 (Sun, 05 Aug 2007) | 2 lines Refs #5089 -- Added file name to poll detail template examples in the tutorial. ........ r5802 | gwilson | 2007-08-05 12:42:26 +0800 (Sun, 05 Aug 2007) | 2 lines Changed some more links to be relative in the documentation. I had a couple unsaved files that didn't get in with [5798]. ........ r5803 | gwilson | 2007-08-05 13:14:46 +0800 (Sun, 05 Aug 2007) | 2 lines Fixed #2101 -- Renamed `maxlength` argument to `max_length` for oldforms `FormField`s and db model `Field`s. This is fully backwards compatible at the moment since the legacy `maxlength` argument is still supported. Using `maxlength` will, however, issue a `PendingDeprecationWarning` when used. ........ r5804 | russellm | 2007-08-05 15:39:36 +0800 (Sun, 05 Aug 2007) | 2 lines Fixed #4001 -- Added dynamic save_m2m method() to forms created with form_for_model and form_for_instance on save(commit=False). ........ r5807 | adrian | 2007-08-06 12:36:43 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5074 -- Added link to audio clip of 'Django' pronunciation ........ r5808 | adrian | 2007-08-06 12:52:14 +0800 (Mon, 06 Aug 2007) | 1 line Edited docs/newforms.txt changes from [5804] ........ r5809 | adrian | 2007-08-06 13:04:27 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5082 -- Enabled tab completion in 'django-admin.py shell' for objects that were imported into the global namespace at runtime. Thanks, dusk@woofle.net ........ r5810 | adrian | 2007-08-06 13:06:15 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5077 -- django/utils/encoding.py no longer imports settings, as it doesn't use that module. Thanks, Collin Grady ........ r5811 | adrian | 2007-08-06 13:07:38 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5071 -- Fixed 'global name ugettext is not defined' error in django.core.validators. Thanks, Marco Bonetti ........ r5812 | adrian | 2007-08-06 13:13:06 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5064 -- Fixed potentially confusing sentence in docs/authentication.txt. Thanks, Collin Grady ........ r5813 | adrian | 2007-08-06 13:16:35 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5053 -- Added 'action' attribute to <form> tags that didn't have that attribute in docs/newforms.txt examples. Perfectionism appreciated, trickyb ........ r5814 | adrian | 2007-08-06 13:27:58 +0800 (Mon, 06 Aug 2007) | 1 line Added a closing </p>' to a code example in docs/email.txt ........ r5815 | adrian | 2007-08-06 13:28:45 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5006 -- Fixed incorrect/outdated docstring for the 'if' template tag. Thanks, Thomas Petazzoni ........ r5816 | adrian | 2007-08-06 13:33:18 +0800 (Mon, 06 Aug 2007) | 1 line Added note to docs/model-api.txt about help_text not being escaped in the admin interface ........ r5817 | adrian | 2007-08-06 13:34:45 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #4985 -- Clarified location of HttpResponse in docs/request_response.txt. Thanks for raising the issue, rainer.mansfeld@romulo.de ........ r5818 | adrian | 2007-08-06 13:37:17 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #4980 -- Removed 'forms' from the 'not considered stable and will be rewritten' section of docs/api_stability.txt. They've already been rewritten. ........ r5819 | russellm | 2007-08-06 21:58:56 +0800 (Mon, 06 Aug 2007) | 2 lines Fixed #3297 -- Implemented FileField and ImageField for newforms. Thanks to the many users that contributed to and tested this patch. ........ r5820 | russellm | 2007-08-06 22:17:10 +0800 (Mon, 06 Aug 2007) | 2 lines Added note that FileField and ImageField are only in development version. There are also some minor backwards compatibility issues with the changes introduced in [5819] - see the wiki for details. ........ r5823 | adrian | 2007-08-07 04:27:04 +0800 (Tue, 07 Aug 2007) | 1 line Fixed British spelling of 'customize' and 'behavior' in Manager.get_query_set() docstring ........ r5824 | adrian | 2007-08-07 10:18:36 +0800 (Tue, 07 Aug 2007) | 1 line Fixed #5105 -- Fixed two ReST errors in docs/newforms.txt. Thanks, Ramiro Morales ........ r5825 | adrian | 2007-08-07 10:33:11 +0800 (Tue, 07 Aug 2007) | 1 line Fixed #5097 -- Made various updates and corrections to the documentation. Thanks, Nicola Larosa ........ r5826 | russellm | 2007-08-07 19:20:15 +0800 (Tue, 07 Aug 2007) | 2 lines Removed a redundant directory join during FileField form saving. Thanks to David Danier's eagle eyes for picking up this one. ........ git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@5828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
599 lines
23 KiB
Plaintext
599 lines
23 KiB
Plaintext
=====================================
|
|
Writing your first Django app, part 1
|
|
=====================================
|
|
|
|
Let's learn by example.
|
|
|
|
Throughout this tutorial, we'll walk you through the creation of a basic
|
|
poll application.
|
|
|
|
It'll consist of two parts:
|
|
|
|
* A public site that lets people view polls and vote in them.
|
|
* An admin site that lets you add, change and delete polls.
|
|
|
|
We'll assume you have `Django installed`_ already. You can tell Django is
|
|
installed by running the Python interactive interpreter and typing
|
|
``import django``. If that command runs successfully, with no errors, Django is
|
|
installed.
|
|
|
|
.. _`Django installed`: ../install/
|
|
|
|
.. admonition:: Where to get help:
|
|
|
|
If you're having trouble going through this tutorial, please post a message
|
|
to `django-users`_ or drop by `#django`_ on ``irc.freenode.net`` and we'll
|
|
try to help.
|
|
|
|
.. _django-users: http://groups.google.com/group/django-users
|
|
.. _#django: irc://irc.freenode.net/django
|
|
|
|
Creating a project
|
|
==================
|
|
|
|
If this is your first time using Django, you'll have to take care of some
|
|
initial setup. Namely, you'll need to auto-generate some code that establishes
|
|
a Django *project* -- a collection of settings for an instance of Django,
|
|
including database configuration, Django-specific options and
|
|
application-specific settings.
|
|
|
|
From the command line, ``cd`` into a directory where you'd like to store your
|
|
code, then run the command ``django-admin.py startproject mysite``. This
|
|
will create a ``mysite`` directory in your current directory.
|
|
|
|
.. note::
|
|
|
|
You'll need to avoid naming projects after built-in Python or Django
|
|
components. In particular, this means you should avoid using names like
|
|
``django`` (which will conflict with Django itself) or ``site`` (which
|
|
conflicts with a built-in Python package).
|
|
|
|
(``django-admin.py`` should be on your system path if you installed Django via
|
|
``python setup.py``. If it's not on your path, you can find it in
|
|
``site-packages/django/bin``, where ``site-packages`` is a directory within
|
|
your Python installation. Consider symlinking to ``django-admin.py`` from some
|
|
place on your path, such as ``/usr/local/bin``.)
|
|
|
|
.. admonition:: Where should this code live?
|
|
|
|
If your background is in PHP, you're probably used to putting code under the
|
|
Web server's document root (in a place such as ``/var/www``). With Django,
|
|
you don't do that. It's not a good idea to put any of this Python code within
|
|
your Web server's document root, because it risks the possibility that
|
|
people may be able to view your code over the Web. That's not good for
|
|
security.
|
|
|
|
Put your code in some directory **outside** of the document root, such as
|
|
``/home/mycode``.
|
|
|
|
Let's look at what ``startproject`` created::
|
|
|
|
mysite/
|
|
__init__.py
|
|
manage.py
|
|
settings.py
|
|
urls.py
|
|
|
|
These files are:
|
|
|
|
* ``__init__.py``: An empty file that tells Python that this directory
|
|
should be considered a Python package. (Read `more about packages`_ in the
|
|
official Python docs if you're a Python beginner.)
|
|
* ``manage.py``: A command-line utility that lets you interact with this
|
|
Django project in various ways.
|
|
* ``settings.py``: Settings/configuration for this Django project.
|
|
* ``urls.py``: The URL declarations for this Django project; a "table of
|
|
contents" of your Django-powered site.
|
|
|
|
.. _more about packages: http://docs.python.org/tut/node8.html#packages
|
|
|
|
The development server
|
|
----------------------
|
|
|
|
Let's verify this worked. Change into the ``mysite`` directory, if you
|
|
haven't already, and run the command ``python manage.py runserver``. You'll see
|
|
the following output on the command line::
|
|
|
|
Validating models...
|
|
0 errors found.
|
|
|
|
Django version 0.95, using settings 'mysite.settings'
|
|
Development server is running at http://127.0.0.1:8000/
|
|
Quit the server with CONTROL-C (Unix) or CTRL-BREAK (Windows).
|
|
|
|
You've started the Django development server, a lightweight Web server written
|
|
purely in Python. We've included this with Django so you can develop things
|
|
rapidly, without having to deal with configuring a production server -- such as
|
|
Apache -- until you're ready for production.
|
|
|
|
Now's a good time to note: DON'T use this server in anything resembling a
|
|
production environment. It's intended only for use while developing. (We're in
|
|
the business of making Web frameworks, not Web servers.)
|
|
|
|
Now that the server's running, visit http://127.0.0.1:8000/ with your Web
|
|
browser. You'll see a "Welcome to Django" page, in pleasant, light-blue pastel.
|
|
It worked!
|
|
|
|
.. admonition:: Changing the port
|
|
|
|
By default, the ``runserver`` command starts the development server on port
|
|
8000. If you want to change the server's port, pass it as a command-line
|
|
argument. For instance, this command starts the server on port 8080::
|
|
|
|
python manage.py runserver 8080
|
|
|
|
Full docs for the development server are at `django-admin documentation`_.
|
|
|
|
.. _django-admin documentation: ../django-admin/
|
|
|
|
Database setup
|
|
--------------
|
|
|
|
Now, edit ``settings.py``. It's a normal Python module with module-level
|
|
variables representing Django settings. Change these settings to match your
|
|
database's connection parameters:
|
|
|
|
* ``DATABASE_ENGINE`` -- Either 'postgresql_psycopg2', 'mysql' or 'sqlite3'.
|
|
Other backends are `also available`_.
|
|
* ``DATABASE_NAME`` -- The name of your database, or the full (absolute)
|
|
path to the database file if you're using SQLite.
|
|
* ``DATABASE_USER`` -- Your database username (not used for SQLite).
|
|
* ``DATABASE_PASSWORD`` -- Your database password (not used for SQLite).
|
|
* ``DATABASE_HOST`` -- The host your database is on. Leave this as an
|
|
empty string if your database server is on the same physical machine
|
|
(not used for SQLite).
|
|
|
|
.. _also available: ../settings/
|
|
|
|
.. admonition:: Note
|
|
|
|
If you're using PostgreSQL or MySQL, make sure you've created a database by
|
|
this point. Do that with "``CREATE DATABASE database_name;``" within your
|
|
database's interactive prompt.
|
|
|
|
While you're editing ``settings.py``, take note of the ``INSTALLED_APPS``
|
|
setting towards the bottom of the file. That variable holds the names of all
|
|
Django applications that are activated in this Django instance. Apps can be
|
|
used in multiple projects, and you can package and distribute them for use
|
|
by others in their projects.
|
|
|
|
By default, ``INSTALLED_APPS`` contains the following apps, all of which come
|
|
with Django:
|
|
|
|
* ``django.contrib.auth`` -- An authentication system.
|
|
* ``django.contrib.contenttypes`` -- A framework for content types.
|
|
* ``django.contrib.sessions`` -- A session framework.
|
|
* ``django.contrib.sites`` -- A framework for managing multiple sites
|
|
with one Django installation.
|
|
|
|
These applications are included by default as a convenience for the common
|
|
case.
|
|
|
|
Each of these applications makes use of at least one database table, though,
|
|
so we need to create the tables in the database before we can use them. To do
|
|
that, run the following command::
|
|
|
|
python manage.py syncdb
|
|
|
|
The ``syncdb`` command looks at the ``INSTALLED_APPS`` setting and creates any
|
|
necessary database tables according to the database settings in your
|
|
``settings.py`` file. You'll see a message for each database table it creates,
|
|
and you'll get a prompt asking you if you'd like to create a superuser account
|
|
for the authentication system. Go ahead and do that.
|
|
|
|
If you're interested, run the command-line client for your database and type
|
|
``\dt`` (PostgreSQL), ``SHOW TABLES;`` (MySQL), or ``.schema`` (SQLite) to
|
|
display the tables Django created.
|
|
|
|
.. admonition:: For the minimalists
|
|
|
|
Like we said above, the default applications are included for the common
|
|
case, but not everybody needs them. If you don't need any or all of them,
|
|
feel free to comment-out or delete the appropriate line(s) from
|
|
``INSTALLED_APPS`` before running ``syncdb``. The ``syncdb`` command will
|
|
only create tables for apps in ``INSTALLED_APPS``.
|
|
|
|
Creating models
|
|
===============
|
|
|
|
Now that your environment -- a "project" -- is set up, you're set to start
|
|
doing work.
|
|
|
|
Each application you write in Django consists of a Python package, somewhere
|
|
on your `Python path`_, that follows a certain convention. Django comes with a
|
|
utility that automatically generates the basic directory structure of an app,
|
|
so you can focus on writing code rather than creating directories.
|
|
|
|
.. admonition:: Projects vs. apps
|
|
|
|
What's the difference between a project and an app? An app is a Web
|
|
application that does something -- e.g., a weblog system, a database of
|
|
public records or a simple poll app. A project is a collection of
|
|
configuration and apps for a particular Web site. A project can contain
|
|
multiple apps. An app can be in multiple projects.
|
|
|
|
In this tutorial, we'll create our poll app in the ``mysite`` directory,
|
|
for simplicity. As a consequence, the app will be coupled to the project --
|
|
that is, Python code within the poll app will refer to ``mysite.polls``.
|
|
Later in this tutorial, we'll discuss decoupling your apps for distribution.
|
|
|
|
To create your app, make sure you're in the ``mysite`` directory and type
|
|
this command::
|
|
|
|
python manage.py startapp polls
|
|
|
|
That'll create a directory ``polls``, which is laid out like this::
|
|
|
|
polls/
|
|
__init__.py
|
|
models.py
|
|
views.py
|
|
|
|
This directory structure will house the poll application.
|
|
|
|
The first step in writing a database Web app in Django is to define your models
|
|
-- essentially, your database layout, with additional metadata.
|
|
|
|
.. admonition:: Philosophy
|
|
|
|
A model is the single, definitive source of data about your
|
|
data. It contains the essential fields and behaviors of the data you're
|
|
storing. Django follows the `DRY Principle`_. The goal is to define your
|
|
data model in one place and automatically derive things from it.
|
|
|
|
In our simple poll app, we'll create two models: polls and choices. A poll has
|
|
a question and a publication date. A choice has two fields: the text of the
|
|
choice and a vote tally. Each choice is associated with a poll.
|
|
|
|
These concepts are represented by simple Python classes. Edit the
|
|
``polls/models.py`` file so it looks like this::
|
|
|
|
from django.db import models
|
|
|
|
class Poll(models.Model):
|
|
question = models.CharField(max_length=200)
|
|
pub_date = models.DateTimeField('date published')
|
|
|
|
class Choice(models.Model):
|
|
poll = models.ForeignKey(Poll)
|
|
choice = models.CharField(max_length=200)
|
|
votes = models.IntegerField()
|
|
|
|
The code is straightforward. Each model is represented by a class that
|
|
subclasses ``django.db.models.Model``. Each model has a number of class
|
|
variables, each of which represents a database field in the model.
|
|
|
|
Each field is represented by an instance of a ``models.*Field`` class -- e.g.,
|
|
``models.CharField`` for character fields and ``models.DateTimeField`` for
|
|
datetimes. This tells Django what type of data each field holds.
|
|
|
|
The name of each ``models.*Field`` instance (e.g. ``question`` or ``pub_date`` )
|
|
is the field's name, in machine-friendly format. You'll use this value in your
|
|
Python code, and your database will use it as the column name.
|
|
|
|
You can use an optional first positional argument to a ``Field`` to designate a
|
|
human-readable name. That's used in a couple of introspective parts of Django,
|
|
and it doubles as documentation. If this field isn't provided, Django will use
|
|
the machine-readable name. In this example, we've only defined a human-readable
|
|
name for ``Poll.pub_date``. For all other fields in this model, the field's
|
|
machine-readable name will suffice as its human-readable name.
|
|
|
|
Some ``Field`` classes have required elements. ``CharField``, for example,
|
|
requires that you give it a ``max_length``. That's used not only in the database
|
|
schema, but in validation, as we'll soon see.
|
|
|
|
Finally, note a relationship is defined, using ``models.ForeignKey``. That tells
|
|
Django each Choice is related to a single Poll. Django supports all the common
|
|
database relationships: many-to-ones, many-to-manys and one-to-ones.
|
|
|
|
.. _`Python path`: http://docs.python.org/tut/node8.html#SECTION008110000000000000000
|
|
.. _DRY Principle: http://c2.com/cgi/wiki?DontRepeatYourself
|
|
|
|
Activating models
|
|
=================
|
|
|
|
That small bit of model code gives Django a lot of information. With it, Django
|
|
is able to:
|
|
|
|
* Create a database schema (``CREATE TABLE`` statements) for this app.
|
|
* Create a Python database-access API for accessing Poll and Choice objects.
|
|
|
|
But first we need to tell our project that the ``polls`` app is installed.
|
|
|
|
.. admonition:: Philosophy
|
|
|
|
Django apps are "pluggable": You can use an app in multiple projects, and
|
|
you can distribute apps, because they don't have to be tied to a given
|
|
Django installation.
|
|
|
|
Edit the ``settings.py`` file again, and change the ``INSTALLED_APPS`` setting
|
|
to include the string ``'mysite.polls'``. So it'll look like this::
|
|
|
|
INSTALLED_APPS = (
|
|
'django.contrib.auth',
|
|
'django.contrib.contenttypes',
|
|
'django.contrib.sessions',
|
|
'django.contrib.sites',
|
|
'mysite.polls'
|
|
)
|
|
|
|
Now Django knows ``mysite`` includes the ``polls`` app. Let's run another command::
|
|
|
|
python manage.py sql polls
|
|
|
|
You should see something similar to the following (the CREATE TABLE SQL statements
|
|
for the polls app)::
|
|
|
|
BEGIN;
|
|
CREATE TABLE "polls_poll" (
|
|
"id" serial NOT NULL PRIMARY KEY,
|
|
"question" varchar(200) NOT NULL,
|
|
"pub_date" timestamp with time zone NOT NULL
|
|
);
|
|
CREATE TABLE "polls_choice" (
|
|
"id" serial NOT NULL PRIMARY KEY,
|
|
"poll_id" integer NOT NULL REFERENCES "polls_poll" ("id"),
|
|
"choice" varchar(200) NOT NULL,
|
|
"votes" integer NOT NULL
|
|
);
|
|
COMMIT;
|
|
|
|
Note the following:
|
|
|
|
* The exact output will vary depending on the database you are using.
|
|
|
|
* Table names are automatically generated by combining the name of the app
|
|
(``polls``) and the lowercase name of the model -- ``poll`` and
|
|
``choice``. (You can override this behavior.)
|
|
|
|
* Primary keys (IDs) are added automatically. (You can override this, too.)
|
|
|
|
* By convention, Django appends ``"_id"`` to the foreign key field name.
|
|
Yes, you can override this, as well.
|
|
|
|
* The foreign key relationship is made explicit by a ``REFERENCES`` statement.
|
|
|
|
* It's tailored to the database you're using, so database-specific field
|
|
types such as ``auto_increment`` (MySQL), ``serial`` (PostgreSQL), or
|
|
``integer primary key`` (SQLite) are handled for you automatically. Same
|
|
goes for quoting of field names -- e.g., using double quotes or single
|
|
quotes. The author of this tutorial runs PostgreSQL, so the example
|
|
output is in PostgreSQL syntax.
|
|
|
|
* The ``sql`` command doesn't actually run the SQL in your database - it just
|
|
prints it to the screen so that you can see what SQL Django thinks is required.
|
|
If you wanted to, you could copy and paste this SQL into your database prompt.
|
|
However, as we will see shortly, Django provides an easier way of committing
|
|
the SQL to the database.
|
|
|
|
If you're interested, also run the following commands:
|
|
* ``python manage.py validate polls`` -- Checks for any errors in the
|
|
construction of your models.
|
|
|
|
* ``python manage.py sqlcustom polls`` -- Outputs any custom SQL statements
|
|
(such as table modifications or constraints) that are defined for the
|
|
application.
|
|
|
|
* ``python manage.py sqlclear polls`` -- Outputs the necessary ``DROP
|
|
TABLE`` statements for this app, according to which tables already exist
|
|
in your database (if any).
|
|
|
|
* ``python manage.py sqlindexes polls`` -- Outputs the ``CREATE INDEX``
|
|
statements for this app.
|
|
|
|
* ``python manage.py sqlall polls`` -- A combination of all the SQL from
|
|
the 'sql', 'sqlcustom', and 'sqlindexes' commands.
|
|
|
|
Looking at the output of those commands can help you understand what's actually
|
|
happening under the hood.
|
|
|
|
Now, run ``syncdb`` again to create those model tables in your database::
|
|
|
|
python manage.py syncdb
|
|
|
|
The ``syncdb`` command runs the sql from 'sqlall' on your database for all apps
|
|
in ``INSTALLED_APPS`` that don't already exist in your database. This creates
|
|
all the tables, initial data and indexes for any apps you have added to your
|
|
project since the last time you ran syncdb. ``syncdb`` can be called as often
|
|
as you like, and it will only ever create the tables that don't exist.
|
|
|
|
Read the `django-admin.py documentation`_ for full information on what the
|
|
``manage.py`` utility can do.
|
|
|
|
.. _django-admin.py documentation: ../django-admin/
|
|
|
|
Playing with the API
|
|
====================
|
|
|
|
Now, let's hop into the interactive Python shell and play around with the free
|
|
API Django gives you. To invoke the Python shell, use this command::
|
|
|
|
python manage.py shell
|
|
|
|
We're using this instead of simply typing "python", because ``manage.py`` sets
|
|
up the project's environment for you. "Setting up the environment" involves two
|
|
things:
|
|
|
|
* Putting ``mysite`` on ``sys.path``. For flexibility, several pieces of
|
|
Django refer to projects in Python dotted-path notation (e.g.
|
|
``'mysite.polls.models'``). In order for this to work, the
|
|
``mysite`` package has to be on ``sys.path``.
|
|
|
|
We've already seen one example of this: the ``INSTALLED_APPS`` setting is
|
|
a list of packages in dotted-path notation.
|
|
|
|
* Setting the ``DJANGO_SETTINGS_MODULE`` environment variable, which gives
|
|
Django the path to your ``settings.py`` file.
|
|
|
|
.. admonition:: Bypassing manage.py
|
|
|
|
If you'd rather not use ``manage.py``, no problem. Just make sure
|
|
``mysite`` is at the root level on the Python path (i.e.,
|
|
``import mysite`` works) and set the ``DJANGO_SETTINGS_MODULE``
|
|
environment variable to ``mysite.settings``.
|
|
|
|
For more information on all of this, see the `django-admin.py documentation`_.
|
|
|
|
Once you're in the shell, explore the database API::
|
|
|
|
# Import the model classes we just wrote.
|
|
>>> from mysite.polls.models import Poll, Choice
|
|
|
|
# No polls are in the system yet.
|
|
>>> Poll.objects.all()
|
|
[]
|
|
|
|
# Create a new Poll.
|
|
>>> from datetime import datetime
|
|
>>> p = Poll(question="What's up?", pub_date=datetime.now())
|
|
|
|
# Save the object into the database. You have to call save() explicitly.
|
|
>>> p.save()
|
|
|
|
# Now it has an ID. Note that this might say "1L" instead of "1", depending
|
|
# on which database you're using. That's no biggie; it just means your
|
|
# database backend prefers to return integers as Python long integer
|
|
# objects.
|
|
>>> p.id
|
|
1
|
|
|
|
# Access database columns via Python attributes.
|
|
>>> p.question
|
|
"What's up?"
|
|
>>> p.pub_date
|
|
datetime.datetime(2007, 7, 15, 12, 00, 53)
|
|
|
|
# Change values by changing the attributes, then calling save().
|
|
>>> p.pub_date = datetime(2007, 4, 1, 0, 0)
|
|
>>> p.save()
|
|
|
|
# objects.all() displays all the polls in the database.
|
|
>>> Poll.objects.all()
|
|
[<Poll: Poll object>]
|
|
|
|
|
|
Wait a minute. ``<Poll: Poll object>`` is, utterly, an unhelpful
|
|
representation of this object. Let's fix that by editing the polls model (in
|
|
the ``polls/models.py`` file) and adding a ``__unicode__()`` method to both
|
|
``Poll`` and ``Choice``::
|
|
|
|
class Poll(models.Model):
|
|
# ...
|
|
def __unicode__(self):
|
|
return self.question
|
|
|
|
class Choice(models.Model):
|
|
# ...
|
|
def __unicode__(self):
|
|
return self.choice
|
|
|
|
It's important to add ``__unicode__()`` methods to your models, 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.
|
|
|
|
.. admonition:: Why ``__unicode__()`` and not ``__str__()``?
|
|
|
|
If you're familiar with Python, you might be in the habit of adding
|
|
``__str__()`` methods to your classes, not ``__unicode__()`` methods.
|
|
We use ``__unicode__()`` here because Django models deal with Unicode by
|
|
default. All data stored in your database is converted to Unicode when it's
|
|
returned.
|
|
|
|
Django models have a default ``__str__()`` method that calls
|
|
``__unicode__()`` and converts the result to a UTF-8 bytestring. This means
|
|
that ``unicode(p)`` will return a Unicode string, and ``str(p)`` will return
|
|
a normal string, with characters encoded as UTF-8.
|
|
|
|
If all of this is jibberish to you, just remember to add ``__unicode__()``
|
|
methods to your models. With any luck, things should Just Work for you.
|
|
|
|
Note these are normal Python methods. Let's add a custom method, just for
|
|
demonstration::
|
|
|
|
import datetime
|
|
# ...
|
|
class Poll(models.Model):
|
|
# ...
|
|
def was_published_today(self):
|
|
return self.pub_date.date() == datetime.date.today()
|
|
|
|
Note the addition of ``import datetime`` to reference Python's standard
|
|
``datetime`` module.
|
|
|
|
Let's jump back into the Python interactive shell by running
|
|
``python manage.py shell`` again::
|
|
|
|
>>> from mysite.polls.models import Poll, Choice
|
|
|
|
# Make sure our __unicode__() addition worked.
|
|
>>> Poll.objects.all()
|
|
[<Poll: What's up?>]
|
|
|
|
# Django provides a rich database lookup API that's entirely driven by
|
|
# keyword arguments.
|
|
>>> Poll.objects.filter(id=1)
|
|
[<Poll: What's up?>]
|
|
>>> Poll.objects.filter(question__startswith='What')
|
|
[<Poll: What's up?>]
|
|
|
|
# Get the poll whose year is 2007. Of course, if you're going through this
|
|
# tutorial in another year, change as appropriate.
|
|
>>> Poll.objects.get(pub_date__year=2007)
|
|
<Poll: What's up?>
|
|
|
|
>>> Poll.objects.get(id=2)
|
|
Traceback (most recent call last):
|
|
...
|
|
DoesNotExist: Poll matching query does not exist.
|
|
|
|
# Lookup by a primary key is the most common case, so Django provides a
|
|
# shortcut for primary-key exact lookups.
|
|
# The following is identical to Poll.objects.get(id=1).
|
|
>>> Poll.objects.get(pk=1)
|
|
<Poll: What's up?>
|
|
|
|
# Make sure our custom method worked.
|
|
>>> p = Poll.objects.get(pk=1)
|
|
>>> p.was_published_today()
|
|
False
|
|
|
|
# Give the Poll a couple of Choices. The create call constructs a new
|
|
# choice object, does the INSERT statement, adds the choice to the set
|
|
# of available choices and returns the new Choice object.
|
|
>>> p = Poll.objects.get(pk=1)
|
|
>>> p.choice_set.create(choice='Not much', votes=0)
|
|
<Choice: Not much>
|
|
>>> p.choice_set.create(choice='The sky', votes=0)
|
|
<Choice: The sky>
|
|
>>> c = p.choice_set.create(choice='Just hacking again', votes=0)
|
|
|
|
# Choice objects have API access to their related Poll objects.
|
|
>>> c.poll
|
|
<Poll: What's up?>
|
|
|
|
# And vice versa: Poll objects get access to Choice objects.
|
|
>>> p.choice_set.all()
|
|
[<Choice: Not much>, <Choice: The sky>, <Choice: Just hacking again>]
|
|
>>> p.choice_set.count()
|
|
3
|
|
|
|
# The API automatically follows relationships as far as you need.
|
|
# Use double underscores to separate relationships.
|
|
# This works as many levels deep as you want; there's no limit.
|
|
# Find all Choices for any poll whose pub_date is in 2007.
|
|
>>> Choice.objects.filter(poll__pub_date__year=2007)
|
|
[<Choice: Not much>, <Choice: The sky>, <Choice: Just hacking again>]
|
|
|
|
# Let's delete one of the choices. Use delete() for that.
|
|
>>> c = p.choice_set.filter(choice__startswith='Just hacking')
|
|
>>> c.delete()
|
|
|
|
For full details on the database API, see our `Database API reference`_.
|
|
|
|
When you're comfortable with the API, read `part 2 of this tutorial`_ to get
|
|
Django's automatic admin working.
|
|
|
|
.. _Database API reference: ../db-api/
|
|
.. _part 2 of this tutorial: ../tutorial02/
|