1
0
mirror of https://github.com/django/django.git synced 2025-03-13 19:00:45 +00:00

15025 Commits

Author SHA1 Message Date
Tim Graham
5ecdf0eb9c [1.6.x] A couple more semicolon -> colon fixes; refs #18134.
Backport of 3632d289de from master.
2013-07-02 14:16:22 -04:00
Tim Graham
4c1029971e [1.6.x] Fixed a couple form/formset deprecation warnings in tests.
Backport of a521d10322 from master.
2013-07-01 09:38:29 -04:00
Tim Graham
3c51962cab [1.6.x] Updated tests for deprecation of Option.get_(add|change|delete)_permission.
refs #20642.

Backport of a6a905c619 from master.
2013-07-01 09:21:07 -04:00
Baptiste Mispelon
e03a88ba21 [1.6.x] Fixed #20659 -- Fixed PublisherDetail in CBV topic documentation.
Backport of 88de53d4a86548016f245a1413b856aa334bc737 from master.
2013-07-01 14:10:03 +02:00
Aymeric Augustin
0de21a6a7a Stopped branding Python 3 support as experimental. 2013-07-01 11:52:00 +02:00
Aymeric Augustin
c1d8f3b207 Updated FAQ on Python versions to explain 2 vs 3.
Required the latest version for each Python series to minimize
bookkeeping in the future.
2013-07-01 11:48:58 +02:00
Tim Graham
3493f18d78 [1.6.x] Fixed #20667 - Removed discussion of DEBUG from tutorial.
Backport of 0d642aac86 from master.
2013-06-30 14:56:10 -04:00
Aymeric Augustin
02976a46c9 [1.6.x] Introduced getters for connection.autocommit and .needs_rollback.
They ensure that the attributes aren't accessed in conditions where they
don't contain a valid value.

Fixed #20666.

Backport of dd9c6bc359a799fcbed647055b596239956a472a from master.
2013-06-30 16:29:57 +02:00
Aymeric Augustin
d255004289 [1.6.x] Stopped calling loaddata with commit=False.
This was a stealth option only used by the tests, and it isn't useful
any more since `atomic` provides nested transactions.

Backport of 2c40681 from master.
2013-06-30 14:20:29 +02:00
Tim Graham
b930733a67 [1.6.x] Fixed #20677 - Typos in generic_inlineformset_factory docs.
Thanks Riley Strong for the report.

Backport of 3fd0ee5b46 from master
2013-06-29 14:16:36 -04:00
Claude Paroz
59be2c6875 [1.6.x] Fixed #18592 -- Prevented crash when accessing MySQL _last_executed
Thanks reames at asymmetricventures.com for the report.
Backport of 59b0c48ce from master.
2013-06-29 18:48:05 +02:00
Claude Paroz
a9b5a1e506 [1.6.x] Do not allow FileSystemStorage.delete to receive an empty name
Refs #20660.
Backport of 7fbab3eba from master.
2013-06-29 18:12:23 +02:00
Claude Paroz
b6aed803b2 [1.6.x] Fixed #20660 -- Do not try to delete an unset FieldFile
Thanks stanislas.guerra at gmail.com for the report and
Baptiste Mispelon for the review.
Backport of ea3fe78a9d from master.
2013-06-29 18:11:51 +02:00
Florian Apolloner
c55cb6fa45 [1.6.x] Removed comment from setup.cfg which broke newer wheel versions.
Backport of b5f709e6f4c67020bedb141b9b18c5cd1e05f829 from master.
2013-06-29 16:28:52 +02:00
Aymeric Augustin
6908b65939 [1.6.x] Removed obsolete comment. Refs #20079.
Thanks Gavin Wahl.
2013-06-29 11:43:41 +02:00
Florian Apolloner
7bd9c32f14 [1.6.x] Fixed 1.6 release notes.
Backport of adc6f38867dd5b57c9e1c50395eec01f6bdd651f from master.
2013-06-29 10:52:11 +02:00
Simon Charette
e628753e7d [1.6.x] Added missing deprecation note for model permission methods.
refs #20642.

