mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity
9,007 Commits 29 Branches 451 Tags
Commit Graph

9007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Gaynor
9ab383b394 [1.2.X] Converted initial_sql_regress tests from doctests (sort of...) to unittests. We have always been at war with doctests. Backport of [14179]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-12 01:59:46 +00:00
Alex Gaynor
de8ff6b672 [1.2.X] Converted get_or_create_regress tests from doctests to unittests. We have always been at war with doctests. Backport of [14177]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-12 01:54:48 +00:00
Russell Keith-Magee
5f8332af04 [1.2.X] Tweak to many_to_one_null doctest to avoid primary key assumptions (causing breakage on PostgreSQL). 
Backport of r14168 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-12 01:02:57 +00:00
Russell Keith-Magee
6f7f1f651b [1.2.X] Migrated one_to_one doctests. Thanks to George Sakkis for the patch. (We have always been at war with doctests) 
Backport of r14167 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-12 01:02:37 +00:00
Russell Keith-Magee
6b1a45289b [1.2.X] Migrated many_to_one_null doctests. Thanks to George Sakkis for the patch. 
Backport of r14166 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-12 01:02:13 +00:00
Russell Keith-Magee
5ecb496d6c [1.2.X] Migrated properties doctests. Thanks to George Sakkis for the patch. 
Backport of r14165 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-12 01:01:49 +00:00
Russell Keith-Magee
d83af03c59 [1.2.X] Migrated the mutually_referential doctests. Thanks to George Sakkis for the patch. 
Backport of r14164 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14170 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-12 01:01:25 +00:00
Russell Keith-Magee
b12428de91 [1.2.X] Migrated m2o_recursive and m2o_recursive2 tests, merging them into a single package. Thanks to George Sakkis for the patches. 
Backport of r14163 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-12 01:00:58 +00:00
Jannis Leidel
d327611b24 [1.2.X] Fixed #13494 -- Correctly concat an email subject prefix with a translation string. Thanks, hcarvalhoalves and Andi Albrecht. 
Backport from trunk (r14157).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 22:36:17 +00:00
Jannis Leidel
cf6b26d7a2 [1.2.X] Fixed links to the date formats choices in the global settings. Thanks, Russell. 
Backport from trunk (r14032).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14158 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 22:35:24 +00:00
Justin Bronn
cc1a41f3de [1.2.X] Updated version of PostGIS in GeoDjango install docs. 
Backport of r14150 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14156 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 22:24:59 +00:00
Gabriel Hurley
d2724d883e [1.2.X] Added information about the "easy-pickings" keyword to the contributing docs. Thanks to Russ for the report and cmheisel for the patch. 
Backport of [14154] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14155 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 21:58:46 +00:00
Alex Gaynor
01d1dd6935 [1.2.X] Fixed #14444 -- Convert the pagination doctests to unittests. We have always been at war with doctests. Thanks to Gabriel Hurley for the patch. Backport of [14152]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 20:38:29 +00:00
Alex Gaynor
efc7524236 [1.2.X] Converted ordering tests from doctests to unittests. We have always been at war with doctests. Backport of [14147]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 18:18:12 +00:00
Alex Gaynor
6d34d308aa [1.2.X] Converted save_delete_hooks tests from doctests to unittests. We have always been at war with doctests. Backport of [14145]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 17:41:59 +00:00
Jacob Kaplan-Moss
69d40b4a6f [1.2.X] Fixed #14440 - Converted mail doctests to unittests. 
Thanks to Rob Hudson for the patch and also to andialbrecht who filed a
similar patch that I didn't use.

Backport of r14143 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 15:18:34 +00:00
Luke Plant
1534af4b44 [1.2.X] Fixed #14433 - replaced a thread-unsafe solution to #10235 introduced in [13980] 
This patch also addresses sitemap code found in contrib/gis, which [13980]
did not.

Thanks to gabrielhurley for the initial patch.

Refs #10235, #14386

