Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity
9,127 Commits 26 Branches 382 Tags
Commit Graph

1536 Commits

Author SHA1 Message Date
Ian Kelly
0046f37393 [1.2.X] Backport of r14537 from trunk. 
Fixed #11101: Rewrote the sequence reset SQL for Oracle to prevent it from performing an implicit commit that caused all fixtures to be automatically committed, causing a large number of test failures.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-12 01:54:07 +00:00
Luke Plant
d7b8d07cf2 [1.2.X] Fixed #14508 - test suite silences warnings. 
Utility functions get_warnings_state and save_warnings_state have been added
to django.test.utils, and methods to django.test.TestCase for convenience.

The implementation is based on the catch_warnings context manager from
Python 2.6.

Backport of [14526] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14527 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-11 15:30:13 +00:00
Russell Keith-Magee
cbe27e3cc4 [1.2.X] Corrected some backporting errors in the template tests. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14496 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-08 04:42:13 +00:00
Jannis Leidel
85f4dd6353 [1.2.X] Fixed #11966 -- Made it possible to use a percent sign in a translation message id. Thanks for the patch, Claude Paroz. 
Backport from trunk (r14459).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-04 14:15:16 +00:00
Alex Gaynor
d633a58108 [1.2.X] Converted templates doctests into unittests. We have always been at war with doctests. Backport of [14448]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-04 04:47:54 +00:00
Alex Gaynor
5b78abeba7 [1.2.X] Fixed a few more cases of the tests not properly restoring sys.path (follow up on [14430]). Backport of [14431]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-02 05:31:53 +00:00
Alex Gaynor
a24ccfc79f [1.2.X] Properly handle the fact that lists are mutable when trying to maintain state in a test. Backport of [14429]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14430 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-02 05:28:12 +00:00
Russell Keith-Magee
3cfde8364b [1.2.X] Migrated app_loading doctests. 
Backport of r14427 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-02 05:23:44 +00:00
Russell Keith-Magee
628be3497a [1.2.X] Fixed #14470 -- Migrated modeladmin doctests. Thanks to Preston Timmons for the patch. 
Backport of r14425 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-02 05:15:19 +00:00
Russell Keith-Magee
29ea1bef21 [1.2.X] Fixed #14471 -- Corrected a regression in the use of methods on custom managers on related querysets. Thanks to Lucky for the report. 
Backport of r14389 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-28 13:00:08 +00:00
Luke Plant
36dd744460 [1.2.X] Fixed #14565 - No csrf_token on 404 page. 
This solution doesn't have the negative side-effects of [14356].

Backport of [14377] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-28 11:58:51 +00:00
Ramiro Morales
f6de03b3a2 [1.2.X] Fixed #14223 -- Extended unification of exception raised in presence of integrity constraint violations. 
The unification had been introduced in r12352 and native backend exceptions still
slipped through in cases that end in connection.commit() call. Thanks Alex,
Jacob and Carl for reviewing.

Backport of [14320] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-23 00:11:50 +00:00
Chris Beaven
7f404e2628 [1.2.X] Revert [13850], this was a new feature not a bugfix. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-21 21:21:43 +00:00
Alex Gaynor
0df4c1c411 [1.2.X] Ensure the mutliple_database tests leave the settings in the same state they found them. Backport of [14313]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-21 17:37:38 +00:00
Ramiro Morales
6a369d2ff3 [1.2.X] Fixed errors introduced in r14280 when running Django tests under Python < 2.6. 
Backport of [14287] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-19 19:42:36 +00:00
Ramiro Morales
9bcdb620cb [1.2.X] Converted queries tests from doctests to unittests. 
Thanks Russell and Alex for reviews and suggestions.

