1
0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00

8979 Commits

Author SHA1 Message Date
Russell Keith-Magee
0a52a04a07 Backport of r14003 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 13:53:25 +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
01b12a6fab [1.2.X] Fixed #5425 - Incorrect plurals in admin pagination template.
Thanks to Petr Marhoun for the report, and mk for the patch.

Backport of [13998] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-07 22:33:02 +00:00
Luke Plant
12187bfd26 [1.2.X] Fixed #14386, #8960, #10235, #10909, #10608, #13845, #14377 - standardize Site/RequestSite usage in various places.
Many thanks to gabrielhurley for putting most of this together.  Also to
bmihelac, arthurk, qingfeng, hvendelbo, petr.pulc@s-cape.cz, Hraban for
reports and some initial patches.

The patch also contains some whitespace/PEP8 fixes.

Backport of [13980] from trunk. Some items could be considered features
(i.e.  supporting RequestSite in various contrib apps), others are definite
bugs, but it was much more robust to backport all these tightly related
changes together.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-05 20:31:02 +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
Luke Plant
cb00181854 [1.2.X] Fixed #11358: Don't include private flatpages in sitemap. Thanks dburke and mlavin.
Backport of [13734] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-05 19:41:48 +00:00
Russell Keith-Magee
8266925684 [1.2.X] Fixed #10215 -- Ensured that there is parity between enter and leave transaction calls in loaddata when commit=False. The test case for this is the fixtures_regress unittests under MyISAM, which were failing previous to this fix. Thanks to MockSoul for the report.
Backport of r13978 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-02 13:56:58 +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
6d30b2847c [1.2.X] Fixed #14362 -- Made sure all parameters are passed to the ManyToManyRawIdWidget. Thanks, tyron.
Backport from trunk (r13970).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-01 02:40:01 +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
Jannis Leidel
ebc084ca35 [1.2.X] Fixed #13876 -- Fixed duplication in docs. Thanks, zerok and timo.
Backport from trunk (r13966).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13972 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-01 02:39:25 +00:00
Jacob Kaplan-Moss
89e0fde948 [1,2,X] Additions to the contributing document explaining our new decision-making process.
Backport of r13962.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13963 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-29 17:58:29 +00:00
Luke Plant
ed1aa807e2 [1.2.X] Fixed #14182 - documented how to modify upload handlers when using CsrfViewMiddleware
Thanks to dc for the report.

