Commit Graph

8424 Commits

Author SHA1 Message Date
Claude Paroz fa90ef250f [1.5.x] Imported copyreg from six.moves 2013-05-21 10:21:52 -07:00
Daniel Lindsley cb9aaac91f [1.5.x] Fixed #20212 - __reduce__ should only be defined for Py3+. 2013-05-21 10:17:27 -07:00
Anssi Kääriäinen bac187c0d8 [1.5.x] Fixed prefetch_related + pickle regressions
There were a couple of regressions related to field pickling. The
regressions were introduced by QuerySet._known_related_objects caching.

The regressions aren't present in master, the fix was likely in
f403653cf1.

Fixed #20157, fixed #20257. Also made QuerySets with model=None
picklable.
2013-05-21 11:45:24 +03:00
Anssi Kääriäinen 0eddedf7db [1.5.x] Fixed #20278 -- ensured .get() exceptions do not recurse infinitely
A regression caused by d5b93d3281 made .get() error
reporting recurse infinitely on certain rare conditions. Fixed this by
not trying to print the given lookup kwargs.

Backpatch of 266c0bb23e
2013-05-20 19:05:43 +03:00
Tim Graham 18a2fb1907 [1.5.X] Fixed #20136 - Fixed and expanded the docs for loaddata and model signals.
Thanks brandon@ and Anssi for the report.

Backport of 2c62a509de from master
2013-05-11 19:37:09 -04:00
Aymeric Augustin 6d3d6081e8 [1.5.x] Fixed #20025 -- Pointed to a MySQLdb fork for Python 3.
Made a few minor compatibility adjustments.

Backport of e81e319f from master.
2013-05-10 10:23:15 +02:00
Aymeric Augustin b5d6a5b21a [1.5.x] [py3] Stopped iterating on exceptions. Refs #20025.
Backport of 86b4ac66 from master.
2013-05-10 10:18:27 +02:00
Tai Lee 23b234a9d9 [1.5.x] Fixed #20354 -- `makemessages` no longer crashes with `UnicodeDecodeError`
Handle the `UnicodeDecodeError` exception, send a warning to `stdout` with the
file name and location, and continue processing other files.
Backport of 99a6f0e77 from master.
2013-05-07 21:36:51 +02:00
Florian Apolloner 4391718f26 [1.5.x] Fixed #19252 -- Added support for wheel packages.
Backport from master (a5becad909).

Signed-off-by: Jannis Leidel <jannis@leidel.info>
2013-05-01 13:52:38 +02:00
Claude Paroz 9176fa70c1 [1.5.x] Fixed geojson detection with Spatialite
This is a partial backport of commit eb9430fc4b. Without this,
geojson support is never detected with Spatialite.
Refs #20252 and #19028.
2013-04-14 19:08:50 +02:00
Claude Paroz abdcf81843 [1.5.x] Fixed #20237 (again) Allowed binary parameter to assertContains
Backport of b04fd579d5 from master.
2013-04-12 20:16:35 +02:00
Baptiste Mispelon 9c49e64b66 [1.5.x] Fixed #20211: Document backwards-incompatible change in BoundField.label_tag
Also cleaned up label escaping and consolidated the test suite regarding
label_tag.
Backport of ab686022f from master.
2013-04-12 10:25:44 +02:00
Claude Paroz 427b59495e [1.5.x] Fixed #20237 -- Reenabled assertContains with binary parameter
Thanks Baptiste Mispelon for the review.
Backport of fe01404bb9 from master.
2013-04-11 10:58:06 +02:00
Simon Charette d04e8f8c78 [1.5.x] Fixed #20207 -- Handle ManyToManyField with a unicode name correctly.
Backport of 216580e034.
2013-04-05 15:21:59 -04:00
Julien Phalip a15a3e9148 [1.5.x] Fixed #20169 -- Ensured that the WSGI request's path is correctly based on the `SCRIPT_NAME` environment parameter or the `FORCE_SCRIPT_NAME` setting, regardless of whether or not those have a trailing slash. Thanks to bmispelon for the review.
Backport of 2f81a0ca65
2013-04-01 12:07:58 -07:00
Gavin Wahl d1b7bd030b [1.5.x] Fixed spelling errors
Backport of ec04fd1344 from master
2013-03-29 08:00:24 -04:00
Jacob Kaplan-Moss 1cf4968cc5 Bumped version number post-release. 2013-03-28 16:07:32 -05:00
Jacob Kaplan-Moss 2847ae6665 Bump version numbers for 1.5.1. 2013-03-28 15:12:39 -05:00
Claude Paroz ebac592a83 Updated translations from Transifex
Polish, Telugu, Georgian, Azerbaijani, Norwegian Bokmål, Basque,
Dutch, Thai, Spanish (Argentina), Afrikaans.
2013-03-28 09:22:57 +01:00
Jacob Kaplan-Moss 87f4860718 [1.5.x] Fixed #20078: don't allow filtering on password in the user admin.
Backport of 9e462f8101 from master.
2013-03-27 11:52:40 -05:00
Preston Holmes 572a300e56 [1.5.x] Fixed #18985 -- ensure module level deprecations are displayed
Also don't compete with -W CLI option.

