innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
7,789 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

7789 Commits

Author SHA1 Message Date
Karen Tracey c8576fa674 [1.1.X] Python 2.3 compatibility: we still need the special sets import here. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-22 00:00:19 +00:00
Russell Keith-Magee af48cad39e [1.1.X] Fixed #13396 -- Modified the SQLite introspection code to avoid a problem with unconsumed cursors on PyPy. Thanks to Alex Gaynor for the report and fix. 
Backport of r13016 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-21 23:50:00 +00:00
Russell Keith-Magee 0e996983d5 [1.1.X] Fixed #13389 -- Ensured that the app_loading test clears out the app cache at the end of each test, so that it doesn't interact badly with flush and other introspected database commands. Thanks to Karen for the report, and Ramiro Morales for the debugging hints. 
Backport of r13011 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-21 12:07:36 +00:00
Karen Tracey 1982c8b73e [1.1.X] Adjust the fr.py localflavor tests to account for r13007. 
Merge of applicable part of r13008.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13009 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-20 20:43:17 +00:00
Russell Keith-Magee 2f6317f89c [1.1.X] Fixed #13387 -- Removed some duplicated departments in the French localflavor. Thanks to Pinaraf for the report. 
Backport of r13006 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-20 15:07:14 +00:00
Russell Keith-Magee 4807b02a83 [1.1.X] Fixed #13382 -- Modified a message used for testing purposes to allow test passes under PyPy. Thanks to Alex Gaynor for the report and patch. 
Backport of r13003 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-20 12:22:10 +00:00
Russell Keith-Magee f282099832 [1.1.X] Fixed #13374 -- Corrected some more minor issues causing problems for PyPy. Thanks to Alex Gaynor for the report and patch. 
Backport of r12998 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-19 11:57:04 +00:00
Justin Bronn be167b804d [1.1.X] Fixed #11810 -- Fixed typo and errors that prevented `modifiable` from working in the geographic admin. Thanks to Rob Coup for the bug report. Refs #12504. 
Backport of r12995 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-16 16:45:59 +00:00
Karen Tracey f6b6e0f1d9 [1.1.X] Fixed #13360: For Python2.3 compatbility, don't pass iterators to sorted. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-16 15:47:06 +00:00
Russell Keith-Magee e7ef1b220e [1.1.X] Fixed #13357 -- Minor changes to get Django running under PyPy. Thanks to Alex Gaynor for the patch. 
Backport of r12991 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-16 11:15:21 +00:00
Karen Tracey 534dc44dba [1.1.X] Fixed #9427: Allow for autodiscover to load admin modules from apps in eggs. Thanks clint and metzen. 
r12989 (and r12192 as a side-effect) from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 23:18:33 +00:00
Karen Tracey 231e452f96 [1.1.X] Fixed #13345: Don't attempt to load the locale regressiontests subdirectory as a Django app. Thanks ramiro. 
r12971 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 20:33:19 +00:00
Karen Tracey 8092d3b23f [1.1.X] Fixed #13353: Corrected a couple of tests that were dependent on dictionary ordering. Thanks Alex. 
r12984 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 19:14:52 +00:00
Karen Tracey ce8367f1c8 [1.1.X] Fixed #13348: Restored ability to load models from apps in eggs. Thanks Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule. 
r12982 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 18:49:37 +00:00
Russell Keith-Magee a56b232cb5 [1.1.X] Fixed #13184 -- Document the requirement that custom model fields using SubfieldBase should probably implement formfield. Thanks to Mark L. for the report, and to Joseph and Honza for the guidance on the solution. 
Backport of r12979 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 14:37:06 +00:00
Karen Tracey a33c7673e4 [1.1.X] Fixed Python 2.4 incompatibility introduced in r12973. 
r12947 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-14 21:27:21 +00:00
Karen Tracey ef6308db01 [1.1.X] Fixed #13335: Adjusted the r12950 fix to properly handle import errors resulting from nested calls to load_app. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-14 19:14:23 +00:00
Russell Keith-Magee 65a9d73069 [1.1.X] Fixed #13332 -- Corrected the cleanup code in the test client to avoid a refcounting problem with signal handlers. This is a fix for the benefit of PyPy's hybrid GC. Thanks to Alex Gaynor for the report and patch. 
Backport of r12964 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12965 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-13 02:43:03 +00:00
Russell Keith-Magee cf08ea496e [1.1.X] Refs #13227 -- Partial backport of r12865; backported the changes to Where tree cloning logic to ensure that unclonable objects in a where() clause don't break querying. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12963 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-13 02:00:46 +00:00
Karen Tracey ee2b07c7fc [1.1.X] Added Pyton 2.3 compatibility import for use of set by some new tests. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12961 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-12 21:11:56 +00:00
Karen Tracey eca89ea9be [1.1.X] Fixed #12142 -- EmptyQuerySet.update() no longer updates all rows in the database 
r12171 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12960 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-12 17:27:53 +00:00
Karen Tracey 4771790c68 [1.1.X] svnmerge.py metatdata housekeeping. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-12 17:00:07 +00:00
Brian Rosner f45e39ba8e Fixed #11957 -- exceptions in admin.py are no longer hidden after second request 
Before you had to restart runserver for the correct exception message to show
up again. Reverts fix in r9680 which has this side-affect.

