1
0
mirror of https://github.com/django/django.git synced 2025-03-14 11:20:46 +00:00

8440 Commits

Author SHA1 Message Date
Florian Apolloner
41492f0f1b [1.5.x] Simplified smart_urlquote and added some basic tests.
Backport of b70c371fc1f18ea0c43b503122df3f311afc7105 from master.
2013-07-28 10:07:29 +02:00
Luke Plant
a2eb219556 [1.5.x] Optimisation in prefetch_related_objects
Backport of 17559e6eb0 from master
2013-07-27 18:02:57 -04:00
Luke Plant
00b39e0145 [1.5.x] Fixed #19607 - prefetch_related crash
Thanks to av@rdf.ru and flarno11@yahoo.de for the report.

Backport of 4fd94969d8 from master
2013-07-27 17:59:27 -04:00
Tim Graham
9356495936 [1.5.x] Fixed #20679 -- Corrected CachedFilesMixin.post_process docstring.
Thanks bmispelon for the report.

Backport of 9b88dd3809 from master
2013-07-25 12:32:42 -04:00
Claude Paroz
0191011532 [1.5.x] Fixed #20773 -- [gis] Fixed regression in GoogleMap output
Thanks Martyn Clement for the report and the initial patch.
Backport of 27c1a7257 from master.
2013-07-22 10:08:41 +02:00
Tim Graham
8904e9fb98 [1.5.x] Fixed #20681 -- Prevented teardown_databases from attempting to tear down aliases
Thanks simonpercivall.

Backport of d9c580306c from master
2013-07-13 18:09:24 -04:00
Mathijs de Bruin
2f9378223d [1.5.x] Fixed #20075 -- Fixed session test fail when using a cache other than LocMemCache.
As override_settings was used after the initialization of the session backend,
we need to use a new session backend here.

Backport of 8c1cc4b3b0 from master
2013-07-10 15:05:00 -04:00
Tim Graham
7bbf697132 [1.5.x] Fixed #20722 -- Fixed MemcachedCache backend get_many on Python 3.
Backport of 3c736207a3 from master
2013-07-09 11:58:02 -04:00
SusanTan
4140bfb93c [1.5.x] Fixed #20711 -- Fixed broken link in timesince.py docstring
Backport of d63327d843 from master.
2013-07-07 12:40:53 -04:00
Tim Graham
95aa2182b7 [1.5.x] Fixed #19940 -- Made test.runner.setup_databases properly handle aliases for defau
Thanks simonpercivall.

Backport of 2cbd579efe from master.
2013-07-04 20:41:01 -04:00
Tim Graham
82a6a956d5 [1.5.x] Fixed #20673 -- Clarified that HttpRequest.user uses AUTH_USER_MODEL.
Thanks littlepig for the report.

Backport of f407f75aae from master.
2013-07-04 09:33:40 -04:00
Claude Paroz
44df41e5fd [1.5.x] Fixed #20695 -- Fixed contrib.humanize translation syntax errors
Affected language: Mexican Spanish, Mongolian, Romanian, Turkish
Translations for 1.6 and master will be refetched from Transifex.
Thanks ruless at gmail.com for the report.
2013-07-03 16:39:26 +02:00
Tomáš Ehrlich
6151fdf930 [1.5.x] Fixed #20687 -- Added documentation for django.core.signing API.
Thanks Baptiste Mispelon for the suggestion.

Backport of c5bc98d7e1 from master.
2013-07-03 10:39:05 -04:00
Tim Graham
62a9abeff0 [1.5.x] Fixed #20677 - Typos in generic_inlineformset_factory docs.
Thanks Riley Strong for the report.

Backport of 3fd0ee5b46 from master
2013-06-29 14:17:38 -04:00
Aymeric Augustin
02619227a9 [1.5.x] Fixed #20636 -- Stopped stuffing values in the settings.
In Django < 1.6, override_settings restores the settings module that was
active when the override_settings call was executed, not when it was
run. This can make a difference when override_settings is applied to a
class, since it's executed when the module is imported, not when the
test case is run.

In addition, if the settings module for tests is stored alongside the
tests themselves, importing the settings module can trigger an import
of the tests. Since the settings module isn't fully imported yet,
class-level override_settings statements may store a reference to an
incorrect settings module. Eventually this will result in a crash during
test teardown because the settings module restored by override_settings
won't the one that was active during test setup.

While Django should prevent this situation in the future by failing
loudly in such dubious import sequences, that change won't be backported
to 1.5 and 1.4. However, these versions received the "allowed hosts"
patch and they're prone to "AttributeError: 'Settings' object has no
attribute '_original_allowed_hosts'". To mitigate this regression, this
commits stuffs _original_allowed_hosts on a random module instead of the
settings module.

This problem shouldn't occur in Django 1.6, see #20290, but this patch
will be forward-ported for extra safety.

Also tweaked backup variable names for consistency.
2013-06-24 20:40:19 +02:00
Andrew Godwin
fd48d2d438 [1.5.x] Rotate CSRF token on login
Backport of 1514f17aa60772f48839130f9a5071b9ffe15213 from master
2013-05-24 22:20:44 +01:00
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
f403653cf146384946e5c879ad2a351768ebc226.

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 d5b93d3281fe93cbef5de84a52 made .get() error
reporting recurse infinitely on certain rare conditions. Fixed this by
not trying to print the given lookup kwargs.

Backpatch of 266c0bb23e9d64c47ace4d162e582febd5a1e336
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 (a5becad9094e5c5403b692b9a7b3a6ffaabf64a3).

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 eb9430fc4be1. 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 2f81a0ca6543f
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 9e462f810194800af30ea19a6fb8ac5697d839b4 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 e79b857a07905340556f781a7d63016236b21c61 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 e17fa9e877e84e93b699c2bd13ea48dbbb86e451
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 930af661abdb4eb7322f1ab06f21df9ed04af43d)
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 d1e87eb3baf75b1b6a0ada46a9b77f7e347cdb60.
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 9d4a5b00f1977d8cddf8e241fa4bb8a9e819f188 from master.
2013-03-17 16:05:55 +01:00
Aymeric Augustin
2757d492bb [1.5.x] Updated bundled version of six.
Backport of e11ccc76d325b6bbbf101f510a91299f507f0745.
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 c5ce0e8a687ecf7fbc38fa85c5311a6320a246c6 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