Commit Graph

15157 Commits

Author SHA1 Message Date
Jacob Kaplan-Moss 27cf7ec864 Master is now pre-1.7. 2013-06-28 08:56:45 -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
Tim Graham e161e4ff11 Clarified get_list_or_404 docs, refs #14150. 2013-06-24 07:00:53 -04:00
Baptiste Mispelon 299983616f Fixed #20644 -- Add ModelFormMixin.fields to the CBV flattened index
Thanks to Tim Graham for the report and review.
2013-06-24 11:59:08 +02:00
Baptiste Mispelon cd000dacc7 Fixed #20643 -- Fixed implementation of JSONResponseMixin in CBV docs
Thanks to Michal Sládek for the report and initial patch,
and to loic84 for the review.
2013-06-24 11:55:43 +02:00
Simon Meers 6466a0837b Corrected minor typos in FileUploadHandler.receive_data_chunk docs. 2013-06-24 13:59:03 +10:00
SusanTan b0907d66a5 Fixed #20524 - Described keywords in triaging contrib doc. 2013-06-23 15:41:24 -04:00
Baptiste Mispelon bd9fbd1497 Fixed errors and inconsistencies in CBV topic documentation.
The code examples should now work correctly.
The `get_context_data` method in the examples was changed when
necessary to adopt a singular style (get context with super(...),
add the extra keys to the dict then return it).

Thanks to Remco Wendt for the initial report and to Tim Graham
for the review.
2013-06-23 00:18:23 +02:00
Remco Wendt 338ec9333d Fixed a very old email address of mine still lingering in the AUTHORS file 2013-06-23 00:18:23 +02:00
Ramiro Morales 1559f84d8b Fixed #20311 -- Make sure makemessages doesn't create duplicate Plural-Forms .po file headers.
Thanks naktinis for the report and initial patch.
2013-06-22 18:45:41 -03:00
Simon Charette ecf63d5d89 Added missing `versionadded` for `FormMixin.prefix`. 2013-06-22 16:49:24 -04:00
Andrew Godwin 864613c7e0 Merge pull request #1295 from LuRsT/fix_sqlite_convert_values_20587
Fixed #20587 -- Made convert_values handle None values
2013-06-22 06:10:33 -07:00
Gilberto Gonçalves 680b512fc1 Fixed #20587 -- Made convert_values handle None values 2013-06-22 14:05:12 +01:00
Marc Tamlyn 257a137c43 Merge pull request #1294 from LuRsT/added_prefix_to_form_mixin
Fixed #18872 -- Added prefix to FormMixin
2013-06-22 04:19:24 -07:00
Gilberto Gonçalves ef37b23050 Fixed #18872 -- Added prefix to FormMixin
Thanks @ibustama for the initial patch and dragonsnaker for opening the
report.
2013-06-22 12:12:43 +01:00
Claude Paroz ef79582e86 Fixed 17478 -- Allowed queryset overriding in BaseModelFormSet init
BaseModelFormSet.forms is now a cached property instead of being
populated in the __init__ method. This behaviour also matches an
example in the documentation.
Thanks Thomasz Swiderski for the report and Simon Charette for the
review.
2013-06-22 09:29:37 +02:00
Tim Graham 9be93aa809 Fixed #20634 - Corrected doc mistake re: staticfiles finders strategy.
Thanks claudep for the catch and bmispelon for the research.
2013-06-21 14:57:12 -04:00
James Bennett ba610cb319 Fixed #19881 -- Documented that get_next/previous_by_FOO uses default manager. 2013-06-21 13:14:05 -04:00
Baptiste Mispelon b53ed5ac55 Fixed #20612 -- Fixed incorrect wording in CBV documentation
Thanks to ndokos for the report.
2013-06-21 17:50:43 +02:00
Oliver Beattie 552a90b444 Fixed #20290 -- Allow override_settings to be nested
Refactored override_settings to store the underlying settings._wrapped
value seen at runtime, not instantiation time.
2013-06-21 16:57:47 +02:00
Tim Graham 7314007c5b Fixed #19319 -- Updated example httpd.conf for Apache 2.4
Thanks colinnkeenan@ for the report.
2013-06-20 13:34:02 -04:00