Simon Charette
33d1dc2eeb
[1.7.x] Fixed flake8 warnings introduced in recent commits.
...
Backport of 79f05616fb
from master
2014-04-20 13:10:52 -04:00
Tim Graham
9e86c3f0a6
[1.7.x] Fixed flake8 errors.
...
Backport of 471fb04a30
from master
2014-04-20 13:09:12 -04:00
Andrew Gorcester
bc5d568e1e
[1.7.x] Fixed #22397 -- Issues removing M2M field with explicit through model
...
Changed the migration autodetector to remove models last so that FK
and M2M fields will not be left as dangling references. Added a check
in the migration state renderer to error out in the presence of
dangling references instead of leaving them as strings. Fixed a bug
in the sqlite backend to handle the deletion of M2M fields with
"through" models properly (i.e., do nothing successfully).
Thanks to melinath for report, loic for tests and andrewgodwin and
charettes for assistance with architecture.
Backport of 956bd64424
from master
2014-04-18 18:34:00 -04:00
Claude Paroz
13340df769
[1.7.x] Adapted fixture read mode to file type
...
Binary mode added in ed532a6a1e
is not supported by ZipFile.
Refs #22399 .
Backport of 275811a93
from master.
2014-04-18 19:24:39 +02:00
Claude Paroz
8d7023dc71
[1.7.x] Fixed #22399 -- Forced fixture reading in binary mode
...
This might help on systems where default encoding is not UTF-8 (and
on Python 3).
Thanks bacilla for the report.
Backport of ed532a6a1
from master.
2014-04-18 17:56:14 +02:00
Moayad Mardini
4df5dc42dd
[1.7.x] Fixed #22454 - Changed compatibility warning hint
...
The warning hint of `_check_test_runner` of 1.6 compatibility had a link
to a general release note. The link should be edited to refer the
relevant "Backwards incompatible changes in 1.6" section that documents
the cause and the possible solutions and workarounds of the warning.
Backport of 214d1e1b0f
from master
2014-04-17 20:42:04 -04:00
Tim Graham
548acd77fd
[1.7.x] Fixed a KeyError on login with legacy sessions; refs #21649 .
...
Thanks Loic for the report.
Backport of 11e30b684d
from master
2014-04-17 20:07:05 -04:00
Claude Paroz
f039c555ca
[1.7.x] Fixed #22456 -- Replaced 900913 EPSG code by 3857 in some tests
...
3857 is now the official EPSG code for the Google spherical mercator
projection and some recent versions of GDAL do not recognize 900913
any longer.
Thanks Tim Graham for the report and initial patch.
Backport of c082f3c74c
from master.
2014-04-17 21:21:27 +02:00
Justin Hamade
7f8bd1a4b3
[1.7.x] Fixed #22434 -- Retain ordering on related sliced subqueries.
...
Thanks maciej.pawlisz for the report, and charettes for the review.
Backport of a13df671a5
from master
2014-04-16 18:02:25 -04:00
Motiejus Jakštys
71c8ae543f
[1.7.x] Fixed #22460 -- Explicity remove constraints when dropping a related field.
...
Backport of 0e45669fa9
from master
2014-04-16 16:37:08 -04:00
Simon Charette
9fb61cb64a
[1.7.x] Fixed #22350 -- Consistently serialize bytes and text in migrations.
...
Thanks to @treyhunner and Loïc for their suggestions and review.
Backport of 72d3889db4
from master
2014-04-13 19:03:20 -04:00
valtron
6b3a8d2705
[1.7.x] Fixed #21760 -- prefetch_related used an inefficient query for reverse FK.
...
Regression introduced by commit 9777442
. Refs #21410 .
Backport of d3b71b976d
from master
2014-04-13 00:51:38 +07:00
Claude Paroz
a6eda3a5fc
[1.7.x] Also allowed a non-overridden setting to be deleted
...
Refs #20032 , #18824 . Thanks ztorstri at gmail.com for the report.
Backport of 3417ba0309
from master.
2014-04-12 15:35:11 +02:00
Claude Paroz
d9f8cc12ae
[1.7.x] Fixed #22102 -- Made SimpleTestCase tests run before unittest.TestCase ones
...
Thanks aptiko for the report and Tim Graham for the review.
Backport of 3e3a7372f5
from master.
2014-04-12 11:43:10 +02:00
Aymeric Augustin
3f48ca2071
[1.7.x] Improved a comment. Thanks intgr for the report.
...
Backport of 476db08
from master
2014-04-11 23:03:25 +02:00
Aymeric Augustin
1bcc8eb0f6
[1.7.x] Increased robustness of 58161e4e
. Refs #22291 .
...
Backport of ee837b9a
from master
2014-04-10 23:18:36 +02:00
Aymeric Augustin
2ad0bc132a
[1.7.x] Fixed #21202 -- Maintained atomicity when the server disconnects.
...
Thanks intgr for the report.
This commit doesn't include a test because I don't know how to emulate a
database disconnection in a cross-database compatible way.
Also simplified a 'backends' test that was constrained by this problem.
Backport of 81761508
from master
2014-04-10 23:18:36 +02:00
Aymeric Augustin
2e42c859da
[1.7.x] Fixed #21239 -- Maintained atomicity when closing the connection.
...
Refs #15802 -- Reverted #7c657b24 as BaseDatabaseWrapper.close() now
has a proper "finally" clause that may need to preserve self.connection.
Backport of 25860096
from master.
2014-04-10 23:18:35 +02:00
Aymeric Augustin
5f22bda382
[1.7.x] Fixed #22321 -- Wrapped exceptions in _set_autocommit.
...
Refs #21202 .
Backport of 3becac84
from master
2014-04-10 23:06:58 +02:00
Aymeric Augustin
7e89434084
[1.7.x] Fixed #22291 -- Avoided shadowing deadlock exceptions on MySQL.
...
Thanks err for the report.
Backport of 58161e4e
from master.
2014-04-10 23:02:54 +02:00
John Paulett
b4681be154
[1.7.x] Fixed #22364 -- Sanitized getpass input in changepassword.
...
Python 2 getpass on Windows does not accept unicode, even
when containing on ASCII characters. Related #190807 .
Backport of b5a9166f7e
from master
2014-04-10 13:16:04 -04:00
Tim Graham
ddd25b280f
[1.7.x] Fixed #22194 -- Added --list-tags option to check command.
...
Thanks Elvard for the patch.
Backport of 395d75ea6b
from master
2014-04-10 09:44:43 -04:00
Tim Graham
32e6237450
[1.7.x] Fixed #22195 -- Used constants to define built-in tags for check framework.
...
Thanks Elvard for the patch.
Backport of b513fa5fc6
from master
2014-04-10 08:54:32 -04:00
Shai Berger
3a9a4570ef
[1.7.x] Fixed #22343 -- Disallowed select_for_update in autocommit mode
...
The ticket was originally about two failing tests, which are
fixed by putting their queries in transactions.
Thanks Tim Graham for the report, Aymeric Augustin for the fix,
and Simon Charette, Tim Graham & Loïc Bistuer for review.
Backport of b990df1d63 from master
2014-04-10 01:44:30 +03:00
Aymeric Augustin
f6f188ffc7
[1.7.x] Fixed #21553 -- Ensured unusable database connections get closed.
...
Backport of 5f2f47f
from master
2014-04-09 22:50:21 +02:00
Tim Graham
32c8579089
[1.7.x] Fixed #21084 -- Used proxy model's content type for admin log entries.
...
(the previous commit included only the test)
Backport of 3cba90f22a
from master
2014-04-07 09:06:09 -04:00
Tim Graham
5891fd3f89
[1.7.x] Fixed #21649 -- Added optional invalidation of sessions when user password changes.
...
Thanks Paul McMillan, Aymeric Augustin, and Erik Romijn for reviews.
Backport of fd23c06023
from master
2014-04-05 13:01:03 -04:00
Tomasz Wysocki
23984cf907
[1.7.x] Refactored and commented strip_tags utility
...
Backport of c28beb4291
from master.
2014-04-03 21:28:10 +02:00
Simon Charette
7b3a221ad6
[1.7.x] Fixed #22363 -- Correctly serialize `django.utils.datetime_safe` objects.
...
Thanks to linovia for the report.
Backport of 074d3183d9
from master
2014-04-03 14:56:41 -04:00
Vishal Lal
28a686a0b7
[1.7.x] Fixed #22372 -- Improved description of WizardView.get_context_data().
...
Thanks simon29 for the report.
Backport of a8e2ec0e82
from master
2014-04-03 08:27:57 -04:00
Tim Graham
ef37346932
[1.7.x] Fixed #22362 -- Improved AuthenticationMiddleware assertion message.
...
Thanks Keryn Knight.
Backport of 246face209
from master
2014-03-31 08:12:16 -04:00
Tim Graham
07c42cee7f
[1.7.x] Replaced urllib/urlparse imports with from django.utils.six.moves.
...
Backport of 981b864fbd
from master
2014-03-31 07:55:25 -04:00
Loic Bistuer
5268d71f18
[1.7.x] Fixed #21795 -- Made add_preserved_filters account for url prefixes.
...
Thanks to trac username honyczek for the report. Refs #6903 .
Backport of 4339e9a92d
from master
2014-03-31 07:20:20 -04:00
Tim Graham
2f2d21fe5c
[1.7.x] Fixed typo in docstring.
...
Backport of 029d77eaaa
from master
2014-03-31 07:01:27 -04:00
Loic Bistuer
8e73d3a2c1
[1.7.x] Fixed #22319 -- Fixed migration external dependencies when there are internal dependencies.
...
Backport of 0fd51cf0bd
from master
2014-03-31 06:57:44 -04:00
Loic Bistuer
bdec848063
[1.7.x] Fixed #22359 -- Changing M2M field to blank=True failed on sqlite.
...
Backport of a449e7feec
from master
2014-03-31 06:35:06 -04:00
Aymeric Augustin
18b2c03ea3
[1.7.x] Increased memoization cache size for language codes.
...
There may be more than 100 (default maxsize) commonly seen xx-yy values
on some sites. The additional memory consumption isn't significant.
Also added a comment explaining why this cache must have a maxsize.
Backport of f356b6e
from master.
2014-03-29 19:47:47 +01:00
Anssi Kääriäinen
a6a0800579
[1.7.x] Fixed #22250 -- regression in gis compiler for non-concrete fields
...
Thanks to gwahl@fusionbox.com for the report.
Backport of 21f208e66e
from master
2014-03-29 08:28:43 +02:00
Chris Beaven
fe61ba91c7
[1.7.x] Add a useful stacklevel to some RemovedInDjango19Warnings
...
Backport of b077ba7ac1
from master
2014-03-27 06:11:01 -04:00
Simon Charette
4678efd3f1
[1.7.x] Fixed the PostGIS circular imports caused by 1506c71a95
.
...
Thanks to @loic for the help and @timgraham for the review.
refs #12030 .
Backport of b9e50e4774
from master
2014-03-26 13:02:52 -04:00
Tim Graham
4bd7411edf
[1.7.x] Fixed Python 3.4 test failure.
...
Backport of 45ef4baf5c
from master
2014-03-26 10:11:12 -04:00
Loic Bistuer
39fc8d4b8e
[1.7.x] Fixed #22331 -- Made MigrationAutodetector ignore unmanaged models.
...
This commit reverts 69d4b1c
and tackle the issue from a different angle.
Models remain present in the project state, but are now ignored by the
autodetector.
Backport of 42336c84a0
from master
2014-03-25 20:04:49 -04:00
Simon Charette
81d3d48b5e
[1.7.x] Fixed field deconstruction tests failures introduced by 1506c71a95
.
...
refs #12030 .
Backport of ff874f363c
from master
2014-03-25 19:30:33 -04:00
Simon Charette
78211b13a5
[1.7.x] Fixed #12030 -- Validate integer field range at the model level.
...
Thanks to @timgraham for the review.
Backport of 1506c71a95
from master
2014-03-25 14:31:54 -04:00
Tim Graham
7eaf329ad3
[1.7.x] Fixed #22322 -- Fixed incorrect explanation of what managed=False does.
...
refs #14305 .
Thanks Adrian Klaver for the report.
Backport of 9b7ba8af1b
from master
2014-03-25 14:03:02 -04:00
Tim Graham
d84beb3d91
Revert "[1.7.x] Fixed #22331 -- Fixed migrations ProjectState to ignore unmanaged models."
...
This reverts commit bf69375c4d
.
2014-03-25 12:07:37 -04:00
Loic Bistuer
bf69375c4d
[1.7.x] Fixed #22331 -- Fixed migrations ProjectState to ignore unmanaged models.
...
Backport of 69d4b1c3ea
from master
2014-03-25 10:34:28 -04:00
David Evans
ddcbde41ee
[1.7.x] Fixed #22315 -- str/bytes mismatch in staticfiles
...
Previously, `ManifestFilesMixin.read_manifest` failed in Python 3
because `json.loads` accepts `str` not `bytes`.
Backport of 86dcac4634
from master
2014-03-25 09:55:29 -04:00
Ben Davis
2460484486
[1.7.x] Fixed #22087 -- Made AdminReadonlyField respect ModelForm Meta overrides.
...
Backport of 16afffffe8
from master
2014-03-25 09:34:12 -04:00
Stephen Burrows
b4f165fe94
[1.7.x] Fixed #22300 -- Fixed crash in migrations when changing non-relational field to relational.
...
Backport of 35ed792cf2
from master
2014-03-25 07:46:48 -04:00