1
0
mirror of https://github.com/django/django.git synced 2025-04-08 23:46:43 +00:00

12084 Commits

Author SHA1 Message Date
Don Kirkby
5131aec7d2 [1.8.x] Fixed typo in django/db/models/fields/files.py comment.
Backport of 99a1bbf9853e0b06385d7f221a90828e6c060132 from master
2015-02-20 20:11:58 -05:00
foresmac
3207fcd0a0 [1.8.x] Fixed #24341 -- Added specific error messages to RangeField subclasses
Backport of 1d1d5d1c315e0e58f02a7f2a07b56ed20b09c087 from master
2015-02-20 16:50:41 -05:00
Aymeric Augustin
e4e140c49b [1.8.x] Removed a non-obvious side-effect of assigning Context.template.
Explicit is better than implicit.

Backport of 51b606f from master
2015-02-20 22:28:24 +01:00
Anssi Kääriäinen
6f03a4ca91 [1.8.x] Fixed #24328 -- cleaned up Options._get_fields() implementation
Backport of bad5f262bf4a17f157808ec1aa225ba9c94c1eee from master
2015-02-20 13:11:59 -05:00
Loic Bistuer
3a6c37fce4 [1.8.x] Fixed #24351, #24346 -- Changed the signature of allow_migrate().
The new signature enables better support for routing RunPython and
RunSQL operations, especially w.r.t. reusable and third-party apps.

This commit also takes advantage of the deprecation cycle for the old
signature to remove the backward incompatibility introduced in #22583;
RunPython and RunSQL won't call allow_migrate() when when the router
has the old signature.

Thanks Aymeric Augustin and Tim Graham for helping shape up the patch.

Refs 22583.

Conflicts:
	django/db/utils.py

Backport of bed504d70bede3431a213203c13a33905d6dbf77 from master
2015-02-20 21:55:50 +07:00
Marc Tamlyn
b6ef67d752 [1.8.x] Fixed #24373 -- Added run_validators to ArrayField.
Thanks to DavidMuller for the report.

Backport of c490e410af from master
2015-02-20 11:53:17 +00:00
Marc Tamlyn
3886338c1d [1.8.x] Update converters to take a consistent set of parameters.
As suggested by Anssi. This has the slightly strange side effect of
passing the expression to Expression.convert_value has the expression
passed back to it, but it allows more complex patterns of expressions.

Backport of 32d4db66b9 from master
2015-02-20 11:47:48 +00:00
Marc Tamlyn
c54d73ae01 [1.8.x] Fixed #24343 -- Ensure db converters are used for foreign keys.
Joint effort between myself, Josh, Anssi and Shai.

Conflicts:
	django/db/models/query.py
	tests/model_fields/models.py

Backport of 4755f8fc25331c739a6f932cc8aba0cc9e62e352 from master.
2015-02-20 11:46:57 +00:00
Alex Vidal
82f39bfb1a [1.8.x] Fixed typo in django.core.servers.basehttp message.
Backport of e467919c6315be87abec72383ec1a81e2665ebec from master
2015-02-19 19:37:22 -05:00
Aymeric Augustin
cc4effba0b [1.8.x] Set context.template instead of context.engine while rendering.
This opens more possibilities, like accessing context.template.origin.

It also follows the chain of objects instead of following a shortcut.

Backport of 1bfcc95 from master
2015-02-19 22:10:56 +01:00
Claude Paroz
84e7fec88d [1.8.x] Fixed #20889 -- Prevented BadHeaderError when Python inserts newline
Workaround for http://bugs.python.org/issue20747.
In some corner cases, Python 2 inserts a newline in a header value
despite `maxlinelen` passed in Header constructor.
Thanks Tim Graham for the review.
Backport of efb1f99f94 from master.
2015-02-19 20:19:38 +01:00
Shai Berger
66d37e593c [1.8.x] Fixed #24307: Avoided redundant column nullability modifications on Oracle
Thanks Joris Benschop for the report, and Tim Graham for the tests.