Thanks to jarrow, carljm and ramiro for their work on the patch and tickets.

Backport of r12956 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-12 14:55:45 +00:00
Russell Keith-Magee 38056e82d7 [1.1.X] Fixed #13309 -- Ensure that delete() deletes everything it should delete(). Thanks to craig.kimerer@gmail.com for the report 
Backport of r12941 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-12 14:22:16 +00:00
Karen Tracey a67b35a0aa [1.1.X] Fixed #11711 -- clarified that ValuesQuerySets are not lists per se. 
It rarely hurts to think of the returned result from a values() or
values_list() call as a list, but it's really an iterable and sometimes
the difference matters. 

r12743 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-12 13:28:46 +00:00
Karen Tracey 6dc0499fe7 [1.1.X] Fixed two small doc markup errors. 
Partial merge of r12741 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-12 13:24:31 +00:00
Karen Tracey 46b9dd3048 [1.1.X] Fixed #11696: Changed app loading code so that it does not swallow import errors that used to be (prior to r10088) raised. 
r12950 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-12 12:43:39 +00:00
Justin Bronn bf5d71f2a7 [1.1.X] Fixed #9437 -- Now close the connection after getting the PostGIS version during spatial backend initialization. 
Backport of r12948 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-11 19:01:02 +00:00
Luke Plant b2ecfe845f [1.1.X] Fixed #13270 - typos in documentation 
Thanks to cmbeelby for the report and patch

Backport of r12934 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-06 14:33:02 +00:00
Luke Plant 0819c291e7 Fixed test failure that was occurring since r12909 
The tests were relying on being able to do
ManyToManyField("NameOfThisModel") instead of the only documented method for
recursive relationships, namely ManyToManyField("self").  The former stopped
working when the fix in r12909 was applied.

Backport of r12932 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-06 12:22:29 +00:00
Luke Plant c65dd48903 [1.1.X] Fixed #13035 - Incorrect documentation regarding admin and default managers 
Thanks to rasca for report and gabrielhurley for patch.

Backport of r12930 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-06 11:59:37 +00:00
Luke Plant c3bc6481af [1.1.X] Fixed #13268 - 'ForeignKeyField' in topics/db/queries.txt 
Thanks piquadrat for report and patch.