Backport of [14279] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14280 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-19 04:17:29 +00:00
Honza Král
efcb7776a0 [1.2.X] Fixed #13790 -- auto detection of m2m fields to Site. Thanks, gabrielhurley! 
Backport from trunk (r14251).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-18 05:02:28 +00:00
Jannis Leidel
55d8c47d29 [1.2.X] Fixed a few other backporting-related bugs introduced in r14213. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-17 16:09:07 +00:00
Jannis Leidel
630b1fc09b [1.2.X] Removed stray code introduced in r14126 that broke the test suite. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-17 15:41:00 +00:00
Jannis Leidel
0e4737ec24 [1.2.X] Fixed #13963 -- Use the correct verbose name of a reverse relation field in the admin. Thanks, sfllaw and d0ugal. 
Backport from trunk (r14244).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-17 15:40:41 +00:00
Jannis Leidel
11713a8771 [1.2.X] Fixed #14126 -- Fixed an issue with changes to the blocktrans tag introduced in r13973 related to multiple plural forms. Thanks, mark0978, svetlyak40wt and Ramiro. 
Backport from trunk (r14239).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-16 20:51:06 +00:00
Alex Gaynor
f18e27145c [1.2.x] Fixed #14454 -- converted admin_widgets tests from doctests to unittests. We have always been at war with doctests. Thanks to prestontimmons for the patch. Backport of [14221]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14222 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-15 02:41:21 +00:00
Jannis Leidel
7be27dc083 [1.2.X] Fixed #14301 -- Handle email validation gracefully with email addresses containing non-ASCII characters. Thanks, Andi Albrecht. 
Backport from trunk (r14216).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14217 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-14 18:38:43 +00:00
Alex Gaynor
e50066d0b5 [1.2.X] Fixed #14456 -- converted inline_formsets tests from doctests to unittests. We have always been at war with doctests. Thanks to prestontimmons for the patch. Backport of [14212]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-14 01:40:39 +00:00
Alex Gaynor
14419f916b [1.2.X] Fixed #14459 -- converted many_to_one_regress tests from doctests to unittests. We have always been at war with doctests. Patch from Gabriel Hurley. Backport of [14210]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-14 01:24:55 +00:00
Alex Gaynor
25db006b7b [1.2.X] Fixed #14460 -- converted managers_regress tests from doctests to unittests. We have always been at war with doctests. Patch from Gabriel Hurley. Backport of [14207]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14208 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-14 01:17:32 +00:00
Alex Gaynor
1df25941b3 [1.2.X] Fixed #14458 -- converted m2m_regress tests from doctests to unittests. We have always been at war with doctests. Thanks to Gabriel Hurley for the patch. Backport of [14205]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-14 01:11:22 +00:00
Alex Gaynor
9b077ee4b6 [1.2.X] Converted model_inheritance_select_related tests from doctests to unittests. We have always been at war with doctests. Backport of [14181]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14182 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-12 02:09:35 +00:00
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
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
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
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
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
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
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
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
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
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
Jannis Leidel
9937943f3a [1.2.X] Fixed a few minor backporting oversights that prevented the tests to pass. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14031 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-08 17:54:40 +00:00
Jannis Leidel
fb3f629457 [1.2.X] Fixed #10970 -- Initialize DateFields with datetime.date objects, not datetime.datetime. Thanks, summerisgone, Cyberj and Ramiro Morales. 
Backport from trunk (r14029).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-08 17:54:11 +00:00
Russell Keith-Magee
0d4d924ca5 [1.2.X] Fixed #13218 -- Ensure that syndicated content served over HTTPS uses https:// links by default. Thanks to schaefer for the report, and Ben Firshman for the patch. 
Backport of r14007 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-08 14:17:13 +00:00
Luke Plant
cf1d9f4b2c [1.2.X] Fixed #14430 - Test failure on Windows with get_image_dimensions since [13715] 
Thanks to gabrielhurley for report and patch.

Backport of [14001] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-07 23:49:31 +00:00
Luke Plant
c7ce5b8929 [1.2.X] Fixed #13092 -- Added support for the "in" operator when dealing with context lists. Thanks to clelland for the patch. 
Backport of [13510] from trunk.  Backported in order to support some other
tests which need to be backported.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-05 20:27:11 +00:00
Russell Keith-Magee
1429a3dbba [1.2.X] Corrected a test failure under MySQL. 
Backport of r13976 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-02 13:14:47 +00:00
Jannis Leidel
36ce5d0b3a [1.2.X] Fixed #14363 -- Fixed render method of ManyToManyRawIdWidget to set attrs to an empty dict. Thanks, tyrion and dpn. 
Backport from trunk (r13971).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-01 02:40:25 +00:00
Jannis Leidel
a0cabd766f [1.2.X] Fixed #13568 -- Fixed the blocktrans tag to not raise a KeyError if the number of variables in the singular and the plural block differ. Thanks, deloide. 
Backport from trunk (r13967).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-01 02:39:45 +00:00