Commit Graph

10865 Commits

Author SHA1 Message Date
Andrew Godwin 7f63ac5a9f [1.7.x] Fixed #22496: Data migrations get transactions again! 2014-05-07 14:29:04 -07:00
Andrew Godwin d8bf415ab2 [1.7.x] Fixed #22581: Pass default values for schema through get_db_prep_save() 2014-05-07 13:47:02 -07:00
Andrew Godwin f67433e74b [1.7.x] Fixed #22563: Better error message when trying to change AUTH_USER_MODEL
You're not allowed to do this after you've made migrations; see ticket
for more details.
2014-05-07 13:05:32 -07:00
David Szotten 724a7bf222 [1.7.x] Fixed #22588 -- Fix RegexValidator __eq__
Compare parameters instead of re.pattern instances, and add the other
parameters to the comparison. Also add a __ne__ to make assertNotEqual
work properly.
2014-05-07 19:28:42 +01:00
Andrew Godwin 2afb6e0526 [1.7.x] Fixed #22576: Ensure makemigrations doesn't touch the database. 2014-05-06 22:42:53 -07:00
Andrew Godwin f53d1576ca [1.7.x] Fixed #22337: FileSystemStorage marked as deconstructible and tested. 2014-05-06 22:24:39 -07:00
Tim Graham a75318e813 [1.7.x] Fixed #22586 -- Added LANGUAGE_SESSION_KEY to __all__.
Thanks david.fischer.ch at gmail.com for the report.

Backport of 4492ea5475 from master
2014-05-06 19:50:32 -04:00
Claude Paroz 0d138b9cf4 [1.7.x] Fixed #22564 -- Prevented unneeded bytestrings in migrations
In some cases, this could lead to migrations written with Python 2
being incompatible with Python 3.
Thanks Tim Graham for the report and Loïc Bistuer for the advices.
Backport of da9cf53cb from master.
2014-05-06 09:14:32 +02:00
Claude Paroz e8f1395f4e [1.7.x] Added a bunch of missing unicode_literals
Refs #22564.
Backport of 12474dace from master.
2014-05-06 09:14:03 +02:00
Ben Davis 549b658241 [1.7.x] Fixed #22570 -- Made Form.__getitem__ KeyError more descriptive.
Backport of df60db0e78 from master
2014-05-05 20:02:14 -04:00
Anssi Kääriäinen 76979a257d [1.7.x] Fixed #22466 -- ordering by reverse foreign key
Ordering by reverse foreign key was broken by custom lookups patch
(commit 20bab2cf9d).

Thanks to everybody who helped solving this issue. Special thanks to
Trac alias takis for reporting this.

Backport of 3b7c66a3ac from master
2014-05-05 15:29:24 +03:00
Jakub Roztocil 4b6ba2c1d1 [1.7.x] Fixed #22489 -- missing implemenation for search lookup
When custom lookups were added, converting the search lookup to use
the new Lookup infrastructure wasn't done.

Some changes were needed to the added test, main change done by
committer was ensuring the test works on MySQL versions prior to 5.6.

Backport of 7131e14d00 from master
2014-05-05 14:40:06 +03:00
Anssi Kääriäinen 402fc4f6c9 [1.7.x] Fixed #22429 -- Incorrect SQL when using ~Q and F
Backport of 5e1f4656b9 from master
2014-05-05 13:06:51 +03:00
Tim Graham f8fa735dc2 [1.7.x] Fixed #22435 -- Prevented adding a ManyToManyField from prompting for a default.
Thanks andrewsg for the report.

Backport of 3818d96426 from master
2014-05-02 20:53:39 -04:00
Claude Paroz 61fd00d4fd [1.7.x] Fixed #22565 -- Prevented pgettext_lazy crash with bytestring input
Thanks ygbo for the report.
Backport of 142c27218 from master.
2014-05-02 19:33:58 +02:00
Chris Beaven 5ab93bbe74 [1.7.x] Fix migration autodector to work correctly with custom deconstructed values 2014-05-02 15:12:42 +12:00
Yehonatan Daniv d56267ba57 [1.7.x] Fixed #22539 -- Copied exclude argument in Model.full_clean() to prevent side effects.
Backport of e2e4cdba11 from master
2014-05-01 09:30:49 -04:00
Tim Graham e5941ba5f3 [1.7.x] flake8 fixes.
Backport of 45c2d1f5d9 from master.
2014-04-30 18:35:40 -04:00
Andrew Godwin 6ca5367869 [1.7.x] Cleanup failing test w/contenttypes and remove useless graph load 2014-04-30 15:12:18 -07:00
Andrew Godwin 35c2a14a49 [1.7.x] Fixed #22485: Include all unmigrated apps in project state by default. 2014-04-30 12:26:11 -07:00
Simon Charette a6ecd5dbb3 [1.7.x] Fixed #19195 -- Allow explicit ordering by a relation `_id` field.
Thanks to chrisedgemon for the report and shaib, akaariai and
timgraham for the review.

