Commit Graph

8899 Commits

Author SHA1 Message Date
Malcolm Tredinnick fa35d2bd4d [1.2.X] Fixed the get_or_create tests for postgreSQL, by using
TransactionTestCase.

Backport of r13814 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 22:16:36 +00:00
Russell Keith-Magee 0c65a6f7da [1.2.X] Modified the egg template loader tests; firstly to ensure that we are testing the new, non-deprecated interface; secondly to ensure that the old deprecated interface is also tested, but deprecation warnings are silenced.
Backport of r13812 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 21:56:25 +00:00
Russell Keith-Magee 6752258289 [1.2.X] Migrated expressions doctests. Thanks to Alex Gaynor.
Backport of r13790 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:12:33 +00:00
Russell Keith-Magee 411f8dc0d6 [1.2.X] Migrated empty doctests. Thanks to Alex Gaynor.
Backport of r13789 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:12:23 +00:00
Russell Keith-Magee cbcdd408c0 [1.2.X] Migrated m2m_multiple doctests. Thanks to Alex Gaynor.
Backport of r13789 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:12:14 +00:00
Russell Keith-Magee a4a19b81c3 [1.2.X] Migrated m2m_intermediary doctests. Thanks to Alex Gaynor.
Backport of r13787 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:12:02 +00:00
Russell Keith-Magee 42f7bbda1a [1.2.X] Migrate m2m_and_m2o doctests. Thanks to Alex Gaynor.
Backport of r13786 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:11:52 +00:00
Russell Keith-Magee 0023357eb0 [1.2.X] Migrate get_or_create doctests. Thanks to Alex Gaynor.
Backport of r13785 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:11:41 +00:00
Russell Keith-Magee f0835cecf8 [1.2.X] Migrated get_object_or_404 doctests. Thanks to Alex Gaynor.
Backport of r13784 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:11:30 +00:00
Russell Keith-Magee 4395164765 [1.2.X] Migrate get_latest doctests. Thanks to Alex Gaynor.
Backport of r13783 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:11:17 +00:00
Russell Keith-Magee 5b2ec255e6 [1.2.X] Migrated the force_insert_update tests. Thanks to Alex Gaynor.
Backport of r13782 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:11:06 +00:00
Russell Keith-Magee ae26534567 [1.2.X] Migrate the files doctests. Thanks to Alex Gaynor.
Backport of r13781 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:10:54 +00:00
Russell Keith-Magee 106600edb6 [1.2.X] Migrated the field_subclsasing doctests. Thanks to Alex Gaynor.
Backport of r13780 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:10:43 +00:00
Russell Keith-Magee f7f2c7251a [1.2.X] Migrated i18n and field_defaults doctests. Thanks to Alex Gaynor.
Backport of r13779 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:10:30 +00:00
Russell Keith-Magee 24f4a4b26f [1.2.X] Migrated delete doctests. Thanks to Alex Gaynor.
Backport of r13778 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:10:17 +00:00
Russell Keith-Magee 7fbdeb49f9 [1.2.X] Migrated defer doctests. Thanks to Alex Gaynor.
Backport of r13777 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:10:03 +00:00
Russell Keith-Magee 592288fb95 [1.2.X] Migrated custom_pk doctests. Thanks to Alex Gaynor.
Backport of r13776 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13793 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:09:49 +00:00
Russell Keith-Magee 574ee82792 [1.2.X] Migrated custom_methods doctests. Thanks to Alex Gaynor.
Backport of r13775 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:09:37 +00:00
Russell Keith-Magee e41d1b7614 [1.2.X] Migrated the custom_managers tests. Thanks to Alex Gaynor.
Backport of r13774 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:09:23 +00:00
Jannis Leidel 3a6afc7e0b [1.2.X] Fixed #13702 -- Made sure to actually fall back to the l10n format strings provided in the settings, when disabled.
Backport from trunk (r13770).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 19:41:48 +00:00
Malcolm Tredinnick 686d6a414c [1.2.X] Add warning when using cache keys that might not work with
memcached.

This means testing with local dev caches (not memcache) will warn
developers if they are introducing inadvertent importabilities.  There
is also the ability to silence the warning if a dev is not planning to
use memcache and knows what they are doing with their keys.

Thanks to Carl Meyer for the patch. Fixed #6447.

Backport of r13766 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 19:07:09 +00:00
Karen Tracey 6bc74f06e2 [1.2.X] Fix AdminDocsTest failure on 1.2.X branch by correcting the test to reference an app tag that actually exists in 1.2.X.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 18:14:45 +00:00
Russell Keith-Magee ceedef1447 [1.2.X] More cleanups for the manifest file.
Backport of r13760 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 06:39:02 +00:00
Justin Bronn 31744a78cd [1.2.X] Fixed #14060 -- PostGIS never implemented the `~=` operator for geography types, so removed support for it.
Backport of r13757 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 02:09:17 +00:00
Justin Bronn 24586d4d86 [1.2.X] Fixed regression in running the GeoDjango test suite after r13670 with addition of `GeoDjangoTestSuiteRunner` (replaces `run_gis_tests`, which is now a stub).
Backport of r13755 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13756 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 01:44:51 +00:00
Justin Bronn 864361aabd [1.2.X] Fixed #13390 -- `SplitDateTimeWidget` now recognizes when it's no longer required. Thanks vaxXxa for bug report and patch.
Backport of r13753 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 21:28:00 +00:00
Justin Bronn e4bd5e8a2d [1.2.X] Fixed #13149 -- The admin `ForeignKeyRawIdWidget` now properly handles non-integer values. Thanks, Chris Adams.
Backport of r13751 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 18:38:24 +00:00
Malcolm Tredinnick f4ebd701f2 [1.2.X] Adjust AdminDocTests to run after r13728. Also match comments to tests and add test that was there in comment form only.Refs #3695.
Backport of r13737 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 17:55:08 +00:00
James Bennett f140436e3a [1.2.X] Bump to 1.2.3.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 06:49:33 +00:00
Malcolm Tredinnick 4eb78b89ce [1.2.X] Improved unicode-type, ASCII-convertible header handling in
HttpResponse.