Backport of ceadc94f09 from master
2015-02-19 02:44:08 +02:00
Marten Kenbeek
84c9b24c5a [1.8.x] Fixed #24291 - Fixed migration ModelState generation with unused swappable models
Swapped out models don't have a _default_manager unless they have
explicitly defined managers. ModelState.from_model() now accounts for
this case and uses an empty list for managers if no explicit managers
are defined and a model is swapped out.

Backport of 15dc8d1c9d3697170a2c59ecaa7a2b4ba58f5990 from master
2015-02-18 19:11:51 +01:00
Adam Chainz
4abadc4872 [1.8.x] Removed unused foreign_key_re variables in MySQL/Oracle DB backends
Backport of e9282747a4ba99adc7e0f677b3a897830df51732 from master
2015-02-18 10:24:40 -05:00
Tim Graham
1153bccc1b [1.8.x] Refs #24324 -- Fixed crash in {% debug %} tag on Python 2.
If Django is installed in a path that contains non-ASCII characters,
the tag failed with UnicodeDecodeError.

Backport of 098fa12dd390e733c7568d824eea2c346550c75a from master
2015-02-18 07:35:56 -05:00
Tim Graham
09da1b465e [1.8.x] Refs #24324 -- Fixed UnicodeDecodeError in MigrationWriter on Python 2.
Backport of fa66ea75326e669cd3d51fb926a4364b8ba08959 from master
2015-02-17 18:50:15 -05:00
Tim Graham
f9a99c410e [1.8.x] Refs #24324 -- Fixed UnicodeDecodeError in template_backends tests
The message for the SuspiciousFileOperation exception needs to
be a unicode string.

Backport of bebc1e53a3ab059849e5c4e5a55b2f5e68b67169 from master
2015-02-17 18:45:07 -05:00
Tim Graham
a1fa0135ec [1.8.x] Refs #24324 -- Fixed get_app_template_dirs() UnicodeDecodeError on Python 2.
The function implemented most of upath(), but skipped the check for
strings that are already unicode.

Backport of bad6280c4e3f75f3ccd27f8fd85a4043bb296128 from master
2015-02-17 08:24:36 -05:00
Tim Graham
ba3a7636f1 [1.8.x] Refs #24324 -- Fixed UnicodeDecodeError in makemigrations.
If the project path contained a non-ASCII character, Python 2 crashed.

Backport of c9ece2e6b9365fa4be16bd0de25dd7b68c8dc97e from master
2015-02-17 08:14:01 -05:00
Tim Graham
4f43e5c435 [1.8.x] Refs #24324 -- Fixed UnicodeEncodeError in SQLite backend while testing.
If 'name' contained non-ASCII characters, the comparison raised a
UnicodeEncodeError on Python 2.

Backport of 63c5c9870129f6b81358c1ed7ed2392bbc46f77d from master
2015-02-17 08:11:38 -05:00
Tim Graham
9dba901d9c [1.8.x] Refs #24324 -- Fixed makemessages crash when Django is installed in a non-ASCII path.
Backport of 81a94cc616ab80decaa495cfa1c0c623527fc0e7 from master
2015-02-17 08:08:28 -05:00
Tim Graham
bcb3bfa5a2 [1.8.x] Refs #24324 -- Fixed management command discovery on non-ASCII paths.
Backport of 4a0aeac1b5cfb7b6229a01119a596afb38d8a2a0 from master
2015-02-17 07:29:30 -05:00
Tim Graham
730fb593ad [1.8.x] Fixed #24335 -- Bumped required psycopg2 version to 2.4.5 (2.5 for contrib.postgres).
Backport of 3adc5f1ee6618a615db07d4a868b366a15c39f82 from master
2015-02-17 06:21:59 -05:00
Aymeric Augustin
d027993ed1 [1.8.x] Removed 'autocommit' options for the psycopg2 backend.
It was documented as not having any effect since Django 1.6.

