Commit Graph

10773 Commits

Author SHA1 Message Date
Alex Gaynor d099c03789 [1.7.x] Simplified, very slightly, some code in the oracle backend
Backport of e79725cdf9 from master
2014-05-29 07:52:55 -04:00
Víðir Valberg Guðmundsson 0ee27d5b62 [1.7.x] Fixed #22720 -- Migrations attempt to create _order twice.
Backport of 6cfa2fae39 from master
2014-05-29 07:52:17 -04:00
Shai Berger b8b1fbd4c1 [1.7.x] Set straight the sense of 'uppercases_column_names' feature flag 2014-05-28 21:26:08 +03:00
Shai Berger 5f135e6a0b [1.7.x] Fixed #22715: Corrected sql for defaults of BinaryField on Oracle with Python3
While at it, fixed a problem in returning empty values
(still with BinaryField/Oracle/Python3).

Backport of fd427f1 from master
2014-05-28 19:02:29 +03:00
Claude Paroz 91ef348bd6 [1.7.x] Fixed #21630 -- Simplified management command discovery
Thanks Aymeric Augustin for the report end the review.
Backport of fe53bc524 from master.
2014-05-28 09:35:43 +02:00
Aymeric Augustin 430faebe3b [1.7.x] Fixed #22699 -- Configure default settings in some management commands.
This makes it possible to run django.setup() in management commands that
don't need a settings module. In addition it simplifies error handling.

Thanks Claude for the review.

Backport of 4865326f from master.
2014-05-27 21:46:30 +02:00
Moayad Mardini c0a56001e0 [1.7.x] Fixed #22675 -- makemigrations --dry-run to output migrations to stdout.
`makemigrations --dry-run` will output the complete migrations file
that would be written if it's used along with `--verbosity 3`.