Backport of 24ec9538b7 from master
2014-04-30 14:26:39 -04:00
Claude Paroz 1084456ac2 [1.7.x] Fixed #22474 -- Made migration recorder aware of multiple databases
Thanks Tim Graham for the review.
Backport of 7c54f8cce from master.
2014-04-30 16:55:12 +02:00
Tim Graham a2cac1b68d [1.7.x] Removed unused import.
Backport of d9c272b22f from master
2014-04-30 07:27:56 -04:00
Bruno Ribeiro da Silva 72493b1b7c [1.7.x] Fixed #22511 -- Added args to migrations management commands.
Backport of 83413c53d2 from master
2014-04-30 07:20:44 -04:00
Simon Charette f02f20a739 [1.7.x] Use the new implementation of `six.with_metaclass`.
No more `NewBase` horrors.

Thanks to bendavis78 for his work on merging this into six.

Backport of a2340ac6d6 from master
2014-04-29 10:55:36 -04:00
Ramiro Morales 62bbfba3aa [1.7.x] Removed bogus, ineffective 'U' flag from codecs.open() call.
2df7238512 from master.
2014-04-29 07:52:43 -03:00
Tim Graham 1d20693fa6 [1.7.x] Revert "Fixed #15179 -- middlewares not applied for test client login()"
This reverts commit 4fdd51b732.

See the ticket for concerns with this implementation; it will be revisited.

Backport of aabceadd7d from master
2014-04-28 18:49:24 -04:00
James Bennett edca57817f [1.7.x] Bump version number for 1.7 beta 3 bugfix release. 2014-04-28 15:46:13 -05:00
Alex Gaynor 996564df4d [1.7.x] Fix many many typos in comments throughout the codebase
Backport of 2bcb8bfc8d from master
2014-04-26 14:35:57 -04:00
Aymeric Augustin 3bb0f118ca [1.7.x] Fixed #3214 -- Stopped parsing SQL with regex.
Avoided introducing a new regex-based SQL splitter in the migrations
framework, before we're bound by backwards compatibility.

Adapted this change to the legacy "initial SQL data" feature, even
though it's already deprecated, in order to facilitate the transition
to migrations.

sqlparse becomes mandatory for RunSQL on some databases (all but
PostgreSQL). There's no API to provide a single statement and tell
Django not to attempt splitting. Since we have a more robust splitting
implementation, that seems like a good tradeoff. It's easier to add a
new keyword argument later if necessary than to remove one.

Many people contributed to both tickets, thank you all, and especially
Claude for the review.

Refs #22401.

Backport of 8b5b199 from master
2014-04-26 17:46:57 +02:00
Aymeric Augustin 6b38e48ba1 [1.7.x] Fixed #21166 -- Reset errors_occurred flag after commit and rollback.
Backport of 3033a71 from master.

Conflicts:
	django/db/backends/__init__.py
2014-04-25 22:52:51 +02:00
Tim Graham 6d87acc390 [1.7.x] Fixed #22515 -- Fixed the object_id of the LogEntry that's created after a user password change in the admin.
Thanks ross at servercode.co.uk for the report.

Backport of 9e7f86b890 from master
2014-04-25 08:36:20 -04:00
Aymeric Augustin 782fa14db4 [1.7.x] Set some transaction-related feature flags on SQLite.
Refs #22496.

Backport of e368912 from master.
2014-04-25 11:45:58 +02:00
Shai Berger b8b179bbf5 [1.7.x] Fixed #22498 -- constraint name was not quoted in FK creation SQL
Backport of 843613add4 from master
2014-04-25 01:35:59 +03:00
Shai Berger 7421e1e320 [1.7.x] Made sure cursor.close() does not complain if cursor is already closed on Oracle
Refs #22483