Backport of e1dd24d2f from master.
2013-06-28 15:49:40 -04:00
Claude Paroz
dc99128343 [1.6.x] Updated FAQ to reflect official Python 3 support
Backport of 8809da67a from master.
2013-06-28 16:39:50 +02:00
Claude Paroz
ec2a102d84 [1.6.x] Updated FAQ entry about python 3
Backport of 94f420ef4 from master.
2013-06-28 16:28:02 +02:00
Jacob Kaplan-Moss
70f2d9aaff Updated version numbers and setup.py for 1.6beta. 1.6b1 2013-06-28 08:15:10 -05:00
Baptiste Mispelon
5caced89e0 Fixed missing slash in reusable apps tutorial. 2013-06-28 09:43:14 +02:00
Shai Berger
d097417025 Support 'pyformat' style parameters in raw queries, Refs #10070
Add support for Oracle, fix an issue with the repr of RawQuerySet,
add tests and documentations. Also added a 'supports_paramstyle_pyformat'
database feature, True by default, False for SQLite.

Thanks Donald Stufft for review of documentation.
2013-06-28 06:59:10 +03:00
Tim Graham
7c0b72a826 Prevented running some admin_view tests twice. 2013-06-27 20:13:42 -04:00
Tim Graham
534ced5aad Fixed #20664 -- Fixed a bug with raw_id_fields on Python 3.
Thanks jefftriplett for the report.
2013-06-27 19:39:20 -04:00
Aymeric Augustin
c1284c3d3c Fixed #20571 -- Added an API to control connection.needs_rollback.
This is useful:
- to force a rollback on the exit of an atomic block without having to
  raise and catch an exception;
- to prevent a rollback after handling an exception manually.
2013-06-27 22:19:54 +02:00
Marc Tamlyn
88d5f32195 Merge pull request #1312 from kenbolton/klb/docs
Fix typo
2013-06-27 09:46:10 -07:00
Ken Bolton
6fcb7ba842 Fix typo 2013-06-27 12:39:50 -04:00
Andrew Godwin
f325f86971 Fixed #20244: PermissionsMixin now defines a related_query_name for M2Ms 2013-06-27 15:44:22 +01:00
Andrew Godwin
12cb0df10f Docs for related_query_name 2013-06-27 15:44:22 +01:00
Andrew Godwin
b21e96d00d Merge pull request #1311 from loic/ticket20619_take2
Fixed missing initializations in WSGIRequest. Refs #20619
2013-06-27 07:44:09 -07:00
Claude Paroz
8db264cbc8 Fixed LOGGING setting docs 2013-06-27 16:29:26 +02:00
Andrew Godwin
99b467f272 Add related_query_name to ForeignKey/M2M. Refs #20244 2013-06-27 14:44:21 +01:00
Andrew Godwin
e26b589b8c Fixed #20590: Documented new test case ordering 2013-06-27 14:02:00 +01:00
Anton Baklanov
cab333cb16 Fixed #20541 -- don't raise db signals twice when creating superuser 2013-06-27 05:58:01 -04:00
Baptiste Mispelon
5005303ae7 Fixed #20665 -- Missing backslash in sitemaps documentation
Thanks to roman for the report.
2013-06-27 09:42:09 +02:00
Simon Charette
d17d60d38d Merge pull request #1309 from treyhunner/patch-1
Add missing preposition in documentation.
2013-06-26 10:27:33 -07:00
Trey Hunner
2ec54e7fbc Add missing preposition in documentation 2013-06-26 10:25:34 -07:00
Tim Graham
1184d07789 Fixed #14881 -- Modified password reset to work with a non-integer UserModel.pk.
uid is now base64 encoded in password reset URLs/views. A backwards compatible
password_reset_confirm view/URL will allow password reset links generated before
this change to continue to work. This view will be removed in Django 1.7.