Backport of 2e613ea5c5 from master
2014-05-26 20:03:41 -04:00
Florian Apolloner 099625d760 [1.7.x] Removed executeable bit from a few files.
Backport of 9d1bf8f841 from master.
2014-05-25 23:17:18 +02:00
Claude Paroz 0c685ab64f [1.7.x] Removed code deprecated from Django 1.2
Backport of 2779c299c8 from master.
2014-05-25 21:26:44 +02:00
Moayad Mardini a59870e217 [1.7.x] Fixed #22676 -- makemigrations --dry-run should not ask for defaults
Made the fix in InteractiveMigrationQuestioner class code, rather than
MigrationAutodetector, because --dry-run shouldn't affect whether
MigrationAutodetector will detect non-nullable fields, but the
questioner should skip the question and returns a None for default
(since that won't be used anyway) if --dry-run is used.

Backport of ee14961a2a from master
2014-05-24 09:56:43 -04:00
Marc Tamlyn be733bf672 [1.7.x] Fixed #22510 -- Harden field removal to only None.
Refs #8620.

If we allow any value to remove form fields then we get name clashes
with method names, media classes etc. There was a backwards
incompatibility introduced meaning ModelForm subclasses with declared
fields called media or clean would lose those fields.

Field removal is now only permitted by using the sentinel value None.
The docs have been slightly reworded to refer to removal of fields
rather than shadowing.

Thanks to gcbirzan for the report and initial patch, and several of the
core team for opinions.

Backport of 9fb0f5dddc from master
2014-05-24 13:11:50 +01:00
Claude Paroz cdfefbec72 [1.7.x] Applied unicode_literals to makemessages command
This also fixes #22686 as some sort of side-effect.
Backport of dbb48d2bb9 from master.
2014-05-24 13:12:56 +02:00
Claude Paroz e692c5818b [1.7.x] Removed translatability of PIL error messages
Note these are no longer in master anyway.
2014-05-24 12:19:49 +02:00
Moayad Mardini 7d4a51e239 [1.7.x] Fixed #22679 -- Fixed empty tuple serialization in MigrationWriter.
Thanks rockallite.wulf for the report.

Backport of ad994a3c5b from master.
2014-05-22 16:20:21 +02:00
Ramiro Morales fb45e666c2 [1.7.x] Fixed #22421 -- Regression in fixtures loading.
Loading fixtures were failing since the refactoring in 244e2b71f5 for
inheritance setups where the chain contains abstract models and the
root ancestor contains a M2M relation.

Thanks Stanislas Guerra for the report.

Refs #20946.

Backport of 862e1ff234 from master
2014-05-22 07:38:39 -04:00
Andrew Godwin fd62bc165c [1.7.x] Fixed #22432: SQLite M2M repointing now works. Thanks to xelnor.
Backport of 03900a02d5 from master
2014-05-21 07:04:46 -04:00
Andrew Godwin d8c532036a [1.7.x] Fixed #22649: Beefed up quote_value
Backport of 125b3d4407 from master
2014-05-21 07:04:46 -04:00
Loic Bistuer d61b6224b0 [1.7.x] Fixed #22424 -- Fixed handling of default values for TextField/BinaryField on MySQL.
Thanks syphar for the review and suggestions.

Backport of 1d3d01b4f7 from master
2014-05-21 07:04:38 -04:00
Raphaël Barrois 1a29675d76 [1.7.x] Fixed #22626 -- Allow BinaryField defaults with SQlite.
Also fixes a slight issue in sqlite3.schema._remake_table where
default values where quoted with "column name" quoting rules.

Reference for quoting: http://www.sqlite.org/lang_expr.html

Thanks Shai Berger for the review. Refs #22424.

Backport of 6aacb4c991 from master
2014-05-21 06:57:49 -04:00
Loic Bistuer 0fa1aeb8d8 [1.7.x] Fixed the ordering of prefetch lookups so that latter lookups can refer to former lookups.
Thanks Anssi Kääriäinen and Tim Graham for the reviews. Refs #17001 and #22650.

Backport of 870b0a1f86 from master
2014-05-21 10:37:41 +07:00
Loic Bistuer 24a41ecc35 [1.7.x] Fixed #22650 -- Fixed regression on prefetch_related.
Regression from f51c1f59 when using select_related then prefetch_related
on the reverse side of an O2O:

Author.objects.select_related('bio').prefetch_related('bio__books')

Thanks Aymeric Augustin for the report and tests. Refs #17001.

Backport of bdf3473e64 from master
2014-05-21 10:37:00 +07:00
Denis Cornehl 0007a43198 [1.7.X] Fixed #22557 -- ManifestStaticFilesStorage did not cleanup deleted files.
When using ManifestStaticFilesStorage, deleted static files would be
correctly cleaned up by "collectstatic --clear", but the manifest file
would still contain the stale entries.

Thanks to tedtieken for the report

Backport of 3bec38888f from master.
2014-05-20 18:19:40 +02:00
Claude Paroz 3e2bb807b1 [1.7.x] Removed unused translations in auth tests
Backport of b8c480a12b from master.
2014-05-20 12:23:17 +02:00
Marc Tamlyn c38925a601 [1.7.x] Fixed #22648 -- Transform.output_type should respect overridden custom_lookup and custom_transform.
Previously, class lookups from the output_type would be used, but any
changes to custom_lookup or custom_transform would be ignored.

Backport of a2dd618 from master
2014-05-19 15:05:23 +01:00
Claude Paroz 0f84037e10 [1.7.x] Updated translation catalogs 2014-05-19 15:14:09 +02:00
Tim Graham 1e78d132da [1.7.x] Fixed #22652 -- Replaced UserModel.objects with UserModel._default_manager.
Thanks alexdlaird for the report.

Backport of b68fac7e88 from master
2014-05-19 08:37:00 -04:00
Claude Paroz a69534ddd4 [1.7.x] Removed locale dirs for single-message apps
Considering that these apps only translate their app name, it's not
worth having a whole bunch of po files just for that. The translatable
app name for those apps will be integrated in Django core catalog.
Backport of a1f0c4c697 from master.
2014-05-19 14:21:01 +02:00
Claude Paroz db2aacff99 [1.7.x] Updated Django makemessages process
makemessages should now automatically distribute translatable
strings in the proper locale files, for Django too
(see 50a8ab7cd1).
Backport of 7999ed9b69 from master.
2014-05-19 09:30:59 +02:00
SaeX ed98757e4b [1.7.x] Added "/" divider for DATE(TIME)_INPUT_FORMATS for Dutch locale.
Dutch ('nl-NL' and 'nl-BE') has several valid input formats;
see http://nl.wikipedia.org/wiki/Datum_(dagtekening).

Thanks Erik Romijn for review.

Backport of e3a9714ce3 from master
2014-05-18 13:00:32 -04:00
Alex Gaynor 8b87473008 [1.7.x] Fixed several flake8 errors, including one where a test wouldn't be run
Backport of b6b873d2ad from master
2014-05-17 13:31:09 -04:00
Shai Berger b7a67b788c [1.7.x] Fixed storing of binary fields and unicode textfields for Oracle/Python3
Backport of 6bb6df2943 from master
2014-05-17 01:16:06 +03:00
Aymeric Augustin 62de03ee33 [1.7.x] Optimized make_aware/naive by removing redundant checks. Refs #22625.
Also added tests with pytz and removed misplaced tests.

Backport of 1109ebd from master
2014-05-16 23:14:13 +02:00
Aymeric Augustin 6f8301d6cd [1.7.x] Fixed #22625 -- Normalized make_aware/naive errors.
Also added tests for is/make_aware/naive.

Thanks Tom Michaelis for the report.

Backport of fa89acf from master
2014-05-16 22:54:21 +02:00
Stas Rudakou 75d2da797e [1.7.x] Fixed #22266 - quote PK before redirecting away from add_view (django.contrib.admin)
Backport of ebd70d4d00 from master.
2014-05-16 18:38:26 +02:00
Erik Romijn 2a66d12e77 [1.7.x] Fixed #22579 -- Corrected validation for email to reject trailing slash
Backport of 424fe76349 from master.
2014-05-16 15:19:21 +02:00
Stephen Burrows 79f15ab1ef [1.7.x] Fixed #22628 -- Took initial forms into account when combining FormSet.min_num and FormSet.extra. 2014-05-16 06:37:05 -04:00
mbacho 6f0dcec44c [1.7.x] Fixed typo in multipartparser.py
Backport of 8a9d54aa69 from master
2014-05-16 05:35:28 -04:00
Claude Paroz e8a7436941 [1.7.x] Harmonized some PEP 0263 coding preambles
Backport of e520a73ee from master.
2014-05-15 20:01:31 +02:00
Anders Steinlein 2914f66983 [1.7.x] Fixed #17642 -- Added min_num support to modelformsets, inlines, and the admin.
Thanks Stephen Burrows for work on the patch as well.
2014-05-15 07:02:06 -04:00
Collin Anderson 93d5b0d5b6 [1.7.x] typo: urlaprse -> urlparse
Backport of 8a2f04db91 from master
2014-05-15 06:36:14 -04:00
Jacob Kaplan-Moss 95cf17244c Bumped version number for release. 2014-05-14 18:45:54 +02:00
Erik Romijn e7b0cace45 [1.7.x] Added additional checks in is_safe_url to account for flexible parsing.
This is a security fix. Disclosure following shortly.
2014-05-14 10:18:27 +02:00
Aymeric Augustin 7fef18ba9e [1.7.x] Dropped fix_IE_for_vary/attach.
This is a security fix. Disclosure following shortly.
2014-05-14 10:18:26 +02:00
Claude Paroz 9d0ebceb32 [1.7.x] Fixed #21685 -- Displayed app verbose name in admindocs model index
Backport of 4cf82e5bcf from master.
2014-05-10 18:10:05 +02:00
Aymeric Augustin e9d0ef19bc [1.7.x] Fixed #22508 -- Avoided overwriting select_related.
Previously, known related objects overwrote related objects loaded
though select_related. This could cancel the effect of select_related
when it was used over more than one level.

Thanks boxm for the bug report and timo for bisecting the regression.

Backport of f574220f from master
2014-05-10 17:03:42 +02:00
Aymeric Augustin c54fb3d922 [1.7.x] Adjusted refactoring of vendor checks.
Thanks Shai for the thorough review.

Backport of fb90b7c from master
2014-05-10 14:55:22 +02:00
Stephen Burrows 0c198035e9 [1.7.x] Fixed #22502 -- Fixed microseconds/default/form interaction
Made explicit lack of microsecond handling by built-in datetime form
fields. Used that explicitness to appropriately nix microsecond
values in bound fields. Thanks Claude Paroz for the review.
Backport of a5de0df58 from master.
2014-05-10 10:58:51 +02:00
Malcolm Box 8a090c21f1 [1.7.x] Fixed #22606 -- Locmemcache has_key() failed for infinite cache expiry
Refactored cache expiry logic for Locmemcache to make consistent across
all places where accessed, and correctly handle None as expiry time.
Backport of 66880e4cd from master.
2014-05-09 19:47:43 +02:00
Andrew Godwin 1e8b1db050 [1.7.x] Fixed #22325: Ignore __first__ dependencies to your own app 2014-05-08 21:39:31 -07:00
Andrew Godwin 4535dedc42 [1.7.x] Fixed #22563: Ignore AUTH_USER_MODEL errors in from_state 2014-05-08 21:34:57 -07:00