Backport of 53d97e4fe3 from master
2014-04-25 01:35:38 +03:00
Aymeric Augustin 9bbb43dd1a [1.7.x] Ignored repeated calls to connection.close().
Backport of d4cc59ef from master
2014-04-24 08:43:24 +02:00
Aymeric Augustin 5cd6429620 [1.7.x] Prevented a crash in the cursor wrappers on Oracle.
Fixed #22483 (again).

Backport of 0f85103e from master
2014-04-24 08:43:16 +02:00
Aymeric Augustin e32e359d6a [1.7.x] Used the same instance of atomic for entry and exit.
Since all state is maintained on the connection at this time and none in
the atomic, it doesn't matter, but it could introduce some subtle bugs
if the implementation changed in the future.

Backport of 0aa4c6c3 from master
2014-04-23 21:45:49 +02:00
Aymeric Augustin 9bf890f6f9 [1.7.x] Wrapped migrations in a transaction only on DBs with transactional DDL.
Backport of e74d2183 from master
2014-04-23 21:45:38 +02:00
Claude Paroz 0424c84d54 [1.7.x] Set compile messages options as class variable
Refs #18714. Same logic as options for makemessages commands.
Backport of 3a435a057 from master.
2014-04-23 15:16:38 +02:00
Malcolm Box 07235aec9d [1.7.x] Fixed #22495 -- Locmem cache.add() failed with infinite timeouts
cache.add() incorrectly succeeded when there was an existing key
with an infinite (None) timeout.
Backport of af5f688392 from master.
2014-04-23 14:56:54 +02:00
Tim Graham e192f13103 [1.7.x] Fixed #22486 -- Restored the ability to reverse views created using functools.partial.
Regression in 8b93b31487.

Thanks rcoup for the report.

Backport of 3c06b2f2a3 from master
2014-04-23 08:49:53 -04:00
Claude Paroz c3228ef3e2 [1.7.x] Added Spatialite support to the new migration framework
Refs #22451.
Backport of 2ffa6ca73a from master.
2014-04-23 13:48:36 +02:00
Claude Paroz 423e2cf1ea [1.7.x] Used migration framework in GIS test tearDown
Backport of 48c4ea414 from master.
2014-04-23 13:47:49 +02:00
Claude Paroz 1d0f1ee199 [1.7.x] Fixed table cleanup in GIS migration tests
Backport of ab90c4707b from master.
2014-04-22 19:52:58 +02:00
Claude Paroz 417e9f383f [1.7.x] Fixed removal of GIS column in PostGIS 1.x migration
Refs #22481.
Backport of 2f9d1576e from master, squashed with 2f9d1576e8.
2014-04-22 19:52:58 +02:00
Claude Paroz 5c19c698b1 [1.7.x] Fixed adding new GIS column in PostGIS 1.x migration
Refs #22451.
Backport of fb09a489c from master.
2014-04-22 19:52:58 +02:00
Preston Timmons 935159d951 [1.7.x] Fixed #22478 -- Regression in test label discovery.
As part of the app-loading updates the old test runner was changed to not
require a models module. This introduced a regression in behavior so
applabel.TestCase failed for tests defined in a directory.

The fix is thanks to yakky and rtnpro.
2014-04-22 12:48:39 -04:00
Florian Apolloner 97b5833e21 [1.7.x] Fixed #22426 -- Added support old-style d.c.messages format.
Forward ported code from 1.5 that adds backwards compatibility with legacy message length.
See commit 9e7183073f for details.

Thanks to Ofir Ovadia for the initial patch.

Backport of f286721f7f from master.
2014-04-22 10:47:26 +02:00
James Bennett df81625da6 [1.7.x] Update for 1.7b2 security release. 2014-04-21 18:21:55 -05:00
Erik Romijn 34526c2f56 [1.7.x] Fixed queries that may return unexpected results on MySQL due to typecasting.
This is a security fix. Disclosure will follow shortly.

Backport of 75c0d4ea3a from master
2014-04-21 18:29:39 -04:00
Aymeric Augustin 380545bf85 [1.7.x] Prevented leaking the CSRF token through caching.
This is a security fix. Disclosure will follow shortly.