Fixed #8765. Thanks to SmileyChris and semenov for working on this one.

Backport of r13740 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 03:25:44 +00:00
Malcolm Tredinnick dc00873da0 [1.2.X] Fixed id attribute generation in the admin docs page. Patch from simeon.
Fixed #3695. Thanks.

Backport of r13728 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 03:25:39 +00:00
Justin Bronn ff0cb11c1b [1.2.X] Fixed #13599 -- No longer embed hidden `<td>` elements in `ChangeList` that cause improper rendering when `list_editable` is enabled; refactored `admin_changelist` tests. Thanks, skevy for bug report and patch.
Backport of r13744 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13745 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 03:04:28 +00:00
Justin Bronn 8829b7d956 [1.2.X] Fixed #12632 -- Improved performance of `SortedDict`. Thanks, Alex Gaynor.
Backport of r13742 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13743 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 02:30:39 +00:00
Luke Plant 260eff5684 [1.2.X] Fixed a test so that it actually tests what it's supposed to test.
Previously it passed whether or not the view was 'csrf_exempt'ed.

Backport of [13735] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 23:58:52 +00:00
Luke Plant 890b0b6234 [1.2.X] Fixed #14235 - UnicodeDecodeError in CSRF middleware
Thanks to jbg for the report.
  
This changeset essentially backs out [13698] in favour of a method that
sanitizes the token rather than escaping it.

Backport of [13732] from trunk.




git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 23:11:24 +00:00
Justin Bronn 43988e9835 [1.2.X] Fixed #13095 -- `formfield_callback` keyword argument is now more sane and works with widgets defined in `ModelForm.Meta.widgets`. Thanks, hvdklauw for bug report, vung for initial patch, and carljm for review. Backport of r13730 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 22:54:52 +00:00
Karen Tracey aec5cbc370 [1.2.X] Fixed #13799, a test failure on Postgres. Thanks, Alex.
r13400 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13727 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 20:59:36 +00:00
Jannis Leidel ebda0e014a [1.2.X] Converted doctest to unittest. Patch by Alex Gaynor.
Backport from trunk (r13725).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13726 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 20:55:09 +00:00
Ramiro Morales 19cce79253 [1.2.X] Fixed typos in es_AR translation.
Backport of r13572 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 19:46:25 +00:00
Russell Keith-Magee de91b33a78 [1.2.X] Fixed #14245 -- Added some files and paths missing from the MANIFEST.in. Thanks to pmclanahan for the report.
Backport of r13719 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 19:22:06 +00:00
Karen Tracey 924ae1a09c [1.2.X] Pass commit=False to loaddata in tests, which will keep the DB connection open. Closing the connection has the side-effect on some DBs (Postgres, MySQL/InnoDB) of rolling back the transaction that was in progress, causing these tests to fail.
r13717 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 19:19:08 +00:00
Luke Plant ec8d04cffe [1.2.X] Fixed #11158 - get_image_dimensions very slow/incorrect after 1 call
Thanks to kua for the report, and to kua, SmileyChris and SAn for the patch

Backport of [13715] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 18:49:45 +00:00
Karen Tracey 13f1192911 [1.2.X] Fixed #14246: Modified aggregation_regress tests so that they will pass on a variety (sqlite, Postgres, MySQL/MyISAM) of DBs.
r13712 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 18:11:25 +00:00
Karen Tracey 1b0084e2a0 [1.2.X] Fixed some of the problems with aggregation_regress tests on higher levles of Postgres. Refs #14246.
r13709 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 17:08:14 +00:00
Luke Plant ec4d6bb21d [1.2.X] Fixed #14247 - 'forms' test failure in 1.2.X
Thanks to ramiro/pmclanaham for the report and analysis.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 13:17:38 +00:00
Luke Plant 6e1c46dab9 [1.2.X] Fixed #14250 - FileBasedCacheTests.test_cull test failure
This patch makes the cull behaviour (which files deleted and how many
deleted) deterministic.

Backport of [13705] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 13:09:19 +00:00
Luke Plant 6ea90256d7 [1.2.X] Fixed #14242 - UserChangeForm subclasses without 'user_permissions' field causes KeyError
This was a regression introduced by [13684]
  
Thanks to adammckerlie@gmail.com for report.

Backport of [13702] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-09 23:43:01 +00:00
Luke Plant 5357000bc3 [1.2.X] Converted tests for contrib.auth.forms to unit tests.
Backport of [13701], needed in order to backport [13702]


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-09 23:38:01 +00:00
James Bennett 329fab430b [1.2.X] Increment to Django 1.2.2.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-09 00:37:33 +00:00
James Bennett 7f84657b6b [1.2.X] Patch CSRF-protection system to deal with reported security issue. Announcement and details to follow. Backport of [13698] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-09 00:36:08 +00:00