Commit Graph

134 Commits

Author SHA1 Message Date
Malcolm Tredinnick 75a8a32f86 Fixed #2181 -- allow '{' and '}' to be escaped via {% templatetag ... %}.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-18 04:12:55 +00:00
Jacob Kaplan-Moss bca5327b21 Added generic foreign key support to Django. Much thanks to Ian Holsman and
Luke Plant -- most of this code is theirs.  Documentation is to follow; for now
see the example/unit test.  Fixes #529.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3134 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-16 19:18:30 +00:00
Jacob Kaplan-Moss 174e334d92 Test harness actually now installs contrib apps so they can be used in tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-16 18:58:45 +00:00
Malcolm Tredinnick 28e643743f Fixed #2164 -- Create correct SQL when pk column name is not the same as the
attribute name. Thanks, Russell Cloran.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-15 11:28:28 +00:00
Malcolm Tredinnick 686c5a2f88 Fixed the empty model saving case so that it retrieves the primary key id. Also
updated the tests to test this case.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-12 12:49:14 +00:00
Malcolm Tredinnick 4fc6e51706 Tests to avoid regressions for ticket #2108. See also r3115.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3116 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 15:15:27 +00:00
Adrian Holovaty 2abfd5dd58 Fixed #2109 -- Convert old-style classes to new-style classes throughout Django. Thanks, Nicola Larosa
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 05:00:13 +00:00
Adrian Holovaty 5edd1335b2 Added django.template.Token.split_contents() and used it to add support for strings with spaces in {% ifchanged %}
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3112 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 04:29:10 +00:00
Adrian Holovaty e5cd46d6d1 Fixed #2026 -- Added support for 'and' in template 'if' tags, added dozens of unit tests and updated docs. Thanks, ckknight
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 03:33:21 +00:00
Malcolm Tredinnick 89920e058f Fixed #2108 -- do not try to save an empty model.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3104 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 00:13:52 +00:00
Malcolm Tredinnick 58ab678d35 Fix test output as a result of the change in r3094.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3103 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-07 09:19:43 +00:00
Adrian Holovaty b3a6348bc2 Added Manager.get_or_create()
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3092 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-07 00:09:29 +00:00
Adrian Holovaty a5b7c29816 Changed all model unit tests to use __str__() instead of __repr__(). Also slightly changed related-object DoesNotExist exception message to use repr instead of str
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3075 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-04 00:23:51 +00:00
Adrian Holovaty 55e453a09c Changed 'transactions' model unit test NOT to be executed for MySQL
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3074 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-03 23:45:49 +00:00
Adrian Holovaty 142e59b462 Fixed #2077 -- Renamed 'repr' model tests to 'str'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-03 22:14:04 +00:00
Adrian Holovaty 8ac9bb7ddf Fixed unit-test output error in m2m_and_m2o unit tests, due to a change in the model's __repr__ earlier today
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3041 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-01 04:30:39 +00:00
Adrian Holovaty cb9cb2045b Fixed #720 -- Added first_on_page() and last_on_page() methods to ObjectPaginator. Thanks, m@bagai.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-01 04:29:39 +00:00
Adrian Holovaty 02fcfe6216 Cleaned up numbering with model unit tests
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3031 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-31 19:23:07 +00:00
Adrian Holovaty a846155118 Small formatting changes to model unit tests to make them look better in the model examples online
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-31 19:10:43 +00:00
Adrian Holovaty 3daae59aab Added blurbs to the model unit tests that didn't have them
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3028 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-31 18:45:17 +00:00
Luke Plant 60c3e55b1f Fixed bug with QuerySet.exclude() failing to do negations on Q objects, and
at the same time generalised exclude/QNot so that they work for 'external'
Q objects i.e. ones that simply have 'get_sql' defined.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@2997 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-26 23:41:43 +00:00
Jacob Kaplan-Moss c3baf4668f Django's tests now include models from django.contrib; this will allow testing against those models.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-26 21:28:12 +00:00
Luke Plant 0c8ac0972c Made negative indexing on QuerySet instances raise an assertion error (previously
it just returned incorrect results).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@2992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-26 18:41:03 +00:00
Luke Plant a666b98783 Fixed bug with Meta.ordering being ignored when slicing a single item off a QuerySet. Thanks, Gábor Fawkes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-23 19:55:30 +00:00
Jacob Kaplan-Moss e6ee971498 The tests now run correctly with the new psycopg2 backend. There's 4 failures, but they all have to do with the new way the psycopg2 handles datetimes and are probably a single fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2940 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-18 18:25:49 +00:00
Jacob Kaplan-Moss 5a8ed6f7f6 Fixed whitespace in tests/runtests.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-18 18:03:27 +00:00
Adrian Holovaty c643e12faf Fixed #1321 -- Made DJANGO_SETTINGS_MODULE optional. You can now call django.conf.settings.configure() to set settings manually if you don't have a settings module. Thanks, Malcolm Tredinnick, Luke Plant, Fredrik Lundh
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-16 21:28:06 +00:00
Malcolm Tredinnick 1006d6eb06 Fixed #1530 -- make count() respect distinct() on QuerySets. Create some
tests for this as well. Thanks to Adam Endicott for the original patch on which
this is based.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@2902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-14 23:49:29 +00:00
Luke Plant c427479539 Updated tests in line with changed exception messages, fixing 2 failures.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-11 21:52:23 +00:00
Luke Plant 4116403a55 Updated 'or_lookup' tests to give example of more compact syntax, for the sake of autogenerated docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-11 21:51:24 +00:00
Adrian Holovaty 0727df90f0 Fixed #1781 -- Fixed unit tests to use new error message for DoesNotExist. Thanks, pb
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-06 18:36:32 +00:00
Luke Plant f57e34e990 Fixed #1579 - added support for 'Q' objects in limit_choices_to.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-06 00:26:24 +00:00
Adrian Holovaty 69d6bd7af3 Fixed #1745 -- Accessing many-to-many relationships without a PK value now throws an exception. Thanks, Luke
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2817 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-02 19:51:41 +00:00
Adrian Holovaty f69cf70ed8 MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-02 01:31:56 +00:00
Adrian Holovaty 5bb59acfde Fixed #1632 -- Fixed typo in markup unit tests. Thanks, pb
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-04-13 13:16:05 +00:00
Adrian Holovaty 00b3891524 Fixed #1626 -- Fixed a bunch of typos in comments and docs. Thanks, Dexter
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-04-12 13:35:31 +00:00
Adrian Holovaty 85f084de39 Added model unit tests for get_DATEFIELD_list(). Refs #1423
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-03-01 03:12:24 +00:00
Adrian Holovaty 250281361d Changed get_object() not to use 'ordering' parameter from the model. Thanks, Ned Batchelder. Also updated some unit tests to show correct DoesNotExist output
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-25 17:24:17 +00:00
Adrian Holovaty f8915c0676 Removed a datetime test in tests/defaultfilters -- it was failing because it's hard to test datetime-related stuff
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2389 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-25 17:09:54 +00:00
Adrian Holovaty 9a74e89ef0 Fixed #1385 -- Allowed timesince filter to accept datetime.date objects. Thanks, Matt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2375 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-23 20:27:03 +00:00
Adrian Holovaty e029c9f7f8 Added usage to unit-test OptionParser
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2336 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-18 20:08:20 +00:00
Adrian Holovaty 8f54a225a5 Fixed spaceless template-tag tests in trunk (from magic-removal [2030])
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2036 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-17 17:59:31 +00:00
Adrian Holovaty 8654a91e12 Improved doctests to normalize long integers in compared output
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-17 17:56:33 +00:00
Adrian Holovaty 0eaee6f5d4 Fixed #1067 and #276 -- Added a {% spaceless %} tag, available in all templates
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-15 01:51:30 +00:00
Adrian Holovaty 39639cfd22 Fixed #1176 -- Changed {% comment %} template tag not to generate a nodelist, so it's now possible to comment-out broken template tags. Thanks, Kieran Holland
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-15 00:48:23 +00:00
Adrian Holovaty bbfc645337 Fixed #1181 -- get_in_bulk no longer fails on empty input. Also added unit tests. Thanks, akaihola
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-06 20:43:14 +00:00
Adrian Holovaty 1714e79796 Changed repr for MultiValueDict
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-04 17:09:26 +00:00
Adrian Holovaty 49874d54a2 Fixed httpwrappers unit tests to reflect MultiValueDict repr() change
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-01 18:43:09 +00:00
Adrian Holovaty 53aef92bf8 Fixed #1145 -- Added unit tests for default template filters and fixed two bugs in filters. Thanks, Luke Plant
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-01 18:37:33 +00:00
Adrian Holovaty e296de5500 Changed resolve_variable to resolve integers and floats as integers and floats. Added ifequal unit tests. Refs #959
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-16 05:33:24 +00:00