Thanks jonash for the initial patch and claudep for the review.
2013-06-26 13:11:47 -04:00
Tim Graham
b6a87f5c93 Merge pull request #1308 from loic/ticket20462
Fixed #20462 - Replaced the str() cast introduced in 273dc55 by force_text()
2013-06-26 08:27:10 -07:00
Loic Bistuer
a9ea7d8c70 Fixed #20462 - Replaced the str() cast introduced in 273dc55 by force_text() 2013-06-26 21:30:58 +07:00
Andrew Clark
273dc550a4 Fixed #20462 -- null/non-string regex lookups are now consistent
Thanks to noirbizarre for the report and initial patch.
2013-06-26 08:13:26 -04:00
Loic Bistuer
c6862d57c1 Fixed #20658 -- Fixed bad reST formatting and missing parentheses in the docs for CBV mixins
Thanks to Keryn Knight for the report.
2013-06-26 14:07:52 +02:00
Loic Bistuer
48ce167d89 Fixed missing initializations in WSGIRequest. Refs #20619 2013-06-26 14:36:25 +07:00
Baptiste Mispelon
ec371ace00 Fixed #20650 -- Fixed {% filter %} incorrectly accepting 'escape' as argument
Thanks to grzesiof for the report and to loic84 and Alex Gaynor
for the review.
2013-06-25 20:28:35 +02:00
Simon Charette
b91787910c Fixed #20642 -- Deprecated Option.get_(add|change|delete)_permission.
Those methods were only used by `contrib.admin` internally and exclusively
related to `contrib.auth`. Since they were undocumented but used
in the wild the raised deprecation warning point to an also undocumented
alternative that lives in `contrib.auth`.

Also did some PEP8 and other cleanups in the affected modules.
2013-06-25 12:22:37 -04:00
Javier Mansilla
f819bef3dc Fixed #19773 - Added admin/popup_response.html template.
Thanks jimmylam@ for the suggestion.
2013-06-25 11:20:41 -04:00
Tim Graham
e10757ff4d Doc cleanup for FormMixin.prefix; refs #18872. 2013-06-25 07:50:43 -04:00
Daniel Izquierdo
9a2b07f1b4 Fixed #20654 -- Fixed type of m2m_changed's pk_set arg in docs 2013-06-25 09:46:17 +02:00
Russell Keith-Magee
0346563939 Fixed #20653 -- Renamed checksetup management command.
This is to allow future compatibility with work that is ongoing in the 2013 GSoC.
2013-06-25 09:37:54 +08:00
Aymeric Augustin
5a6f12182e Fixed #20636 -- Stopped stuffing values in the settings.
In Django < 1.6, override_settings restores the settings module that was
active when the override_settings call was executed, not when it was
run. This can make a difference when override_settings is applied to a
class, since it's executed when the module is imported, not when the
test case is run.

In addition, if the settings module for tests is stored alongside the
tests themselves, importing the settings module can trigger an import
of the tests. Since the settings module isn't fully imported yet,
class-level override_settings statements may store a reference to an
incorrect settings module. Eventually this will result in a crash during
test teardown because the settings module restored by override_settings
won't the one that was active during test setup.

While Django should prevent this situation in the future by failing
loudly in such dubious import sequences, that change won't be backported
to 1.5 and 1.4. However, these versions received the "allowed hosts"
patch and they're prone to "AttributeError: 'Settings' object has no
attribute '_original_allowed_hosts'". To mitigate this regression, this
commits stuffs _original_allowed_hosts on a random module instead of the
settings module.

This problem shouldn't occur in Django 1.6, see #20290, but this patch
will be forward-ported for extra safety.

Also tweaked backup variable names for consistency.

Forward port of 0261922 from stable/1.5.x.

Conflicts:
	django/test/utils.py
2013-06-24 20:43:44 +02:00