Backport of a73c8540a888021feb640abefa936a76e21b6a1a from master
2015-02-17 06:21:37 -05:00
Aymeric Augustin
30e5356c2e [1.8.x] Cleaned up init_connection_state in the psycopg2 backend.
settings_dict['TIME_ZONE'] is set in ConnectionHandler.ensure_defaults.

Backport of 28e97a9bdc6c672a1304570aa75f6311fb1112e2 from master
2015-02-17 06:21:24 -05:00
Preston Timmons
2b79a35a83 [1.8.x] Removed unnecessary __init__ definition from DebugLexer.
Backport of ad9ecc2c209df3a48fc607f886d57f77ef972546 from master
2015-02-16 18:06:53 -05:00
Tim Graham
ad2c6a756b [1.8.x] Moved contrib.contenttypes tests out of contrib.
Backport of 664c038f2c5b56d1ce929243d29cd4e11ea5f9ea from master
2015-02-16 18:06:13 -05:00
Tim Graham
77e3f7dd58 [1.8.x] Fixed #24299 -- Added an auth migration to ensure contenttypes is migrated.
Without this migration, the auth signal handlers will fail if migrating
only auth.

Backport of 4538cbf17d4391cda22d76bc6ac69f228f7400f2 from master
2015-02-16 14:55:24 -05:00
Sergey Fedoseev
870d900cdc [1.8.x] Refs #24299 -- Made contenttypes migrations signal handler more robust.
Backport of d392c1e150a46aca72e37263c44c034d92a79f79 from master
2015-02-16 13:44:04 -05:00
Markus Holtermann
a1ba462793 [1.8.x] Fixed #24225, #24264, #24282 -- Rewrote model reloading in migration project state
Instead of naively reloading only directly related models (FK, O2O, M2M
relationship) the project state needs to reload their relations as well
as the model changes as well. Furthermore inheriting models (and super
models) need to be reloaded in order to keep inherited fields in sync.

To prevent endless recursive calls an iterative approach is taken.

Backport of b29f3b51204d53c1c8745966476543d068c173a2 from master
2015-02-16 19:38:02 +01:00
Markus Holtermann
681efedce4 [1.8.x] Explicitly checked for LookupError in contenttypes migration
Backport of 4dd1f4c5eb7a617c1ee512e7a7c732d530e13916 from master
2015-02-16 17:14:33 +01:00
Aymeric Augustin
e8950668ca [1.8.x] Deprecated TEMPLATE_DEBUG setting.
Backport of 15b711b from master.
2015-02-15 20:48:48 +01:00
Michael Angeletti
e13dca859c [1.8.x] Added missing return value to DurationField.prepare_value(); refs #24339.
Backport of 49647bec6e86b8d3d370ea1d8a80423185502c5a from master
2015-02-14 18:39:17 -05:00
Aymeric Augustin
87e9cad4a4 [1.8.x] Fixed #24318 -- Set the transaction isolation level with psycopg >= 2.4.2.
Backport of 76356d96 from master
2015-02-14 18:52:28 +01:00
Michael Angeletti
2e6d8e51db [1.8.x] Fixed #24339 -- Fixed crash with empty DurationField form field.
Backport of 8a21d250334f56845f255be5534b01d8c6eda314 from master
2015-02-14 07:38:20 -05:00
Aymeric Augustin
0f3eb8260b [1.8.x] Fixed #24338 -- Accepted Template wrapper in {% extends %}.
Explicitly checking for django.template.Template subclasses is
preferrable to duck-typing because both the django.template.Template and
django.template.backends.django.Template have a render() method.

Thanks spectras for the report.

Backport of 47ee7b48 from master
2015-02-14 10:36:44 +01:00
Loic Bistuer
20b621eb3c [1.8.x] Fixed #24289 -- Reversed usage of Field.many_to_one and one_to_many.
Thanks Carl Meyer and Tim Graham for the reviews and to all involved
in the discussion.

