mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 03:25:58 +00:00
Code Issues 30 Releases Wiki Activity
19,948 Commits 28 Branches 426 Tags 668 MiB
1feeefe918
Commit Graph

19948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Angeletti
1feeefe918 [1.8.x] Fixed #24376 -- added verbose_name arg to UUIDField 
Backport of ea3168dc6c from master
 2015-02-21 14:26:47 -05:00
Aymeric Augustin
481d3bd617 [1.8.x] Removed obsolete reference to media directory. 
Backport of 787dd6519a from master
 2015-02-21 13:08:15 -05:00
Aymeric Augustin
82e323167d [1.8.x] Removed workaround for SVN limitations. 
In addition to simplifying the code, this reduces the number of writes.

Backport of bd059e3f8c from master
 2015-02-21 13:07:59 -05:00
Aymeric Augustin
de3bda9cd3 [1.8.x] [1.8.x] Avoided collecting admin static files in tests. 
This makes the staticfiles tests 2.5 times faster.

Backport of 2bb5b0e098 from master

Backport of bd059e3f8c from master
 2015-02-21 13:07:42 -05:00
Aymeric Augustin
5c02c75068 [1.8.x] Removed TestServeAdminMedia. 
It should have been removed when the ADMIN_MEDIA_PREFIX setting was deprecated.

Backport of 1d9d39fa1c from master
 2015-02-21 13:05:11 -05:00
Loic Bistuer
850b2ca794 Removed zombie file again. 
Refs 5355baf6c7.
 2015-02-21 22:34:00 +07:00
Loic Bistuer
1b73c764d4 Fixed a couple of allow_migrate routers in tests. 
This reverts commit 88e6fbb2e3.
 2015-02-21 21:44:05 +07:00
Don Kirkby
5131aec7d2 [1.8.x] Fixed typo in django/db/models/fields/files.py comment. 
Backport of 99a1bbf985 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 1d1d5d1c31 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
Tim Graham
88e6fbb2e3 Silenced a deprecation warning in commands_sql test. 2015-02-20 13:24:29 -05:00
Tim Graham
5355baf6c7 Removed an inadvertently added test directory. 2015-02-20 13:16:42 -05:00
Anssi Kääriäinen
6f03a4ca91 [1.8.x] Fixed #24328 -- cleaned up Options._get_fields() implementation 
Backport of bad5f262bf 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 bed504d70b from master
 2015-02-20 21:55:50 +07:00
Andrei Kulakov
564487601e [1.8.x] Fixed #23932 -- Added how-to on migrating unique fields. 
Backport of 1f9e44030e from master
 2015-02-20 21:53:15 +07:00
Tim Graham
18dceab05b [1.8.x] Fixed typo in path to is_safe_url() 
Backport of dd0b487872 from master
 2015-02-20 09:22:17 -05: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 4755f8fc25 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 e467919c63 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
Shai Berger
e2a3be1e4d [1.8.x] Fixed #24362: Made test run each migration operation in its own schema editor 
Thanks Tim Graham for pointing out the fix.

Backport of f7d34fe from master ticket_24362
 2015-02-18 22:51:06 +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 15dc8d1c9d 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 e9282747a4 from master
 2015-02-18 10:24:40 -05:00
Tim Graham
5068a51d88 [1.8.x] Refs #24324 -- Skipped fixtures_regress tests that fail on Python 2 on a non-ASCII path. 
Backport of b8d6cdbcc9 from master
 2015-02-18 07:36:02 -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 098fa12dd3 from master
 2015-02-18 07:35:56 -05:00
Tim Graham
2aa06e439a [1.8.x] Refs #24324 -- Fixed Python 2 test failures when path to Django source contains non-ASCII characters. 
Backport of 307c0f299a from master
 2015-02-17 19:05:31 -05:00
Tim Graham
09da1b465e [1.8.x] Refs #24324 -- Fixed UnicodeDecodeError in MigrationWriter on Python 2. 
Backport of fa66ea7532 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 bebc1e53a3 from master
 2015-02-17 18:45:07 -05:00
Tim Graham
ec9119d4ec [1.8.x] Fixed "environment can only contain strings" in model_regress test on Windows. 
Backport of ad50b6c853 from master
 2015-02-17 13:55:18 -05:00
Tim Graham
e4df10668c [1.8.x] Added an import to docs/topics/testing/advanced.txt example. 
Backport of 32b67b3fd1 from master
 2015-02-17 13:53:57 -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 bad6280c4e 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 c9ece2e6b9 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 63c5c98701 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 81a94cc616 from master
 2015-02-17 08:08:28 -05:00
Tim Graham
b2f7daa4a6 [1.8.x] Refs #24324 -- Fixed UnicodeDecodeError in model_regress test on non-ASCII path. 
Backport of d316b43d0a from master
 2015-02-17 07:35:00 -05:00
Tim Graham
bcb3bfa5a2 [1.8.x] Refs #24324 -- Fixed management command discovery on non-ASCII paths. 
Backport of 4a0aeac1b5 from master
 2015-02-17 07:29:30 -05:00
Tim Graham
a00a0f8804 [1.8.x] Fixed #24290 -- Skipped postgres_tests if not running with PostgreSQL. 
Backport of 8b39f33d78 from master
 2015-02-17 06:35:17 -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 3adc5f1ee6 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 a73c8540a8 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 28e97a9bdc from master
 2015-02-17 06:21:24 -05:00
Preston Timmons
2b79a35a83 [1.8.x] Removed unnecessary __init__ definition from DebugLexer. 
Backport of ad9ecc2c20 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 664c038f2c from master
 2015-02-16 18:06:13 -05:00
Tim Graham
fb9551189d [1.8.x] Fixed #24350 -- Freshened up database install topic section. 
Backport of 35f0cae19d from master
 2015-02-16 14:59:57 -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 4538cbf17d from master
 2015-02-16 14:55:24 -05:00
Markus Holtermann
906d682ba0 Fixed regression in test introduced in d538e37e1b 2015-02-16 20:38:18 +01:00
Tim Graham
50ec49c087 [1.8.x] Removed a note about old versions of MySQLdb. 
Backport of f3bc7c5447 from master
 2015-02-16 14:29:30 -05:00
Sergey Fedoseev
870d900cdc [1.8.x] Refs #24299 -- Made contenttypes migrations signal handler more robust. 
Backport of d392c1e150 from master
 2015-02-16 13:44:04 -05:00