Backport of [13960] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13961 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-29 17:34:26 +00:00
Russell Keith-Magee
f27d85b8f4 [1.2.X] Modified a fixtures_regress test case to make it more robust to database ordering.
Backport of r13958 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-29 01:29:10 +00:00
Russell Keith-Magee
a40380f37a [1.2.X] Corrected the spelling of David Brenneman's name in the AUTHORS file. Apologies, David.
Backport of r13956 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 15:09:06 +00:00
Russell Keith-Magee
cd7e271e54 [1.2.X] Migrated fixtures_regress doctests. Thanks to David Brenneman for the patch.
Backport of r13954 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 14:53:21 +00:00
Russell Keith-Magee
49544ffb36 [1.2.X] Migrated extra_regress doctests. Thanks to Stephan Jaekel.
Backport of r13951 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 13:45:22 +00:00
Russell Keith-Magee
51ded1500f [1.2.X] Migrated expressions_regress doctests. Thanks to Stephan Jaekel.
Backport of r13950 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 13:44:49 +00:00
Russell Keith-Magee
aec5f084a3 [1.2.X] Modified the requests unit tests so that they aren't dependent on dictionary ordering.
Backport of r13848 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 12:10:52 +00:00
Russell Keith-Magee
0f41f91bc2 [1.2.X] Unified the regressiontests/dateformat tests with the regressiontests/utils/dateformat tests.
Backport of r13938 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:31:01 +00:00
Russell Keith-Magee
a36a8bbb39 [1.2.X] Migrated defaultfilters doctests. Thanks to Stephan Jaekel
Backport of r13937 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:30:22 +00:00
Russell Keith-Magee
3b255e33e8 [1.2.X] Migrated regressiontest/datastructures doctest, and moved it into the existing utils datastructures package. Thanks to Stephan Jaekel.
Backport of r13937 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13944 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:29:58 +00:00
Russell Keith-Magee
efa27fc86c [1.2.X] A few test optimizations; using native unittest where no Django-specific TestCase features are required.
Backport of r13935 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:29:30 +00:00
Russell Keith-Magee
5277425ae4 [1.2.X] Migrated null_fk doctests. Thanks to Stephan Jaekel.
Backport of r13934 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:28:56 +00:00
Russell Keith-Magee
ccd6a6783b [1.2.X] Migrated null_fk_ordering doctests. Thanks to Stephan Jaekel.
Backport of r13933 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:28:32 +00:00
Russell Keith-Magee
a9e0305f22 [1.2.X] Migrated null_queries doctests. Thanks to Stephan Jaekel.
Backport of r13932 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13940 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:28:07 +00:00
Russell Keith-Magee
45859fe9ff [1.2.X] Migrated one_to_one_regress doctests. Thanks to Stephan Jaekel.
Backport of r13931 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:27:43 +00:00
Russell Keith-Magee
66cb5d5aae [1.2.X] Migrated requests doctests. Thanks to Stephan Jaekel.
Backport of r13927 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 07:10:05 +00:00
Russell Keith-Magee
7230b609c3 [1.2.X] Migrated reverse_single_related doctests. Thanks to Stephan Jaekel.
Backport of r13926 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 07:09:40 +00:00
Russell Keith-Magee
e9f10deec0 [1.2.X] Migrated select_related_regress doctests. Thanks to Stephan Jaekel.
Backport of r13925 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13928 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 07:09:19 +00:00
Russell Keith-Magee
cf0e0c47f0 [1.2.X] Removed a test assertion that depended on primary key ordering. The test doesn't validate anything significant, and fails under Postgres. Thanks to Tobias McNulty and the magical Caktus buildbot for pointing out the problem.
Backport of r13923 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13924 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 04:49:37 +00:00
Jannis Leidel
229c738a03 [1.2.X] Fixed #14053 -- Also localize long integers. Thanks, David Danier.
Backport from trunk (r13920).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 16:22:30 +00:00
Russell Keith-Magee
2511939883 [1.2.X] Added Stephan Jaekel to AUTHORS for his excellent work purging doctests.
Backport of r13897 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:38:08 +00:00
Russell Keith-Magee
554be48d01 [1.2.X] Migrated signals_regress doctests. Thanks to Stephan Jaekel.
Backport of r13896 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:37:45 +00:00
Russell Keith-Magee
025ee2c13e [1.2.X] Migrated string_lookup doctests. Thanks to Stephan Jaekel.
Backport of r13895 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:37:19 +00:00
Russell Keith-Magee
74b6c76e25 [1.2.X] Migrated text doctests. Thanks to Stephan Jaekel.
Backport of r13894 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:36:54 +00:00
Russell Keith-Magee
2f480e0882 [1.2.X] Migrated urlpatterns_reverse doctests. Thanks to Stephan Jaekel.
Backport of r13893 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:36:30 +00:00
Russell Keith-Magee
8425cdef45 [1.2.X] Added imports for some new unittest modules. Thanks to Stephan Jaekel.
Backport of r13892 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:36:07 +00:00
Russell Keith-Magee
0b7b3e1ae8 [1.2.X] Migrated datastructures utils doctests. Thanks to Stephan Jaekel.
Backport of r13891 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:35:39 +00:00
Russell Keith-Magee
46d1d951c2 [1.2.X] Migrated timesince utils doctests. Thanks to Stephan Jaekel.
Backport of r13890 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:35:07 +00:00
Russell Keith-Magee
4cd11f8681 [1.2.X] Reorganized utils tests so it's all in separate modules. Thanks to Stephan Jaekel.
Backport of r13889 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:34:41 +00:00
Russell Keith-Magee
494933a36b [1.2.X] Migrated datetime_safe doctests. Thanks to Stephan Jaekel.
Backport of r13888 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:34:06 +00:00
Russell Keith-Magee
1917a43c4b [1.2.X] Migrated tzinfo doctests. Thanks to Stephan Jaekel.
Backport of r13887 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:33:42 +00:00
Russell Keith-Magee
46448ec51e [1.2.X] Migrated datatypes doctests. Thanks to Sebastian Hillig.
Backport of r13886 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13907 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:33:17 +00:00
Russell Keith-Magee
f1328b3adb [1.2.X] Migrated custom_columns_regress doctests. Thanks to Sebastian Hillig.
Backport of r13885 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:32:49 +00:00
Russell Keith-Magee
804b94e27d [1.2.X] Migrated backends doctests. Thanks to Sebastian Hillig.
Backport of r13884 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:32:19 +00:00
Russell Keith-Magee
e8ccba765c [1.2.X] Migrated admin_validation doctests. Thanks to Sebastian Hillig.
Backport of r13883 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13904 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:27:25 +00:00
Jannis Leidel
d99f19fb6a [1.2.X] Fixed #14290 -- Made format localization faster by caching the format modules. Thanks, Teemu Kurppa and Anssi Kääriäinen for the report and initial patches.
Backport from trunk (r13898).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:27:07 +00:00
Russell Keith-Magee
6ee04e0f97 [1.2.X] Migrated admin_registration doctests. Thanks to Sebastian Hillig.
Backport of r13882 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:26:57 +00:00