Thanks to Aymeric Augustin for the catch, and Claude Paroz for the patch.

Backport of e79b857a07 from master.
2013-03-27 10:37:47 -05:00
Anssi Kääriäinen 207117ae73 [1.5.x] Fixed #20091 -- Oracle null promotion for empty strings
Backpatch of e17fa9e877
2013-03-26 15:05:37 +02:00
Russell Keith-Magee d35e621633 [1.5.x] Fixed #20048, #20060 -- Modified tests for contrib apps sensitive to custom User models.
Thanks to matiasb for the report of #20060 and the draft patch for #20048.

(cherry picked from commit 930af661ab)
2013-03-23 10:02:10 +08:00
Claude Paroz deec020bf5 [1.5.x] Fixed #20108 -- Fixed filepath_to_uri decoding error
This was a regression due to unicode_literals usage. Thanks Ivan
Virabyan for the report and the initial patch.
Backport of 164528acc8 from master.
2013-03-22 17:58:36 +01:00
Marc Tamlyn dd897e4eeb [1.5.x] Fixed #20094 - Be more careful when checking for Iterator
Python 2.6 has some different behaviour when checking
isinstance(foo, collections.Iterator).
Backport of 829dc3c5 from master.
2013-03-22 17:45:41 +01:00
Claude Paroz b91067d9aa [1.5.x] Revert "Fixed #19895 -- Made second iteration over invalid queryset raise an exception too"
This reverts commit d1e87eb3ba.
This commit was the cause of a memory leak. See ticket for more details.
Thanks Anssi Kääriäinen for identifying the source of the bug.
2013-03-20 10:43:14 +01:00
Aymeric Augustin 1c9bd69ff0 [1.5.x] Stopped using non-standard __globals__ and __code__ attributes.
Some alternative implementations don't have them.

Closes #19944.

Backport of 9d4a5b00f1 from master.
2013-03-17 16:05:55 +01:00
Aymeric Augustin 2757d492bb [1.5.x] Updated bundled version of six.
Backport of e11ccc76d3.
2013-03-17 16:05:30 +01:00
Florian Apolloner f96d2848c6 [1.5.x] Updated our six module to follow upstream changes.
This includes fixes for the java/jython detection and a new license header.

Thanks to Thomas Bartelmess for the report.

Backport of c5ce0e8a68 from master.
2013-03-17 16:05:19 +01:00
Claude Paroz 101ec4bf8a [1.5.x] Fixed #20036 -- Improved GEOS version string parsing
Thanks chikiro.spam at gmail.com for the report.
Backport of 747f7d254 from master.
2013-03-13 09:54:37 +01:00
Claude Paroz 327c98ff08 [1.5.x] Fixed #19933 -- Catched ValueError in get_system_username
Thanks lanre.hbs at gmail.com for the report.
2013-03-02 22:45:06 +01:00
Łukasz Langa bbe8205693 [py3] Always fed hashlib with bytes. 2013-02-27 10:03:33 +01:00
James Bennett b170c077cc [1.5.x] Correct final element of version tuple. 2013-02-26 13:28:38 -06:00
James Bennett e7f2c6f2d7 [1.5.x] Bump version numbers for Django 1.5 release. 2013-02-26 13:06:35 -06:00
Aymeric Augustin 702d39921c [1.5.x] Fixed #19634 -- Added proper __hash__ methods.
Classes overriding __eq__ need a __hash__ such that equal objects have
the same hash.