Backport of 18c0aaa9123579375294fcc4a8ee7e3530176b88 from master
2015-02-14 02:42:06 +07:00
Andriy Sokolovskiy
136edac897 [1.8.x] Fixed #24320 - Used field.value_to_string() in serialization of foreign key.
This fixes serialization of a ForeignKey to a UUIDField as the
test indicates.

Backport of 5c995dcfc251b55284e1ef16545acd2acad6be04 from master
2015-02-13 12:45:35 -05:00
Tim Graham
2347f3267f [1.8.x] Fixed #24315 -- Fixed auth.views.password_reset_confirm() with a UUID user.
Backport of 002425fe39f62faafaa32e400f7531809181a1a0 from master
2015-02-13 09:57:44 -05:00
Tim Graham
8fc4840289 [1.8.x] Fixed #24334 -- Allowed admin password reset to work with non-digit custom user model primary key.
Thanks Loic for help and Simon for review.

Backport of fdf20093e0f8cd064673aa1597c20727ed4dd2a0 from master
2015-02-13 09:50:55 -05:00
Markus Holtermann
bd80fa6b0f [1.8.x] Fixed #24184 -- Prevented automatic soft-apply of migrations
Previously Django only checked for the table name in CreateModel
operations in initial migrations and faked the migration automatically.
This led to various errors and unexpected behavior. The newly introduced
--fake-initial flag to the migrate command must be passed to get the
same behavior again. With this change Django will bail out in with a
"duplicate relation / table" error instead.

Thanks Carl Meyer and Tim Graham for the documentation update, report
and review.

Backport of f287bec5833d75750fa6368bc2802741b7924533 from master
2015-02-13 15:21:10 +01:00
Tim Graham
4c948c7c9d [1.8.x] Fixed #24332 -- Fixed contrib.sites create_default_site() when 'default' DATABASES is empty.
Backport of e8cf4f8abec87b9da6ed8e5c8cf833af9b27f4dd from master
2015-02-13 07:02:37 -05:00
Josh Smeaton
1784c326b1 [1.8.x] Fixed #24319 -- Added validation for UUID model field
Backport of de0241eb985c6dec978beda119fee353ef3e9604 from master
2015-02-13 10:01:06 +11:00
Tim Graham
03f4e2d909 [1.8.x] Fixed #24333 -- Fixed admin history view crash with non-integer slug.
Backport of d64baaef3b95abe9ae5d07317c9bf4df02cb8592 from master
2015-02-12 14:20:17 -05:00
Tim Graham
7b5aa20a28 [1.8.x] Fixed #17716 -- Prevented include('...', app_name='...') without a namespace.
Backport of 27eeb64a96ec6d3a05714ab6319b500a935706fb from master
2015-02-12 08:19:10 -05:00
Nik Nyby
0ab8ec4312 [1.8.x] Subclassed template.Node instead of Node for consistency.
Backport of 34ccb3cc038ac30b13a7243a3dbd9366c1119746 from master
2015-02-12 08:05:04 -05:00
Tim Graham
596564e808 [1.8.x] Fixed #24161 -- Stored the user primary key as a serialized value in the session.
This allows using a UUIDField primary key along with the JSON session
serializer.

Thanks to Trac alias jamesbeith for the report and Simon Charette
for the initial patch.

Backport of 0f7f5bc9e7a94ab91c2b3db29ef7cf000eff593f from master
2015-02-12 07:40:14 -05:00
Lukas Klein
1904022f91 [1.8.x] Fixed #24321 -- Improved utils.http.same_origin compliance with RFC6454
Backport of 93b3ef9b2e from master.
2015-02-12 09:01:59 +01:00
Josh Smeaton
a6ea62aeaf [1.8.x] Refs #14030 -- Improved expression support for python values
Backport of e2d6e14662d780383e18066a3182155fb5b7747b from master
2015-02-12 08:53:03 +11:00
Collin Anderson
343c087533 [1.8.x] Refs #14497 -- Handled empty readonly admin FileFields
Backport of 07cfe1bd822f4108b5029aef1615a17000d0b0dc from master
2015-02-11 13:01:25 -05:00