Backport of r12928 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-06 11:05:18 +00:00
Justin Bronn cd3370c3a7 [1.1.X] Fixed #13263 -- Corrected field name typo in queries documentation examples. Thanks, RicherPots for bug report and gabrielhurley for the patch. 
Backport of r12926 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-05 16:00:31 +00:00
Justin Bronn b2627529e9 [1.1.X] Fixed #13271 -- Corrected a typo in the signals documentation. Thanks, chtito. 
Backport of r12924 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-05 15:47:05 +00:00
Russell Keith-Magee 2e8f0a8f15 [1.1.X] Added file mistakenly ommitted from r12917 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-05 15:45:20 +00:00
Russell Keith-Magee dce7515bef [1.1.X] Fixed #13129 -- Corrected CSS on RTL layout when a changelist has admin actions and is filtered. Thanks to mksoft for the report and patch. 
Backport of r12920 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-05 13:01:14 +00:00
Russell Keith-Magee 985c764a77 [1.1.X] Fixed #12260 -- Corrected CSS when using checkbox widgets on a ModelMultipleChoiceField in admin. Thanks to tiliv for the report and fix. 
Backport of r12918 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-05 12:38:30 +00:00
Russell Keith-Magee c01735dee7 [1.1.X] Fixed #11949 -- Added a hook to allow ModelAdmin customization of the delete selected template. Thanks to bendavis78 for the report and patch, and Ramiro Morales for his cleanup work. 
Backport of r12916 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-05 12:08:45 +00:00
Russell Keith-Magee 0d6a776ccd [1.1.X] Fixed #12328 -- Corrected the handling of subqueries with ordering and slicing, especially when used in delete subqueries. Thanks to Walter Doekes for the report. 
This fixes a feature that isn't available under MySQL and Oracle (Refs #10099).

Backport of r12912 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-04 17:17:46 +00:00
Russell Keith-Magee 17636ef999 [1.1.X] Fixed #12247 -- Corrected the way update queries are processed when the update only refers to attributes on a base class. Thanks to jsmullyan for the report, and matiasb for the fix. 
Backport of r12910 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-03 11:47:46 +00:00
Russell Keith-Magee ac0aea8910 [1.1.X] Fixed #11956 -- Modified the handling of m2m relationships between subclasses. Thanks to nidi for the report, and astoneman for the suggestion on how to fix the problem. 
Backport of r12908 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-02 15:52:58 +00:00
Justin Bronn adfeb96227 [1.1.X] Fixed #13256 -- `OGRGeometry` no longer raises an exception when compared to instances of different types. Thanks, ninowalker for the bug report. 
Backport of r12905 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-01 16:57:23 +00:00
Russell Keith-Magee 33052458c5 [1.1.X] Fixed #13259 -- Ensure that multiple calls to message() don't corrupt any extra message headers. Thanks to canburak for the report, and Andi Albrecht for the fix. 
Backport of r12901 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-01 15:25:54 +00:00
Justin Bronn fa114305cb [1.1.X] No longer use the deprecated GEOS C API function `GEOSGeomFromWKB_buf` when unpickling `GEOSGeometry` objects. 
Backport of r12898 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-31 18:58:19 +00:00
Russell Keith-Magee 7a7b9a0428 [1.1.X] Fixed #11916 -- Corrected handling of aggregation when there is a subquery provided in an extra(select=) clause. Thanks to jaklaassen@gmail.com for the report, and to tobias, paluh, Karen Tracey and Ian Kelly for their work on the fix. 
Backport of r12896 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-31 13:51:20 +00:00
Russell Keith-Magee f0fa0808ea [1.1.X] Fixed #13253 -- Updated the help message for dumpdata to indicate that individual models can be serialized. Thanks to arowla for the report. 
Backport of r12893 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-31 11:34:32 +00:00
Brian Rosner 64e4ffc932 [1.1.X] Restored pre-r10062 behavior allowing None from formfield_callback to exclude itself from the form 
Backported from r12891 from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-31 08:08:29 +00:00
Justin Bronn 2613872969 [1.1.X] Fixed #10594 -- `GeoQuerySet` measurment methods no longer crash on geometry fields with NULL values. Thanks, whiteinge for the bug report and yourcelf for the initial patch. 
Backport of r12885 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-29 22:20:51 +00:00
Justin Bronn 8ef5daeb4f [1.1.X] Added another GDAL bug workaround for retrieving the correct coordinate dimension on geometry collections. Refs #12312. 
Backport of r12883 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-29 21:58:48 +00:00
Justin Bronn 08d00942d0 [1.1.X] Fixed #11785 -- Clarified error message when the layer geometry type doesn't match the model field. Thanks, esizikov for bug report and initial patch. 
Backport of r12880 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-29 18:34:09 +00:00