Thanks akaariai for the report and regebro for the patch.

Backport of e76147a from master.
2013-02-25 23:37:23 +01:00
Aymeric Augustin 33fc438952 [1.5.x] Fixed #18144 -- Restored compatibility with SHA1 hashes with empty salt.
Thanks dahool for the report and initial version of the patch.

Backport of 633d8de from master.
2013-02-25 20:04:26 +01:00
Claude Paroz 3fb98406dc [1.5.x] Updated translations 2013-02-25 14:27:14 +01:00
Simon Charette f8b41da431 [1.5.x] Fixed #19688 -- Allow model subclassing with a custom metaclass using six.with_metaclass
Backport of 6b03179e12 from master.

Although we're post RC 2, I'm backporting this because it's arguably a
major bug in a new feauture that will prevent several well-known
third-party apps from being ported to Python 3.
2013-02-24 17:45:48 +01:00
Grzegorz Nosek d1e87eb3ba [1.5.x] Fixed #19895 -- Made second iteration over invalid queryset raise an exception too
When iteration over a queryset raised an exception, the result cache
remained initialized with an empty list, so subsequent iterations returned
an empty list instead of raising an exception

Backport of 2cd0edaa47 from master.
2013-02-23 14:39:05 -06:00
Jannis Leidel f96dd05542 [1.5.X] Fixed #19850 -- Use configured staticfiles storage to find the URL of a static file in the admin. 2013-02-23 14:42:11 +01:00
Anssi Kääriäinen 251f345db6 [1.5.x] Fixed Oracle regression in last_executed_query() with unicode strings
The regression was likely caused by the fix in #19606 which adjusted
Oracle's unicode detection, though it seems this would have been an
issue in some configurations even before.

Backpatch of ce094e570e
2013-02-23 00:31:14 +02:00
Anssi Kääriäinen 8a99d718f7 [1.5.x] Fixed empty strings + to_field regression on Oracle
Querying the reverse side of nullable to_field relation, where both
sides can contain null values resulted in incorrect results. The reason
was not detecting '' as NULL.

Refs #17541, backpatch of 09fcb70c80.
2013-02-23 00:09:48 +02:00
Anssi Kääriäinen 96790fc022 [1.5.x] Made a couple of selenium tests wait for page loaded
The admin_widgets tests were issuing click() to the browser but
didn't wait for the effects of those clicks. This caused the resulting
request to be processed concurrently with the test case. When using
in-memory SQLite this caused weird failures.

Also added wait_page_loaded() to admin selenium tests for code
reuse.

Fixed #19856, backpatch of 50677b29af
2013-02-21 00:01:07 +02:00
Anssi Kääriäinen 8ad436636f [1.5.x] Fixed #19672 -- Error in negated Q() filtering
There was a variable overwrite error in negated join filtering. This
happened when add_filter() was adding the IS NULL condition to the
WHERE clause.

This is not a backport from master as there have been some other
refactorings which made this patch irrelevant.

The patch is from Ian Kelly.
2013-02-20 21:57:39 +02:00
Carl Meyer 8d4342f2c9 [1.5.x] Fixed #19857 -- Fixed broken docs link in project template. 2013-02-19 18:43:28 -07:00
James Bennett 18d920ea48 [1.5.x] Bump version numbers for security release. 2013-02-19 14:15:33 -06:00
Aymeric Augustin 3ef4bbf495 [1.5.x] Added a default limit to the maximum number of forms in a formset.
This is a security fix. Disclosure and advisory coming shortly.
2013-02-19 10:39:04 -07:00
Carl Meyer 0e46c7f7ac [1.5.x] Checked object permissions on admin history view.
This is a security fix. Disclosure and advisory coming shortly.

Patch by Russell Keith-Magee.
2013-02-19 10:39:04 -07:00
Carl Meyer 2d0c22e02d [1.5.x] Restricted the XML deserializer to prevent DoS attacks.
This is a security fix. Disclosure and advisory coming shortly.
2013-02-19 10:39:03 -07:00
Carl Meyer a7e33c5bf3 [1.5.x] Added a new required ALLOWED_HOSTS setting for HTTP host header validation.
This is a security fix; disclosure and advisory coming shortly.
2013-02-19 10:39:03 -07:00