Backport of [14141] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14142 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 14:36:20 +00:00
Alex Gaynor
1d9336bb6c [1.2.X] Fixed #14279 -- Corrected a typo in the sitemaps tests (didn't affect the passage of the test). Thanks to jamesodo for the report and patch. Backport of [14136]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14137 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 03:40:26 +00:00
Gabriel Hurley
1b7d73848c [1.2.X] Changed ModelForm.fields and ModelForm.exclude examples to use tuples instead of lists since they were used inconsistently throughout the page (it wasn't hurting anything, but consistency is nice). Thanks to lspcity for the report and gruszczy for the patch. 
Backport of [14134] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 22:41:51 +00:00
Alex Gaynor
b014c81fa7 [1.2.X] Converted signals tests from doctests to unittests. We have always been at war with doctests. Backport of [14131]. 
Conflicts:

	tests/modeltests/signals/models.py

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14132 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 18:28:53 +00:00
Carl Meyer
e226a113a6 [1.2.X] Fixed typo in tutorial 01. Backport of [14129]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 18:17:32 +00:00
Ramiro Morales
46812b4c2b [1.2.X] Fixed #6073 -- Made compilemessages 18n management command reject PO files with BOM. 
Backport of [14125] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14126 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 16:45:06 +00:00
Chris Beaven
fee4aa31d7 [1.2.X] Fixed #11907 -- EmailField now runs strip() on its input. This means mistakenly including leading or trailing spaces will not cause a validation error, and clean() will remove those spaces. Thanks, krisneuharth and djansoft. Backport of [13997]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 10:02:18 +00:00
Andrew Godwin
be190d1913 [1.2.X] Fixed #14193: prepopulated_fields javascript now concatenates in correct order. Thanks to bmihelac for the patch. 
Backport of [14122] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14123 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 09:58:24 +00:00
Andrew Godwin
c4956d1b9e [1.2.X] Fixed #14391 - Updated django-admin.1 man page to include newer commands. Thanks to laurentluce for the patch. 
Backport of [14120] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 09:40:38 +00:00
Chris Beaven
a23b42924a [1.2.X] Add myself to committers. Backport of [14118] 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 09:38:55 +00:00
Carl Meyer
700c5a3dfe [1.2.X] Refs #11256 -- Extended the annotation field name conflict check to cover m2ms and reverse related descriptors as well. This is needed to actually cover the case raised by #14373. Backport of [14116]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 08:06:39 +00:00
Gabriel Hurley
4395b6575b [1.2.X] Clarified information on OPTIONS setting (for adding additional parameters when connecting to a database) and linked to Database Backend docs. Thanks to chris@cwroofs for the report. 
Backport of [14114] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 07:59:49 +00:00
Gabriel Hurley
1322968409 [1.2.X] Makes links to form and field validation (and form reference docs in general) more readily available from form topic overview. Thanks to john_fries for the report. 
Backport of [14112] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 07:09:57 +00:00
Gabriel Hurley
95d0ffbb0f [1.2.X] Added additional information on what the APPEND_SLASH setting does. Thanks to ttencate for the report and draft text. 
Backport of [14110] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 06:37:19 +00:00
Gabriel Hurley
7de577093c [1.2.X] Advises that the Ubuntu package manager drops the .py extension from django-admin.py. Thanks to islands for the report and d0ugal for the patch. 
Backport of [14108] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14109 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 06:07:25 +00:00
Ramiro Morales
4d70df8b78 [1.2.X] Fixed #12650 -- Don't generate invalid XHTML in the admin, databrowse apps when 
the i18n context processor is active. Thanks to Rob Hudson for the report and
fix suggestion.

Backport of [14104] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 01:59:17 +00:00
Luke Plant
a92da6e80b [1.2.X] Converted contrib/webdesign doctests to unittests. We thoroughly deplore those doctests. 
Backport of [14101] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14103 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 01:09:34 +00:00
Luke Plant
cf2e9f66ed [1.2.X] Converted contrib/auth/tokens doctests to unittests. We've always said "no more" to doctests. 
Backport of [14100] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14102 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 01:09:20 +00:00
Alex Gaynor
5d9140c137 [1.2.X] Fixed a typo in the comments tests, as well as a dependency on CPython's reference counting semantics. Backport of [14098]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 23:05:09 +00:00
Carl Meyer
846febeb7a [1.2.X] Fixed misspelling in model fields docs. Backport of [14096] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 22:42:01 +00:00
Alex Gaynor
ee8fc8d93a [1.2.X] Converted defer_regress tests from doctests to unittests. We have always been at war with doctests. Backport of [14094]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 21:55:33 +00:00
Carl Meyer
b6223d3020 [1.2.X] Added sanity-checking of annotation alias names. Backport of [14092] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 20:10:00 +00:00
Alex Gaynor
62dfe54d70 [1.2.X] Fixed a PendingDeprecationWarning coming from django.core.cache in Python 2.6. Backport of [14090]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 17:32:43 +00:00
Alex Gaynor
50ce457330 [1.2.X] Fixed #14356. Remove some dead imports from django.core.management.sql. Thanks to xiaket for the report and patch. Backport of [14088]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14089 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 17:15:35 +00:00
Alex Gaynor
b3e02d19ec [1.2.X] Fixed #14011 -- Doing a subquery with __in and an EmptyQuerySet no longer raises an Exception. This is actually just a test for this, it was fixed by [14085]. Thanks to skatei for the report and mk for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14087 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 16:51:50 +00:00
Alex Gaynor
bb66cb8463 [1.2.X] Fixed #14366 -- Model.objects.none().values() now correctly returns a QuerySet with no items, rather than raising an Exception. Thanks to Carl Meyer for the patch. Backport of [14084]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 16:46:25 +00:00
Alex Gaynor
2e5f0c228f [1.2.X]. Convert m2m_recursive tests to unittests. We have always been at war with doctests. Backport of [14082]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14083 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 16:27:19 +00:00
Russell Keith-Magee
935f6873dd [1.2.X] Fixed #14427 -- Added --bisect and --pair flags to runtests.py, making it easier to find pairs of tests that fail when run together. 
Backport of r14079 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14081 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 14:47:28 +00:00
Russell Keith-Magee
e8d5038218 [1.2.X] Ensure that the sitemaps test deactivates it's locale, so that subsequent tests aren't run in French. 
Backport of r14078 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14080 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 14:47:04 +00:00
Gabriel Hurley
4241197b40 [1.2.X] Improved example to account for environments where cStringIO is not available. Thanks to rubic for the report and niall for the patch. 
Backport of [14076] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 10:23:48 +00:00
Gabriel Hurley
a96e50b76b [1.2.X] Adds documentation for QuerySet.update() method. Thanks to dwillis and timo for the majority of the wording. 
Backport of [14074] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14075 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 10:01:01 +00:00
Gabriel Hurley
91310e759a [1.2.X] Fixed #13538 -- Clarified query examples with more explicit import statements and model vs. instance differentiation. Thanks to yipengh87 and kmtracey for the report, and timo for the patch. 
Backport of [14070] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14073 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 08:26:29 +00:00
Russell Keith-Magee
9584b77c35 [1.2.X] Fixed #11509 -- Modified usage of "Web" to match our style guide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch 
Backport of r14069 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 08:25:01 +00:00
Russell Keith-Magee
a322ba66a1 [1.2.X] Migrated the custom_columns doctests to unit tests. Thanks to Alex Gaynor. 
Backport of r13765 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14071 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 08:23:32 +00:00