Backport of c083e3815a from master
2014-04-21 18:29:24 -04:00
Tim Graham 546740544d [1.7.x] Fixed a remote code execution vulnerabilty in URL reversing.
Thanks Benjamin Bach for the report and initial patch.

This is a security fix; disclosure to follow shortly.

Backport of 8b93b31487 from master
2014-04-21 18:29:12 -04:00
Aymeric Augustin 62eb79fc4c [1.7.x] Appeased flake8 2.1.0.
Backport of 428c0bbe1b from master
2014-04-21 07:50:50 -04:00
Alex Gaynor 50dddbdfc7 [1.7.x] Corrected many style guide violations that the newest version of flake8 catches
Backport of 778ce245dd from master
2014-04-21 07:50:43 -04:00
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
Daniel Hahler 21eaad68e6 [1.7.x] Fixed #22293 -- Avoided renaming many-to-many tables to themselves.
Fixed this for both implementations of _alter_many_to_many, instead of
in `alter_db_table` itself (more implementations).

Backport of 1edfa155e3 from master
2014-03-24 13:27:06 -04:00
Jannis 345281b880 [1.7.x] Fixed typo in error message in django.contrib.sitemaps.
Backport of d81a9c50d8 from master
2014-03-24 13:06:58 -04:00
Tim Graham 70b34f095c [1.7.x] Updated six to 1.6.1.
Backport of 2ec82c7387 from master
2014-03-24 07:34:18 -04:00
Alex Gaynor 6d254e5a97 [1.7.x] Removed an unused variable.
Backport of 684e8a941b from master
2014-03-22 13:17:51 -04:00
Claude Paroz d345a030c2 [1.7.x] Fixed #22241 -- Selectively added line breaks in admin read-only fields
When content is supposed to contain HTML, we do not try to add
line breaks in read-only contents.
Thanks Alexander Todorov for the report.
Backport of c94bff2 from master.
2014-03-22 17:11:12 +01:00
Patrick Michaud 908bdea482 [1.7.x] Fixed #22256 -- Replaced bad fallback for missing PATH
Thanks Baptiste Mispelon for the review.
Backport of acee46fc9 from master.
2014-03-22 16:54:02 +01:00
Claude Paroz 80f08dbdbc [1.7.x] Improved strip_tags and clarified documentation
The fact that strip_tags cannot guarantee to really strip all
non-safe HTML content was not clear enough. Also see:
https://www.djangoproject.com/weblog/2014/mar/22/strip-tags-advisory/
Backport of 6ca6c36f82 from master.
2014-03-22 11:01:14 +01:00
Antti Hirvonen 0c19383a1f [1.7.x] Fixed #22302 -- Updated Finnish locale formats
Backport of aaa2110259 from master.
2014-03-22 10:55:10 +01:00
Dejan Noveski b74ec85c1d [1.7.x] Fixed #22255 -- Added support for specifying re flags in RegexValidator
Backport of 4d0c5f6142 from master.
2014-03-21 11:18:26 +01:00
James Bennett dda6224459 [1.7.x] Bump version numbers for 1.7 beta 1. 2014-03-20 19:42:11 -05:00
Aymeric Augustin 222262ca23 Fixed #22163 -- Stopped ignoring unhandled kwargs in select_for_update. 2014-03-20 22:22:00 +01:00
Andrew Godwin 831ce69cbb Mark model renaming as irreversible for now (#22248) 2014-03-19 21:25:26 -07:00
Andrew Godwin 81f5408c7a Fixed #22275: unique_together broken if ForeignKey split into new file.
Thanks to bak1an for the patch.
2014-03-19 21:23:21 -07:00
Andrew Godwin 356f064c49 Merge pull request #2221 from bmispelon/LazyObject-refactor
Fixed #21840 -- Moved dunder methods from SimpleLazyObject to LazyObject...
2014-03-19 21:01:24 -07:00
Eric Palakovich Carr c11b9346d4 Fixed migration so MySQL GIS test doesn't fail; refs #22001.
The test previously failed with the error:
(1170, "BLOB/TEXT column 'name' used in key specification without a key length")
2014-03-19 06:49:29 -04:00
smallcode 61fdb8d487 Fixed regression in file locking on some platforms.
Some platforms with os.name == 'posix' do not have the
fcntl module, e.g. AppEngine.

refs #19373.
2014-03-18 10:35:22 -04:00
Florian Apolloner 8520e43e13 Fixed a regression from 2e5b82f627 2014-03-18 15:30:52 +01:00
Florian Apolloner 2e5b82f627 Made a test app label unique. 2014-03-18 14:51:06 +01:00
Daniel Hahler fc167c9b5e Mentioned that ``dumpdata --natural`` is deprecated. 2014-03-18 07:25:37 -04:00
Matthew Somerville 61296fb1ba Fixed #22283 -- Updated documentation referring to non-existent tuples. 2014-03-18 10:57:47 +01:00
Chris Beaven b47ef04ea2 Fix any sqlite field migration deleting all implicit m2m tables
Fixes #22281
2014-03-18 16:54:35 +13:00
Marc Tamlyn 834d78ffc3 Remove u prefixes, skip test unless spatial db.
Refs #22001, d22b291890
2014-03-15 12:49:03 +00:00
Russell Keith-Magee bb2c58c701 Merge pull request #2430 from NathanRSmith/ticket_21989
Fixed #21989 - Modified first day of week in AU locale.

Although Australia is a signatory to ISO 8601, there's a lot of evidence to suggest that this is in the same category as "officially, the USA uses metric". See the ticket for supporting details.
2014-03-15 09:26:53 +08:00
Marc Tamlyn d22b291890 Fixed #22001 -- Ensure db_type is respected.
db_parameters should respect an already existing db_type method and
return that as its type string. In particular, this was causing some
fields from gis to not be generated.

Thanks to @bigsassy and @blueyed for their work on the patch.

Also fixed #22260
2014-03-14 22:32:17 +00:00
Nathan Smith cfbc887b2c Changed start of week for Australia to Sunday as requested in https://code.djangoproject.com/ticket/21989 2014-03-14 14:00:27 -04:00
Baptiste Mispelon 37f7f233f5 Fixed #22272 -- Fixed regression in DecimalField when using decimal_places=0.
Thanks to trac user merb for the report.
2014-03-14 17:21:59 +01:00
Claude Paroz 5a976b4bec Fixed #22245 -- Avoided widget overwrite in forms.IntegerField subclasses
Thanks Jeroen Pulles for the report and Simon Charette for the review.
2014-03-13 16:58:14 +01:00
Baptiste Mispelon 5c5b266b54 Simplified implementation of collectstatic command.
Since d2e242d16c6dde6f4736086fb38057424bed3edb made isinstance()
calls work correctly on LazyObject, we can simplify the
implementation of is_local_storage added in
7e27885c6e.
2014-03-13 10:03:01 +01:00
Baptiste Mispelon 61917aa08b Fixed #21840 -- Moved dunder methods from SimpleLazyObject to LazyObject.
This commit also added tests for LazyObject and refactored
the testsuite of SimpleLazyObject so that it can share
test cases with LazyObject.
2014-03-13 10:03:01 +01:00
Shai Berger 6983201cfb Fixed #20292: Pass datetime objects (not formatted dates) as params to Oracle
This seems worthwhile in its own right, but also works around an Oracle
bug (in versions 10 -- 11.1) where the use of Unicode would reset the
date/time formats, causing ORA-01843 errors.

Thanks Trac users CarstenF for the report, jtiai for the initial patch,
and everyone who contributed to the discussion on the ticket.
2014-03-12 23:43:45 +02:00
Shai Berger fc79c3fb3d Flake8 corrections 2014-03-12 20:34:05 +02:00
Akis Kesoglou aaad3e27ac Fixed #22217 - ManyToManyField.through_fields fixes.
- Docs description of arguments mix up.
- Keep it from erroneously masking E332 check.
- Add checks E338 and E339, tweak message of E337.
2014-03-11 19:33:04 -03:00
Ramiro Morales 1d42a86ec7 Tweak password admin change form view context. Refs #21293. 2014-03-11 09:52:43 -03:00
Tim Graham 6f470650d0 Fixed #21293 -- Adjusted admin header CSS to fix admin password reset template.
By removing the absolute positioning of the usertools div and using
float positioning, the #header div will expand based on the height of
its content.

Thanks EvilDMP for the report.
2014-03-11 06:56:27 -04:00
Chris Beaven 107c9f5453 Fix AlterField migrations that are related to a RenameModel migration 2014-03-11 17:13:26 +13:00
Chris Beaven 40f6ca54f8 Fix autodetector creation of RenameModel migration to capitalize model names 2014-03-11 12:23:45 +13:00
Daniel Pyrathon 819e09b848 Fixed #22210 -- Saving model instances to non-related fields.
Previously, saving a model instance to a non-related field (in
particular a FloatField) would silently convert the model to an Integer
(the pk) and save it. This is undesirable behaviour, and likely to cause
confusion so the validatio has been hardened.

Thanks to @PirosB3 for the patch and @jarshwah for the review.
2014-03-10 15:25:18 +00:00
Chris Beaven 7feb70eef3 Fixed #22239 -- Add auto detection of renamed models 2014-03-10 13:55:44 +13:00
Aymeric Augustin 7339f43c71 Prevented admin from importing auth.User.
Since we don't enforce order between apps, root packages of contrib apps
cannot import models from unrelated apps.

Fix #22005, refs #21719.
2014-03-09 20:29:00 +01:00
Aymeric Augustin 8b67fa7551 Revert "Reordered INSTALLED_APPS in default template, refs #22005"
This reverts commit a718fcf201.
2014-03-09 20:10:56 +01:00
Shai Berger deff74ea0c Fixed the last fix for database test settings to work with Python3. 2014-03-09 12:27:12 +02:00
Shai Berger 84c137490b Fixed test breakage following test-settings enhancements 2014-03-09 10:23:47 +02:00
Andrew Godwin 40afdaf08c Fix weird autodetector error 2014-03-08 18:35:45 -08:00
Shai Berger 41afae4ce9 Reorganized the database test settings
Change database test settings from "TEST_"-prefixed entries in the
database settings dictionary to setting in a dictionary that is itself
an entry "TEST" in the database settings.

Refs #21775

Thanks Josh Smeaton for review.
2014-03-09 03:57:18 +02:00
Alex Gaynor add1584bfa 4 flake8 warning fixes 2014-03-08 16:17:54 -08:00
Andrew Godwin 6b07804474 Fixed #22183: Through M2Ms now correctly handled 2014-03-08 15:58:04 -08:00
Andrew Godwin cdf6eba181 Merge pull request #2315 from bendavis78/issues/22073
Fixed #22073 - Ensure CreateTable operation handles backwards migration correctly when M2M fields are present
2014-03-08 15:44:45 -08:00
Andrew Godwin cd7a2a077e Fixed #22199: Bad max_length deconstruction for FileField 2014-03-08 13:59:12 -08:00
Andrew Godwin 28779abb75 Fix bad conflict detection during makemigrations 2014-03-08 13:53:20 -08:00
Claude Paroz 0c6a339952 Avoided changing raw DeprecationWarning filter behavior
Refs #21188. Now pure Python DeprecationWarning visibility should
be back to Python defaults.
2014-03-08 11:13:48 +01:00
Claude Paroz 210d0489c5 Fixed #21188 -- Introduced subclasses for to-be-removed-in-django-XX warnings
Thanks Anssi Kääriäinen for the idea and Simon Charette for the
review.
2014-03-08 09:57:40 +01:00
Russell Keith-Magee 70ec4d776e Fixed #22034 -- Added a specific set of relation checks for GenericInlineModelAdmin.
Thanks to jwa for the report.
2014-03-08 11:25:23 +08:00
Anssi Kääriäinen 219d928852 Fixed #21863 -- supplemented get_lookup() with get_transform()
Also fixed #22124 -- Expanded explanation of exactly what is going on in
as_sql() methods.
2014-03-07 14:52:13 +00:00
James Jenkins ec675ed6cc Fixed #22070 -- Changed verbose_name for apps in django.contrib to use title case
Thanks bendavis78 for the report.
2014-03-06 18:43:04 -05:00
Andrew Godwin 1232acb884 Don't allow really long migration names 2014-03-06 13:34:31 -08:00
Andrew Godwin e46e15e5a1 Fixed #22204: Bad circular-dep-breaking if more than one per run 2014-03-06 13:22:42 -08:00
Andrew Godwin 8ce3ea687c Revert "Fixed #22183: Don't make a table for M2Ms with through="
This reverts commit 1562b9896f.
2014-03-06 11:50:04 -08:00
Andrew Godwin 1562b9896f Fixed #22183: Don't make a table for M2Ms with through= 2014-03-06 11:35:58 -08:00
Loic Bistuer 34236efc5e Reworked ErrorDict.as_json() to prevent unnecessary serialization/deserialization step.
Thanks @apollo13 for the suggestion. Refs #17413.
2014-03-06 18:33:58 +01:00
Roger Hu 9b729ddd8f Fixed #22185 -- Added settings.CSRF_COOKIE_AGE
Thanks Paul McMillan for the review.
2014-03-06 08:28:43 -05:00
Claude Paroz 06efeae598 Added --previous flag to msgmerge command used by makemessages
Also took the opportunity to slightly refactor gettext options
so as to ease customization by subclassing the command.
Thanks Michal Čihař for the report and initial patch.
2014-03-06 10:20:01 +01:00
Baptiste Mispelon 20948612c7 Fixed issues and added new scripts to urlify.js
Added the following scripts:
* Lithuanian (thanks to petraszd for the patch)
* Serbian (thanks to offy)
* Azerbajani (thanks to Ali Ismayilov)

Fixed the following issues:
* In Polish character map, some uppercase letters were
  converted to a lowercase ascii equivalent.
* The letter Y with a diaeresis had a lowercase version but no uppercase.

The code was also simplified and cleaned up:
* Use of `var` statements everywhere
* Systematic use of semicolons
* Proper looping over arrays and objects.

Thanks to @oinopion for his help in getting the javascript
into proper shape.

Fixes #8561, #11035.
2014-03-06 00:14:27 +01:00
Gabe Jackson b77f26313c Fixed #22207 -- Added support for GenericRelation reverse lookups
GenericRelation now supports an optional related_query_name argument.
Setting related_query_name adds a relation from the related object back to
the content type for filtering, ordering and other query operations.

Thanks to Loic Bistuer for spotting a couple of important issues in
his review.
2014-03-05 22:37:53 +02:00
Akis Kesoglou c627da0ccc Fixed #14549 - Removed restriction of single FKs on intermediary tables
Thanks to Loic Bistuer for review. Minor changes to error messages
done by committer.
2014-03-05 22:33:58 +02:00
Chris Wilson 95c74b9d69 Fixed #22206 -- Passed models.TextField.max_length to forms.CharField.maxlength 2014-03-05 20:09:28 +01:00
Athena 5d568bcfa6 Fixed #7571 -- Fixed parameter matching in include()'d urlpattern
Fixed URL resolving in the case where an outer regex includes an inner
regex and both regexes use positional parameters instead of named
groups, causing the outer regex's parameters to override the inner
regex's.

Modified the regex url resolver so that it will concatenates and then
normalizes, instead of normalizing and then concatenating.
2014-03-05 00:35:03 +01:00
Alex Gaynor a248c88372 Fixed three small flake8 violations. 2014-03-04 15:13:15 -08:00
Andrew Godwin 8fcc0140d0 Merge pull request #2396 from loic/ticket21893
Fixed #21893 -- ModelState didn't account for MTI parents inherited from abstract models.
2014-03-04 12:33:51 -08:00
Loic Bistuer 6436f1fad9 Fixed #21893 -- ModelState didn't account for MTI parents inherited from abstract models. 2014-03-05 03:25:14 +07:00
zedr 6fe22b30e0 Fixed #22085 -- Added a feature for setting non-expiring keys as the default.
This feature allows the default `TIMEOUT` Cache argument to be set to `None`,
so that cache instances can set a non-expiring key as the default,
instead of using the default value of 5 minutes.

Previously, this was possible only by passing `None` as an argument to
the set() method of objects of type `BaseCache` (and subtypes).
2014-03-04 21:16:35 +01:00
Chris Wilson 97a5971324 Fixed typo in internal CharField method 2014-03-04 20:32:54 +01:00
Russell Keith-Magee 20da67d325 Cleaned up a repr() hack that caused problems on Python3. 2014-03-04 09:50:09 +08:00
Thomas Sorrel 53c576452e Fixed #16727 -- Added protocol-relative URL support to contenttypes.views.shortcut. 2014-03-03 22:57:06 +01:00
Loic Bistuer 7bbb6958dc Allowed custom querysets when prefetching single valued relations
The original patch for custom prefetches didn't allow usage of custom
queryset for single valued relations (along ForeignKey or OneToOneKey).
Allowing these enables calling performance oriented queryset methods like
select_related or defer/only.

Thanks @akaariai and @timgraham for the reviews. Refs #17001.
2014-03-03 21:35:19 +02:00
Rodolfo Carvalho 0d91225892 Fixed many typos in comments and docstrings.
Thanks Piotr Kasprzyk for help with the patch.
2014-03-03 07:38:09 -05:00
Greg Chapple 6acaa52386 Fixed #22135 -- Added ModelAdmin.get_changeform_initial_data().
Allows custom behavior for setting initial form data in ModelAdmin.
By default, initial data is set via GET params. The new method allows
this behavior to be overridden.

Thanks egasimus for the suggestion.
2014-03-03 07:28:24 -05:00
Russell Keith-Magee 6b63742ce5 Corrected expected test output to allow for cleanups in signal and compatibility checks. 2014-03-03 19:29:50 +08:00
Russell Keith-Magee c41335fa27 Added backwards compatibliity checks to reference documentation. 2014-03-03 19:20:48 +08:00
Russell Keith-Magee 21d8175242 Fixed #22193 -- Made hint a truly optional arugment on check messages.
Thanks to Thomas Güttler for the suggestion.
2014-03-03 19:16:19 +08:00
Russell Keith-Magee 82ac389486 Edited model and field checks for grammar and consistency. 2014-03-03 18:18:39 +08:00
Russell Keith-Magee bc4dc6e99c Edited model check messages for grammar and consistency. 2014-03-03 15:35:42 +08:00
Russell Keith-Magee f7587b20da Edited MySQL-specific check messages for grammar and consistency. 2014-03-03 14:31:55 +08:00
Russell Keith-Magee 55ba92a9c9 Edited contrib.sites check messages for grammar and consistency. 2014-03-03 14:27:22 +08:00
Russell Keith-Magee 57e08aa232 Cleanup of contrib.contenttypes check messages. 2014-03-03 14:19:06 +08:00
Russell Keith-Magee 84207b6134 Edited contrib.auth check messages for grammar and consistency. 2014-03-03 13:39:58 +08:00
Russell Keith-Magee 3c5fc708f1 Edited contrib.admin check messages for grammar and consistency. 2014-03-03 13:27:17 +08:00
Aymeric Augustin 7ba29189fa Restored aliases for two APIs removed by app-loading. 2014-03-02 14:01:52 +01:00
Anubhav Joshi bb2ca9fe6c Fixed #22172 -- Allowed index_together to be a single list (rather than list of lists)..
Thanks EmilStenstrom for the suggestion.
2014-03-01 15:44:42 -05:00
Erik Romijn 775975f15d Fixed #22130 -- Deprecated fix_ampersands, removed utils.clean_html() 2014-03-01 14:07:57 +01:00
Sergey Kolosov 8c98f39624 Fixed #15318 -- Added settings for language cookie max-age, path, domain
Introduced a number of settings to configure max-age, path, and domain
for the language cookie: LANGUAGE_COOKIE_AGE, LANGUAGE_COOKIE_PATH and
LANGUAGE_COOKIE_DOMAIN.

Thanks sahid for the suggestion.
2014-03-01 07:52:45 -05:00
Baptiste Mispelon c679cb7f60 Fixed #22168 -- Fixed migrations failing on sqlite when column names are SQL keywords
Thanks to trac user fallen_flint for the report and initial patch.
2014-03-01 13:45:45 +01:00
Claude Paroz a19f0d0c1e Fixed #22137 -- Made Widget.is_hidden a read-only property
Thanks django at patjack.co.uk for the report and the review.
2014-03-01 10:36:48 +01:00
Andrew Godwin cbd04c7c49 Fix keyword agument names in RunPython to be positional 2014-02-28 09:22:48 -08:00
Tim Graham 72b080c2c8 Removed Django 1.5 upgrade hints for {% url %} tag.
Refs #19280 and Refs #19392.
2014-02-28 07:18:45 -05:00
vvojvoda c23b3717be Fixed #21962 -- Added escape_html flag to ErrorDict.as_json() 2014-02-28 07:05:55 -05:00