diff --git a/AUTHORS b/AUTHORS index ba1f4036e9..a7f12d6e48 100644 --- a/AUTHORS +++ b/AUTHORS @@ -204,6 +204,7 @@ answer newbie questions, and generally made Django that much better: Clint Ecker Nick Efford Marc Egli + Matt Deacalion Stevens eibaan@gmail.com David Eklund Julia Elman @@ -530,6 +531,7 @@ answer newbie questions, and generally made Django that much better: Leo Shklovskii jason.sidabras@gmail.com Mikołaj Siedlarek + Karol Sikora Brenton Simpson Jozko Skrablin Ben Slavin @@ -542,6 +544,7 @@ answer newbie questions, and generally made Django that much better: George Song sopel Leo Soto + Thomas Sorrel Wiliam Alves de Souza Don Spaulding Calvin Spealman diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 7882b21b9b..364aa10320 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -184,6 +184,7 @@ EMAIL_PORT = 25 EMAIL_HOST_USER = '' EMAIL_HOST_PASSWORD = '' EMAIL_USE_TLS = False +EMAIL_USE_SSL = False # List of strings representing installed apps. INSTALLED_APPS = () diff --git a/django/conf/locale/__init__.py b/django/conf/locale/__init__.py index df6ab07663..59927b2397 100644 --- a/django/conf/locale/__init__.py +++ b/django/conf/locale/__init__.py @@ -279,7 +279,7 @@ LANG_INFO = { 'bidi': False, 'code': 'lt', 'name': 'Lithuanian', - 'name_local': 'Lithuanian', + 'name_local': 'Lietuviškai', }, 'lv': { 'bidi': False, @@ -399,7 +399,7 @@ LANG_INFO = { 'bidi': False, 'code': 'sq', 'name': 'Albanian', - 'name_local': 'Albanian', + 'name_local': 'shqip', }, 'sr': { 'bidi': False, @@ -441,7 +441,7 @@ LANG_INFO = { 'bidi': False, 'code': 'th', 'name': 'Thai', - 'name_local': 'Thai', + 'name_local': 'ภาษาไทย', }, 'tr': { 'bidi': False, @@ -477,7 +477,7 @@ LANG_INFO = { 'bidi': False, 'code': 'vi', 'name': 'Vietnamese', - 'name_local': 'Vietnamese', + 'name_local': 'Tiếng Việt', }, 'zh-cn': { 'bidi': False, diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index 371f0af2ab..f8069f07d2 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:27+0200\n" +"POT-Creation-Date: 2013-06-11 18:44+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -699,11 +699,22 @@ msgstr "" msgid "Enter a list of values." msgstr "" -#: forms/forms.py:158 +#. Translators: This is the default suffix added to form field labels +#: forms/forms.py:90 +msgid ":" +msgstr "" + +#: forms/forms.py:159 #, python-format msgid "(Hidden field %(name)s) %(error)s" msgstr "" +#. Translators: If found as last label character, these punctuation +#. characters will prevent the default label_suffix to be appended to the label +#: forms/forms.py:525 +msgid ":?.!" +msgstr "" + #: forms/formsets.py:310 #, python-format msgid "Please submit %d or fewer forms." diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index 320d3267a7..3ffb85e6c6 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -266,10 +266,12 @@ class InlineAdminForm(AdminForm): yield InlineFieldset(self.formset, self.form, name, self.readonly_fields, model_admin=self.model_admin, **options) - def has_auto_field(self): - if self.form._meta.model._meta.has_auto_field: + def needs_explicit_pk_field(self): + # Auto fields are editable (oddly), so need to check for auto or non-editable pk + if self.form._meta.model._meta.has_auto_field or not self.form._meta.model._meta.pk.editable: return True - # Also search any parents for an auto field. + # Also search any parents for an auto field. (The pk info is propagated to child + # models so that does not need to be checked in parents.) for parent in self.form._meta.model._meta.get_parent_list(): if parent._meta.has_auto_field: return True diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 9c92f7ae9c..afc7cfc5bd 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -771,12 +771,10 @@ class ModelAdmin(BaseModelAdmin): Returns the preserved filters querystring. """ - # FIXME: We can remove that getattr as soon as #20619 is fixed. - match = getattr(request, 'resolver_match', None) - + match = request.resolver_match if self.preserve_filters and match: opts = self.model._meta - current_url = '%s:%s' % (match.namespace, match.url_name) + current_url = '%s:%s' % (match.app_name, match.url_name) changelist_url = 'admin:%s_%s_changelist' % (opts.app_label, opts.model_name) if current_url == changelist_url: preserved_filters = request.GET.urlencode() diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py index e0f43dfbfe..8abf49331b 100644 --- a/django/contrib/admin/sites.py +++ b/django/contrib/admin/sites.py @@ -439,6 +439,7 @@ class AdminSite(object): context = { 'title': _('%s administration') % capfirst(app_label), 'app_list': [app_dict], + 'app_label': app_label, } context.update(extra_context or {}) diff --git a/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js b/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js index 671af9bd78..aa12f8cf01 100644 --- a/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js +++ b/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js @@ -14,6 +14,8 @@ var DateTimeShortcuts = { clockDivName: 'clockbox', // name of clock
that gets toggled clockLinkName: 'clocklink', // name of the link that is used to toggle shortCutsClass: 'datetimeshortcuts', // class of the clock and cal shortcuts + timezoneWarningClass: 'timezonewarning', // class of the warning for timezone mismatch + timezoneOffset: 0, admin_media_prefix: '', init: function() { // Get admin_media_prefix by grabbing it off the window object. It's @@ -26,17 +28,77 @@ var DateTimeShortcuts = { DateTimeShortcuts.admin_media_prefix = '/missing-admin-media-prefix/'; } + if (window.__admin_utc_offset__ != undefined) { + var serverOffset = window.__admin_utc_offset__; + var localOffset = new Date().getTimezoneOffset() * -60; + DateTimeShortcuts.timezoneOffset = localOffset - serverOffset; + } + var inputs = document.getElementsByTagName('input'); for (i=0; i 0) { + message = ngettext( + 'Note: You are %s hour ahead of server time.', + 'Note: You are %s hours ahead of server time.', + timezoneOffset + ); + } + else { + timezoneOffset *= -1 + message = ngettext( + 'Note: You are %s hour behind server time.', + 'Note: You are %s hours behind server time.', + timezoneOffset + ); + } + message = interpolate(message, [timezoneOffset]); + + var $warning = $(''); + $warning.attr('class', warningClass); + $warning.text(message); + + $(inp).parent() + .append($('
')) + .append($warning) + }, // Add clock widget to a given field addClock: function(inp) { var num = DateTimeShortcuts.clockInputs.length; @@ -48,7 +110,7 @@ var DateTimeShortcuts = { shortcuts_span.className = DateTimeShortcuts.shortCutsClass; inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling); var now_link = document.createElement('a'); - now_link.setAttribute('href', "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().strftime('" + get_format('TIME_INPUT_FORMATS')[0] + "'));"); + now_link.setAttribute('href', "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", -1);"); now_link.appendChild(document.createTextNode(gettext('Now'))); var clock_link = document.createElement('a'); clock_link.setAttribute('href', 'javascript:DateTimeShortcuts.openClock(' + num + ');'); @@ -84,11 +146,10 @@ var DateTimeShortcuts = { quickElement('h2', clock_box, gettext('Choose a time')); var time_list = quickElement('ul', clock_box, ''); time_list.className = 'timelist'; - var time_format = get_format('TIME_INPUT_FORMATS')[0]; - quickElement("a", quickElement("li", time_list, ""), gettext("Now"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().strftime('" + time_format + "'));"); - quickElement("a", quickElement("li", time_list, ""), gettext("Midnight"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date(1970,1,1,0,0,0,0).strftime('" + time_format + "'));"); - quickElement("a", quickElement("li", time_list, ""), gettext("6 a.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date(1970,1,1,6,0,0,0).strftime('" + time_format + "'));"); - quickElement("a", quickElement("li", time_list, ""), gettext("Noon"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date(1970,1,1,12,0,0,0).strftime('" + time_format + "'));"); + quickElement("a", quickElement("li", time_list, ""), gettext("Now"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", -1);"); + quickElement("a", quickElement("li", time_list, ""), gettext("Midnight"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 0);"); + quickElement("a", quickElement("li", time_list, ""), gettext("6 a.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 6);"); + quickElement("a", quickElement("li", time_list, ""), gettext("Noon"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 12);"); var cancel_p = quickElement('p', clock_box, ''); cancel_p.className = 'calendar-cancel'; @@ -128,7 +189,14 @@ var DateTimeShortcuts = { removeEvent(document, 'click', DateTimeShortcuts.dismissClockFunc[num]); }, handleClockQuicklink: function(num, val) { - DateTimeShortcuts.clockInputs[num].value = val; + var d; + if (val == -1) { + d = DateTimeShortcuts.now(); + } + else { + d = new Date(1970, 1, 1, val, 0, 0, 0) + } + DateTimeShortcuts.clockInputs[num].value = d.strftime(get_format('TIME_INPUT_FORMATS')[0]); DateTimeShortcuts.clockInputs[num].focus(); DateTimeShortcuts.dismissClock(num); }, @@ -258,7 +326,7 @@ var DateTimeShortcuts = { DateTimeShortcuts.calendars[num].drawNextMonth(); }, handleCalendarCallback: function(num) { - format = get_format('DATE_INPUT_FORMATS')[0]; + var format = get_format('DATE_INPUT_FORMATS')[0]; // the format needs to be escaped a little format = format.replace('\\', '\\\\'); format = format.replace('\r', '\\r'); @@ -276,7 +344,7 @@ var DateTimeShortcuts = { ").style.display='none';}"].join(''); }, handleCalendarQuickLink: function(num, offset) { - var d = new Date(); + var d = DateTimeShortcuts.now(); d.setDate(d.getDate() + offset) DateTimeShortcuts.calendarInputs[num].value = d.strftime(get_format('DATE_INPUT_FORMATS')[0]); DateTimeShortcuts.calendarInputs[num].focus(); diff --git a/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js index 6d1748663e..c82c8c05cb 100644 --- a/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js +++ b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js @@ -55,7 +55,7 @@ function dismissRelatedLookupPopup(win, chosenId) { function showAddAnotherPopup(triggeringLink) { var name = triggeringLink.id.replace(/^add_/, ''); name = id_to_windowname(name); - href = triggeringLink.href + var href = triggeringLink.href; if (href.indexOf('?') == -1) { href += '?_popup=1'; } else { @@ -73,10 +73,11 @@ function dismissAddAnotherPopup(win, newId, newRepr) { newRepr = html_unescape(newRepr); var name = windowname_to_id(win.name); var elem = document.getElementById(name); + var o; if (elem) { var elemName = elem.nodeName.toUpperCase(); if (elemName == 'SELECT') { - var o = new Option(newRepr, newId); + o = new Option(newRepr, newId); elem.options[elem.options.length] = o; o.selected = true; } else if (elemName == 'INPUT') { @@ -88,8 +89,7 @@ function dismissAddAnotherPopup(win, newId, newRepr) { } } else { var toId = name + "_to"; - elem = document.getElementById(toId); - var o = new Option(newRepr, newId); + o = new Option(newRepr, newId); SelectBox.add_to_cache(toId, o); SelectBox.redisplay(toId); } diff --git a/django/contrib/admin/templates/admin/app_index.html b/django/contrib/admin/templates/admin/app_index.html index 9f65357292..7aff935126 100644 --- a/django/contrib/admin/templates/admin/app_index.html +++ b/django/contrib/admin/templates/admin/app_index.html @@ -1,6 +1,8 @@ {% extends "admin/index.html" %} {% load i18n %} +{% block bodyclass %}app-{{ app_label }} {{ block.super }}{% endblock %} + {% if not is_popup %} {% block breadcrumbs %}
diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index 63d4419fae..9c79a4e698 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -7,6 +7,7 @@ {% if LANGUAGE_BIDI %}{% endif %} + {% block extrahead %}{% endblock %} {% block blockbots %}{% endblock %} diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index d4935ed781..e35c7328f4 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -10,7 +10,7 @@ {% block coltype %}colM{% endblock %} -{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %} +{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.object_name.lower }} change-form{% endblock %} {% if not is_popup %} {% block breadcrumbs %} diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index 15583d1a8c..ce5c5b37a4 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -32,7 +32,7 @@ {% endif %}{% endif %} {% endblock %} -{% block bodyclass %}change-list{% endblock %} +{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.object_name.lower }} change-list{% endblock %} {% if not is_popup %} {% block breadcrumbs %} diff --git a/django/contrib/admin/templates/admin/delete_confirmation.html b/django/contrib/admin/templates/admin/delete_confirmation.html index 3ed60807b7..2e94b61485 100644 --- a/django/contrib/admin/templates/admin/delete_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_confirmation.html @@ -1,6 +1,8 @@ {% extends "admin/base_site.html" %} {% load i18n admin_urls %} +{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.object_name.lower }} delete-confirmation{% endblock %} + {% block breadcrumbs %}
{% trans 'Home' %} diff --git a/django/contrib/admin/templates/admin/delete_selected_confirmation.html b/django/contrib/admin/templates/admin/delete_selected_confirmation.html index 36527dcbf5..a80f4e4a54 100644 --- a/django/contrib/admin/templates/admin/delete_selected_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_selected_confirmation.html @@ -1,6 +1,8 @@ {% extends "admin/base_site.html" %} {% load i18n l10n admin_urls %} +{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.object_name.lower }} delete-confirmation delete-selected-confirmation{% endblock %} + {% block breadcrumbs %}
{% trans 'Home' %} diff --git a/django/contrib/admin/templates/admin/edit_inline/stacked.html b/django/contrib/admin/templates/admin/edit_inline/stacked.html index 2025dd8083..32917756b3 100644 --- a/django/contrib/admin/templates/admin/edit_inline/stacked.html +++ b/django/contrib/admin/templates/admin/edit_inline/stacked.html @@ -13,7 +13,7 @@ {% for fieldset in inline_admin_form %} {% include "admin/includes/fieldset.html" %} {% endfor %} - {% if inline_admin_form.has_auto_field %}{{ inline_admin_form.pk_field.field }}{% endif %} + {% if inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %} {{ inline_admin_form.fk_field.field }}
{% endfor %}
diff --git a/django/contrib/admin/templates/admin/edit_inline/tabular.html b/django/contrib/admin/templates/admin/edit_inline/tabular.html index ca853bc989..e6097f0dce 100644 --- a/django/contrib/admin/templates/admin/edit_inline/tabular.html +++ b/django/contrib/admin/templates/admin/edit_inline/tabular.html @@ -29,7 +29,7 @@ {% if inline_admin_form.original %} {{ inline_admin_form.original }}{% endif %} {% if inline_admin_form.show_url %}{% trans "View on site" %}{% endif %}

{% endif %} - {% if inline_admin_form.has_auto_field %}{{ inline_admin_form.pk_field.field }}{% endif %} + {% if inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %} {{ inline_admin_form.fk_field.field }} {% spaceless %} {% for fieldset in inline_admin_form %} diff --git a/django/contrib/admin/templatetags/admin_urls.py b/django/contrib/admin/templatetags/admin_urls.py index 19da87d61f..5d9c5b5427 100644 --- a/django/contrib/admin/templatetags/admin_urls.py +++ b/django/contrib/admin/templatetags/admin_urls.py @@ -38,7 +38,7 @@ def add_preserved_filters(context, url, popup=False): except Resolver404: pass else: - current_url = '%s:%s' % (match.namespace, match.url_name) + current_url = '%s:%s' % (match.app_name, match.url_name) changelist_url = 'admin:%s_%s_changelist' % (opts.app_label, opts.model_name) if changelist_url == current_url and '_changelist_filters' in preserved_filters: preserved_filters = dict(parse_qsl(preserved_filters['_changelist_filters'])) diff --git a/django/contrib/auth/admin.py b/django/contrib/auth/admin.py index 5a1db68613..ca660606e5 100644 --- a/django/contrib/auth/admin.py +++ b/django/contrib/auth/admin.py @@ -70,10 +70,7 @@ class UserAdmin(admin.ModelAdmin): """ defaults = {} if obj is None: - defaults.update({ - 'form': self.add_form, - 'fields': admin.util.flatten_fieldsets(self.add_fieldsets), - }) + defaults['form'] = self.add_form defaults.update(kwargs) return super(UserAdmin, self).get_form(request, obj, **defaults) diff --git a/django/contrib/auth/backends.py b/django/contrib/auth/backends.py index 05e9bfd721..6b31f72b03 100644 --- a/django/contrib/auth/backends.py +++ b/django/contrib/auth/backends.py @@ -5,7 +5,7 @@ from django.contrib.auth.models import Permission class ModelBackend(object): """ - Authenticates against django.contrib.auth.models.User. + Authenticates against settings.AUTH_USER_MODEL. """ def authenticate(self, username=None, password=None, **kwargs): diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py index 87e4218a8f..7656b50437 100644 --- a/django/contrib/auth/hashers.py +++ b/django/contrib/auth/hashers.py @@ -22,6 +22,7 @@ UNUSABLE_PASSWORD_SUFFIX_LENGTH = 40 # number of random chars to add after UNUS HASHERS = None # lazily loaded from PASSWORD_HASHERS PREFERRED_HASHER = None # defaults to first item in PASSWORD_HASHERS + @receiver(setting_changed) def reset_hashers(**kwargs): if kwargs['setting'] == 'PASSWORD_HASHERS': @@ -34,7 +35,7 @@ def is_password_usable(encoded): if encoded is None or encoded.startswith(UNUSABLE_PASSWORD_PREFIX): return False try: - hasher = identify_hasher(encoded) + identify_hasher(encoded) except ValueError: return False return True @@ -48,7 +49,7 @@ def check_password(password, encoded, setter=None, preferred='default'): If setter is specified, it'll be called when you need to regenerate the password. """ - if not is_password_usable(encoded): + if password is None or not is_password_usable(encoded): return False preferred = get_hasher(preferred) diff --git a/django/contrib/auth/tests/test_hashers.py b/django/contrib/auth/tests/test_hashers.py index 8e8119b741..4b90127c37 100644 --- a/django/contrib/auth/tests/test_hashers.py +++ b/django/contrib/auth/tests/test_hashers.py @@ -187,6 +187,13 @@ class TestUtilsHashPass(unittest.TestCase): # This might fail one day due to a hash collision. self.assertNotEqual(encoded, make_password(None), "Random password collision?") + def test_unspecified_password(self): + """ + Makes sure specifying no plain password with a valid encoded password + returns `False`. + """ + self.assertFalse(check_password(None, make_password('lètmein'))) + def test_bad_algorithm(self): with self.assertRaises(ValueError): make_password('lètmein', hasher='lolcat') diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py index 04d4894b8a..6f120f82e0 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -66,7 +66,7 @@ class GenericForeignKey(six.with_metaclass(RenameGenericForeignKeyMethods)): if obj is not None: return ContentType.objects.db_manager(obj._state.db).get_for_model( obj, for_concrete_model=self.for_concrete_model) - elif id: + elif id is not None: return ContentType.objects.db_manager(using).get_for_id(id) else: # This should never happen. I love comments like this, don't you? @@ -130,7 +130,7 @@ class GenericForeignKey(six.with_metaclass(RenameGenericForeignKeyMethods)): # performance when dealing with GFKs in loops and such. f = self.model._meta.get_field(self.ct_field) ct_id = getattr(instance, f.get_attname(), None) - if ct_id: + if ct_id is not None: ct = self.get_content_type(id=ct_id, using=instance._state.db) try: rel_obj = ct.get_object_for_this_type(pk=getattr(instance, self.fk_field)) diff --git a/django/contrib/gis/db/backends/oracle/operations.py b/django/contrib/gis/db/backends/oracle/operations.py index 84217c331b..628018320b 100644 --- a/django/contrib/gis/db/backends/oracle/operations.py +++ b/django/contrib/gis/db/backends/oracle/operations.py @@ -78,7 +78,7 @@ class OracleOperations(DatabaseOperations, BaseSpatialOperations): name = 'oracle' oracle = True - valid_aggregates = dict([(a, None) for a in ('Union', 'Extent')]) + valid_aggregates = {'Union', 'Extent'} Adapter = OracleSpatialAdapter Adaptor = Adapter # Backwards-compatibility alias. diff --git a/django/contrib/gis/db/backends/postgis/operations.py b/django/contrib/gis/db/backends/postgis/operations.py index 84dbda3239..3863bea992 100644 --- a/django/contrib/gis/db/backends/postgis/operations.py +++ b/django/contrib/gis/db/backends/postgis/operations.py @@ -56,6 +56,7 @@ class PostGISSphereDistance(PostGISDistance): class PostGISRelate(PostGISFunctionParam): "For PostGIS Relate(, ) calls." pattern_regex = re.compile(r'^[012TF\*]{9}$') + def __init__(self, prefix, pattern): if not self.pattern_regex.match(pattern): raise ValueError('Invalid intersection matrix pattern "%s".' % pattern) @@ -68,8 +69,7 @@ class PostGISOperations(DatabaseOperations, BaseSpatialOperations): postgis = True geom_func_prefix = 'ST_' version_regex = re.compile(r'^(?P\d)\.(?P\d)\.(?P\d+)') - valid_aggregates = dict([(k, None) for k in - ('Collect', 'Extent', 'Extent3D', 'MakeLine', 'Union')]) + valid_aggregates = {'Collect', 'Extent', 'Extent3D', 'MakeLine', 'Union'} Adapter = PostGISAdapter Adaptor = Adapter # Backwards-compatibility alias. diff --git a/django/contrib/gis/db/backends/spatialite/operations.py b/django/contrib/gis/db/backends/spatialite/operations.py index 4281cafa23..3cb2004dfd 100644 --- a/django/contrib/gis/db/backends/spatialite/operations.py +++ b/django/contrib/gis/db/backends/spatialite/operations.py @@ -56,7 +56,7 @@ class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations): name = 'spatialite' spatialite = True version_regex = re.compile(r'^(?P\d)\.(?P\d)\.(?P\d+)') - valid_aggregates = dict([(k, None) for k in ('Extent', 'Union')]) + valid_aggregates = {'Extent', 'Union'} Adapter = SpatiaLiteAdapter Adaptor = Adapter # Backwards-compatibility alias. @@ -169,6 +169,7 @@ class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations): Checks if the given aggregate name is supported (that is, if it's in `self.valid_aggregates`). """ + super(SpatiaLiteOperations, self).check_aggregate_support(aggregate) agg_name = aggregate.__class__.__name__ return agg_name in self.valid_aggregates diff --git a/django/contrib/gis/db/models/query.py b/django/contrib/gis/db/models/query.py index c89912b2d9..4199d19a88 100644 --- a/django/contrib/gis/db/models/query.py +++ b/django/contrib/gis/db/models/query.py @@ -140,7 +140,7 @@ class GeoQuerySet(QuerySet): Returns a GeoJSON representation of the geomtry field in a `geojson` attribute on each element of the GeoQuerySet. - The `crs` and `bbox` keywords may be set to True if the users wants + The `crs` and `bbox` keywords may be set to True if the user wants the coordinate reference system and the bounding box to be included in the GeoJSON representation of the geometry. """ diff --git a/django/contrib/gis/gdal/geometries.py b/django/contrib/gis/gdal/geometries.py index 0d75620b4e..d75e8cd288 100644 --- a/django/contrib/gis/gdal/geometries.py +++ b/django/contrib/gis/gdal/geometries.py @@ -198,14 +198,6 @@ class OGRGeometry(GDALBase): def _get_coord_dim(self): "Returns the coordinate dimension of the Geometry." - if isinstance(self, GeometryCollection) and GDAL_VERSION < (1, 5, 2): - # On GDAL versions prior to 1.5.2, there exists a bug in which - # the coordinate dimension of geometry collections is always 2: - # http://trac.osgeo.org/gdal/ticket/2334 - # Here we workaround by returning the coordinate dimension of the - # first geometry in the collection instead. - if len(self): - return capi.get_coord_dim(capi.get_geom_ref(self.ptr, 0)) return capi.get_coord_dim(self.ptr) def _set_coord_dim(self, dim): diff --git a/django/contrib/gis/management/commands/ogrinspect.py b/django/contrib/gis/management/commands/ogrinspect.py index 44513e3463..2a29fe672a 100644 --- a/django/contrib/gis/management/commands/ogrinspect.py +++ b/django/contrib/gis/management/commands/ogrinspect.py @@ -53,7 +53,7 @@ class Command(LabelCommand): make_option('--multi-geom', action='store_true', dest='multi_geom', default=False, help='Treat the geometry in the data source as a geometry collection.'), make_option('--name-field', dest='name_field', - help='Specifies a field name to return for the `__unicode__` function.'), + help='Specifies a field name to return for the `__unicode__`/`__str__` function.'), make_option('--no-imports', action='store_false', dest='imports', default=True, help='Do not include `from django.contrib.gis.db import models` ' 'statement.'), diff --git a/django/contrib/gis/maps/google/gmap.py b/django/contrib/gis/maps/google/gmap.py index 75b285ca76..ff6562696d 100644 --- a/django/contrib/gis/maps/google/gmap.py +++ b/django/contrib/gis/maps/google/gmap.py @@ -134,7 +134,8 @@ class GoogleMap(object): @property def scripts(self): "Returns all tags required with Google Maps JavaScript." - return format_html('%s\n ', self.api_script, mark_safe(self.js)) + return format_html('{0}\n ', + self.api_script, mark_safe(self.js)) @property def style(self): diff --git a/django/contrib/gis/tests/__init__.py b/django/contrib/gis/tests/__init__.py index 1703f3f1b3..e69de29bb2 100644 --- a/django/contrib/gis/tests/__init__.py +++ b/django/contrib/gis/tests/__init__.py @@ -1,30 +0,0 @@ -def geo_apps(): - """ - Returns a list of GeoDjango test applications that reside in - `django.contrib.gis.tests` that can be used with the current - database and the spatial libraries that are installed. - """ - from django.db import connection - from django.contrib.gis.geos import GEOS_PREPARE - from django.contrib.gis.gdal import HAS_GDAL - - apps = ['geoapp', 'relatedapp'] - - # No distance queries on MySQL. - if not connection.ops.mysql: - apps.append('distapp') - - # Test geography support with PostGIS 1.5+. - if connection.ops.postgis and connection.ops.geography: - apps.append('geogapp') - - # The following GeoDjango test apps depend on GDAL support. - if HAS_GDAL: - # Geographic admin, LayerMapping, and ogrinspect test apps - # all require GDAL. - apps.extend(['geoadmin', 'layermap', 'inspectapp']) - - # 3D apps use LayerMapping, which uses GDAL and require GEOS 3.1+. - if connection.ops.postgis and GEOS_PREPARE: - apps.append('geo3d') - return [('django.contrib.gis.tests', app) for app in apps] diff --git a/django/contrib/gis/tests/geoadmin/tests.py b/django/contrib/gis/tests/geoadmin/tests.py index c34964a2da..df4158bb31 100644 --- a/django/contrib/gis/tests/geoadmin/tests.py +++ b/django/contrib/gis/tests/geoadmin/tests.py @@ -2,9 +2,10 @@ from __future__ import absolute_import from unittest import skipUnless -from django.test import TestCase from django.contrib.gis.geos import HAS_GEOS from django.contrib.gis.tests.utils import HAS_SPATIAL_DB +from django.test import TestCase +from django.test.utils import override_settings if HAS_GEOS and HAS_SPATIAL_DB: from django.contrib.gis import admin @@ -12,6 +13,8 @@ if HAS_GEOS and HAS_SPATIAL_DB: from .models import City +GOOGLE_MAPS_API_KEY = 'XXXX' + @skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.") class GeoAdminTest(TestCase): @@ -39,7 +42,9 @@ class GeoAdminTest(TestCase): result) def test_olwidget_has_changed(self): - """ Check that changes are accurately noticed by OpenLayersWidget. """ + """ + Check that changes are accurately noticed by OpenLayersWidget. + """ geoadmin = admin.site._registry[City] form = geoadmin.get_changelist_form(None)() has_changed = form.fields['point']._has_changed @@ -55,3 +60,15 @@ class GeoAdminTest(TestCase): self.assertFalse(has_changed(initial, data_same)) self.assertFalse(has_changed(initial, data_almost_same)) self.assertTrue(has_changed(initial, data_changed)) + + @override_settings(GOOGLE_MAPS_API_KEY=GOOGLE_MAPS_API_KEY) + def test_google_map_scripts(self): + """ + Testing GoogleMap.scripts() output. See #20773. + """ + from django.contrib.gis.maps.google.gmap import GoogleMap + + google_map = GoogleMap() + scripts = google_map.scripts + self.assertIn(GOOGLE_MAPS_API_KEY, scripts) + self.assertIn("new GMap2", scripts) diff --git a/django/contrib/gis/tests/geoapp/test_sitemaps.py b/django/contrib/gis/tests/geoapp/test_sitemaps.py index facd94c247..98cd8cc5ac 100644 --- a/django/contrib/gis/tests/geoapp/test_sitemaps.py +++ b/django/contrib/gis/tests/geoapp/test_sitemaps.py @@ -3,6 +3,7 @@ from __future__ import absolute_import from io import BytesIO from unittest import skipUnless from xml.dom import minidom +import os import zipfile from django.conf import settings @@ -10,6 +11,7 @@ from django.contrib.gis.geos import HAS_GEOS from django.contrib.gis.tests.utils import HAS_SPATIAL_DB from django.contrib.sites.models import Site from django.test import TestCase +from django.utils._os import upath if HAS_GEOS: from .models import City, Country @@ -37,7 +39,11 @@ class GeoSitemapTest(TestCase): def test_geositemap_index(self): "Tests geographic sitemap index." # Getting the geo index. - doc = minidom.parseString(self.client.get('/sitemap.xml').content) + from django.contrib import sitemaps + template_dirs = settings.TEMPLATE_DIRS + ( + os.path.join(os.path.dirname(upath(sitemaps.__file__)), 'templates'),) + with self.settings(TEMPLATE_DIRS=template_dirs): + doc = minidom.parseString(self.client.get('/sitemap.xml').content) index = doc.firstChild self.assertEqual(index.getAttribute('xmlns'), 'http://www.sitemaps.org/schemas/sitemap/0.9') self.assertEqual(3, len(index.getElementsByTagName('sitemap'))) diff --git a/django/contrib/gis/tests/geoapp/tests.py b/django/contrib/gis/tests/geoapp/tests.py index 487f879674..eabc5958c0 100644 --- a/django/contrib/gis/tests/geoapp/tests.py +++ b/django/contrib/gis/tests/geoapp/tests.py @@ -8,7 +8,7 @@ from django.db import connection from django.contrib.gis import gdal from django.contrib.gis.geos import HAS_GEOS from django.contrib.gis.tests.utils import ( - no_mysql, no_oracle, no_spatialite, + HAS_SPATIAL_DB, no_mysql, no_oracle, no_spatialite, mysql, oracle, postgis, spatialite) from django.test import TestCase from django.utils import six @@ -28,7 +28,7 @@ def postgis_bug_version(): return spatial_version and (2, 0, 0) <= spatial_version <= (2, 0, 1) -@skipUnless(HAS_GEOS and postgis, "Geos and postgis are required.") +@skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.") class GeoModelTest(TestCase): def test_fixtures(self): @@ -203,7 +203,7 @@ class GeoModelTest(TestCase): self.assertTrue(isinstance(cities2[0].point, Point)) -@skipUnless(HAS_GEOS and postgis, "Geos and postgis are required.") +@skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.") class GeoLookupTest(TestCase): @no_mysql @@ -389,7 +389,7 @@ class GeoLookupTest(TestCase): self.assertEqual('Lawrence', City.objects.get(point__relate=(ks.poly, intersects_mask)).name) -@skipUnless(HAS_GEOS and postgis, "Geos and postgis are required.") +@skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.") class GeoQuerySetTest(TestCase): # Please keep the tests in GeoQuerySet method's alphabetic order @@ -433,6 +433,13 @@ class GeoQuerySetTest(TestCase): self.assertEqual(c.mpoly.sym_difference(geom), c.sym_difference) self.assertEqual(c.mpoly.union(geom), c.union) + @skipUnless(getattr(connection.ops, 'envelope', False), 'Database does not support envelope operation') + def test_envelope(self): + "Testing the `envelope` GeoQuerySet method." + countries = Country.objects.all().envelope() + for country in countries: + self.assertIsInstance(country.envelope, Polygon) + @no_mysql @no_spatialite # SpatiaLite does not have an Extent function def test_extent(self): diff --git a/django/contrib/gis/tests/test_spatialrefsys.py b/django/contrib/gis/tests/test_spatialrefsys.py index 8daa6acc23..5bb6a70206 100644 --- a/django/contrib/gis/tests/test_spatialrefsys.py +++ b/django/contrib/gis/tests/test_spatialrefsys.py @@ -23,7 +23,7 @@ test_srs = ({'srid' : 4326, 'auth_srid' : 32140, 'srtext' : 'PROJCS["NAD83 / Texas South Central",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980"', 'proj4_re' : r'\+proj=lcc \+lat_1=30.28333333333333 \+lat_2=28.38333333333333 \+lat_0=27.83333333333333 ' - r'\+lon_0=-99 \+x_0=600000 \+y_0=4000000 \+ellps=GRS80 ' + r'\+lon_0=-99 \+x_0=600000 \+y_0=4000000 (\+ellps=GRS80 )?' r'(\+datum=NAD83 |\+towgs84=0,0,0,0,0,0,0)?\+units=m \+no_defs ', 'spheroid' : 'GRS 1980', 'name' : 'NAD83 / Texas South Central', 'geographic' : False, 'projected' : True, 'spatialite' : False, diff --git a/django/contrib/gis/utils/ogrinspect.py b/django/contrib/gis/utils/ogrinspect.py index 08d3b40397..b7cfafd49d 100644 --- a/django/contrib/gis/utils/ogrinspect.py +++ b/django/contrib/gis/utils/ogrinspect.py @@ -89,7 +89,7 @@ def ogrinspect(*args, **kwargs): `multi_geom` => Boolean (default: False) - specify as multigeometry. `name_field` => String - specifies a field name to return for the - `__unicode__` function (which will be generated if specified). + `__unicode__`/`__str__` function (which will be generated if specified). `imports` => Boolean (default: True) - set to False to omit the `from django.contrib.gis.db import models` code from the @@ -221,4 +221,5 @@ def _ogrinspect(data_source, model_name, geom_name='geom', layer_key=0, srid=Non if name_field: yield '' - yield ' def __str__(self): return self.%s' % name_field + yield ' def __%s__(self): return self.%s' % ( + 'str' if six.PY3 else 'unicode', name_field) diff --git a/django/contrib/syndication/views.py b/django/contrib/syndication/views.py index 3bfba3ba08..cec204dc92 100644 --- a/django/contrib/syndication/views.py +++ b/django/contrib/syndication/views.py @@ -43,9 +43,9 @@ class Feed(object): raise Http404('Feed object does not exist.') feedgen = self.get_feed(obj, request) response = HttpResponse(content_type=feedgen.mime_type) - if hasattr(self, 'item_pubdate'): - # if item_pubdate is defined for the feed, set header so as - # ConditionalGetMiddleware is able to send 304 NOT MODIFIED + if hasattr(self, 'item_pubdate') or hasattr(self, 'item_updateddate'): + # if item_pubdate or item_updateddate is defined for the feed, set + # header so as ConditionalGetMiddleware is able to send 304 NOT MODIFIED response['Last-Modified'] = http_date( timegm(feedgen.latest_post_date().utctimetuple())) feedgen.write(response, 'utf-8') @@ -191,6 +191,11 @@ class Feed(object): ltz = tzinfo.LocalTimezone(pubdate) pubdate = pubdate.replace(tzinfo=ltz) + updateddate = self.__get_dynamic_attr('item_updateddate', item) + if updateddate and is_naive(updateddate): + ltz = tzinfo.LocalTimezone(updateddate) + updateddate = updateddate.replace(tzinfo=ltz) + feed.add_item( title = title, link = link, @@ -200,6 +205,7 @@ class Feed(object): 'item_guid_is_permalink', item), enclosure = enc, pubdate = pubdate, + updateddate = updateddate, author_name = author_name, author_email = author_email, author_link = author_link, diff --git a/django/core/cache/backends/locmem.py b/django/core/cache/backends/locmem.py index 1fa17052fd..44d7db62c3 100644 --- a/django/core/cache/backends/locmem.py +++ b/django/core/cache/backends/locmem.py @@ -9,16 +9,17 @@ except ImportError: from django.core.cache.backends.base import BaseCache, DEFAULT_TIMEOUT from django.utils.synch import RWLock + # Global in-memory store of cache data. Keyed by name, to provide # multiple named local memory caches. _caches = {} _expire_info = {} _locks = {} + class LocMemCache(BaseCache): def __init__(self, name, params): BaseCache.__init__(self, params) - global _caches, _expire_info, _locks self._cache = _caches.setdefault(name, {}) self._expire_info = _expire_info.setdefault(name, {}) self._lock = _locks.setdefault(name, RWLock()) @@ -26,28 +27,31 @@ class LocMemCache(BaseCache): def add(self, key, value, timeout=DEFAULT_TIMEOUT, version=None): key = self.make_key(key, version=version) self.validate_key(key) + try: + pickled = pickle.dumps(value, pickle.HIGHEST_PROTOCOL) + except pickle.PickleError: + return False with self._lock.writer(): exp = self._expire_info.get(key) if exp is None or exp <= time.time(): - try: - pickled = pickle.dumps(value, pickle.HIGHEST_PROTOCOL) - self._set(key, pickled, timeout) - return True - except pickle.PickleError: - pass + self._set(key, pickled, timeout) + return True return False def get(self, key, default=None, version=None): key = self.make_key(key, version=version) self.validate_key(key) + pickled = None with self._lock.reader(): exp = self._expire_info.get(key, 0) if exp is None or exp > time.time(): - try: - pickled = self._cache[key] - return pickle.loads(pickled) - except pickle.PickleError: - return default + pickled = self._cache[key] + if pickled is not None: + try: + return pickle.loads(pickled) + except pickle.PickleError: + return default + with self._lock.writer(): try: del self._cache[key] @@ -68,12 +72,13 @@ class LocMemCache(BaseCache): def set(self, key, value, timeout=DEFAULT_TIMEOUT, version=None): key = self.make_key(key, version=version) self.validate_key(key) - with self._lock.writer(): - try: - pickled = pickle.dumps(value, pickle.HIGHEST_PROTOCOL) + try: + pickled = pickle.dumps(value, pickle.HIGHEST_PROTOCOL) + except pickle.PickleError: + pass + else: + with self._lock.writer(): self._set(key, pickled, timeout) - except pickle.PickleError: - pass def incr(self, key, delta=1, version=None): value = self.get(key, version=version) @@ -81,12 +86,13 @@ class LocMemCache(BaseCache): raise ValueError("Key '%s' not found" % key) new_value = value + delta key = self.make_key(key, version=version) - with self._lock.writer(): - try: - pickled = pickle.dumps(new_value, pickle.HIGHEST_PROTOCOL) + try: + pickled = pickle.dumps(new_value, pickle.HIGHEST_PROTOCOL) + except pickle.PickleError: + pass + else: + with self._lock.writer(): self._cache[key] = pickled - except pickle.PickleError: - pass return new_value def has_key(self, key, version=None): @@ -135,6 +141,7 @@ class LocMemCache(BaseCache): self._cache.clear() self._expire_info.clear() + # For backwards compatibility class CacheClass(LocMemCache): pass diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py index 64d1c41dc5..19e8b02f74 100644 --- a/django/core/cache/backends/memcached.py +++ b/django/core/cache/backends/memcached.py @@ -86,7 +86,7 @@ class BaseMemcachedCache(BaseCache): self._cache.delete(key) def get_many(self, keys, version=None): - new_keys = map(lambda x: self.make_key(x, version=version), keys) + new_keys = [self.make_key(x, version=version) for x in keys] ret = self._cache.get_multi(new_keys) if ret: _ = {} diff --git a/django/core/files/uploadedfile.py b/django/core/files/uploadedfile.py index 39b99ff78f..9f948ca03b 100644 --- a/django/core/files/uploadedfile.py +++ b/django/core/files/uploadedfile.py @@ -23,11 +23,12 @@ class UploadedFile(File): """ DEFAULT_CHUNK_SIZE = 64 * 2**10 - def __init__(self, file=None, name=None, content_type=None, size=None, charset=None): + def __init__(self, file=None, name=None, content_type=None, size=None, charset=None, content_type_extra=None): super(UploadedFile, self).__init__(file, name) self.size = size self.content_type = content_type self.charset = charset + self.content_type_extra = content_type_extra def __repr__(self): return force_str("<%s: %s (%s)>" % ( @@ -55,13 +56,13 @@ class TemporaryUploadedFile(UploadedFile): """ A file uploaded to a temporary location (i.e. stream-to-disk). """ - def __init__(self, name, content_type, size, charset): + def __init__(self, name, content_type, size, charset, content_type_extra): if settings.FILE_UPLOAD_TEMP_DIR: file = tempfile.NamedTemporaryFile(suffix='.upload', dir=settings.FILE_UPLOAD_TEMP_DIR) else: file = tempfile.NamedTemporaryFile(suffix='.upload') - super(TemporaryUploadedFile, self).__init__(file, name, content_type, size, charset) + super(TemporaryUploadedFile, self).__init__(file, name, content_type, size, charset, content_type_extra) def temporary_file_path(self): """ @@ -83,8 +84,8 @@ class InMemoryUploadedFile(UploadedFile): """ A file uploaded into memory (i.e. stream-to-memory). """ - def __init__(self, file, field_name, name, content_type, size, charset): - super(InMemoryUploadedFile, self).__init__(file, name, content_type, size, charset) + def __init__(self, file, field_name, name, content_type, size, charset, content_type_extra): + super(InMemoryUploadedFile, self).__init__(file, name, content_type, size, charset, content_type_extra) self.field_name = field_name def open(self, mode=None): @@ -109,7 +110,7 @@ class SimpleUploadedFile(InMemoryUploadedFile): def __init__(self, name, content, content_type='text/plain'): content = content or b'' super(SimpleUploadedFile, self).__init__(BytesIO(content), None, name, - content_type, len(content), None) + content_type, len(content), None, None) def from_dict(cls, file_dict): """ diff --git a/django/core/files/uploadhandler.py b/django/core/files/uploadhandler.py index f5e95cf2fd..6739b26e0c 100644 --- a/django/core/files/uploadhandler.py +++ b/django/core/files/uploadhandler.py @@ -64,6 +64,7 @@ class FileUploadHandler(object): self.content_type = None self.content_length = None self.charset = None + self.content_type_extra = None self.request = request def handle_raw_input(self, input_data, META, content_length, boundary, encoding=None): @@ -84,7 +85,7 @@ class FileUploadHandler(object): """ pass - def new_file(self, field_name, file_name, content_type, content_length, charset=None): + def new_file(self, field_name, file_name, content_type, content_length, charset=None, content_type_extra=None): """ Signal that a new file has been started. @@ -96,6 +97,7 @@ class FileUploadHandler(object): self.content_type = content_type self.content_length = content_length self.charset = charset + self.content_type_extra = content_type_extra def receive_data_chunk(self, raw_data, start): """ @@ -132,7 +134,7 @@ class TemporaryFileUploadHandler(FileUploadHandler): Create the file object to append to as data is coming in. """ super(TemporaryFileUploadHandler, self).new_file(file_name, *args, **kwargs) - self.file = TemporaryUploadedFile(self.file_name, self.content_type, 0, self.charset) + self.file = TemporaryUploadedFile(self.file_name, self.content_type, 0, self.charset, self.content_type_extra) def receive_data_chunk(self, raw_data, start): self.file.write(raw_data) @@ -187,7 +189,8 @@ class MemoryFileUploadHandler(FileUploadHandler): name = self.file_name, content_type = self.content_type, size = file_size, - charset = self.charset + charset = self.charset, + content_type_extra = self.content_type_extra ) diff --git a/django/core/mail/backends/console.py b/django/core/mail/backends/console.py index ea0cb5d9ad..389e06b37f 100644 --- a/django/core/mail/backends/console.py +++ b/django/core/mail/backends/console.py @@ -16,6 +16,7 @@ class EmailBackend(BaseEmailBackend): """Write all messages to the stream in a thread-safe way.""" if not email_messages: return + msg_count = 0 with self._lock: try: stream_created = self.open() @@ -24,9 +25,10 @@ class EmailBackend(BaseEmailBackend): self.stream.write('-' * 79) self.stream.write('\n') self.stream.flush() # flush after each message + msg_count += 1 if stream_created: self.close() except: if not self.fail_silently: raise - return len(email_messages) + return msg_count diff --git a/django/core/mail/backends/dummy.py b/django/core/mail/backends/dummy.py index 273aa0d88e..7ae4878f13 100644 --- a/django/core/mail/backends/dummy.py +++ b/django/core/mail/backends/dummy.py @@ -6,4 +6,4 @@ from django.core.mail.backends.base import BaseEmailBackend class EmailBackend(BaseEmailBackend): def send_messages(self, email_messages): - return len(email_messages) + return len(list(email_messages)) diff --git a/django/core/mail/backends/locmem.py b/django/core/mail/backends/locmem.py index 6826d09ee5..8e893af358 100644 --- a/django/core/mail/backends/locmem.py +++ b/django/core/mail/backends/locmem.py @@ -20,7 +20,9 @@ class EmailBackend(BaseEmailBackend): def send_messages(self, messages): """Redirect messages to the dummy outbox""" + msg_count = 0 for message in messages: # .message() triggers header validation message.message() + msg_count += 1 mail.outbox.extend(messages) - return len(messages) + return msg_count diff --git a/django/core/mail/backends/smtp.py b/django/core/mail/backends/smtp.py index e456b7864e..c7f4a1a801 100644 --- a/django/core/mail/backends/smtp.py +++ b/django/core/mail/backends/smtp.py @@ -15,22 +15,18 @@ class EmailBackend(BaseEmailBackend): A wrapper that manages the SMTP network connection. """ def __init__(self, host=None, port=None, username=None, password=None, - use_tls=None, fail_silently=False, **kwargs): + use_tls=None, fail_silently=False, use_ssl=None, **kwargs): super(EmailBackend, self).__init__(fail_silently=fail_silently) self.host = host or settings.EMAIL_HOST self.port = port or settings.EMAIL_PORT - if username is None: - self.username = settings.EMAIL_HOST_USER - else: - self.username = username - if password is None: - self.password = settings.EMAIL_HOST_PASSWORD - else: - self.password = password - if use_tls is None: - self.use_tls = settings.EMAIL_USE_TLS - else: - self.use_tls = use_tls + self.username = settings.EMAIL_HOST_USER if username is None else username + self.password = settings.EMAIL_HOST_PASSWORD if password is None else password + self.use_tls = settings.EMAIL_USE_TLS if use_tls is None else use_tls + self.use_ssl = settings.EMAIL_USE_SSL if use_ssl is None else use_ssl + if self.use_ssl and self.use_tls: + raise ValueError( + "EMAIL_USE_TLS/EMAIL_USE_SSL are mutually exclusive, so only set " + "one of those settings to True.") self.connection = None self._lock = threading.RLock() @@ -45,12 +41,18 @@ class EmailBackend(BaseEmailBackend): try: # If local_hostname is not specified, socket.getfqdn() gets used. # For performance, we use the cached FQDN for local_hostname. - self.connection = smtplib.SMTP(self.host, self.port, + if self.use_ssl: + self.connection = smtplib.SMTP_SSL(self.host, self.port, local_hostname=DNS_NAME.get_fqdn()) - if self.use_tls: - self.connection.ehlo() - self.connection.starttls() - self.connection.ehlo() + else: + self.connection = smtplib.SMTP(self.host, self.port, + local_hostname=DNS_NAME.get_fqdn()) + # TLS/SSL are mutually exclusive, so only attempt TLS over + # non-secure connections. + if self.use_tls: + self.connection.ehlo() + self.connection.starttls() + self.connection.ehlo() if self.username and self.password: self.connection.login(self.username, self.password) return True diff --git a/django/core/mail/message.py b/django/core/mail/message.py index 98ab3c9075..db9023a0bb 100644 --- a/django/core/mail/message.py +++ b/django/core/mail/message.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import mimetypes import os import random -import sys import time from email import charset as Charset, encoders as Encoders from email.generator import Generator @@ -139,9 +138,6 @@ class SafeMIMEText(MIMEText): """ fp = six.StringIO() g = Generator(fp, mangle_from_ = False) - if sys.version_info < (2, 6, 6) and isinstance(self._payload, six.text_type): - # Workaround for http://bugs.python.org/issue1368247 - self._payload = self._payload.encode(self._charset.output_charset) g.flatten(self, unixfrom=unixfrom) return fp.getvalue() diff --git a/django/core/signing.py b/django/core/signing.py index bbe53aafe3..c3b2c3ed36 100644 --- a/django/core/signing.py +++ b/django/core/signing.py @@ -183,6 +183,10 @@ class TimestampSigner(Signer): return super(TimestampSigner, self).sign(value) def unsign(self, value, max_age=None): + """ + Retrieve original value and check it wasn't signed more + than max_age seconds ago. + """ result = super(TimestampSigner, self).unsign(value) value, timestamp = result.rsplit(self.sep, 1) timestamp = baseconv.base62.decode(timestamp) diff --git a/django/core/validators.py b/django/core/validators.py index 200d28fe02..aa417ed099 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -87,7 +87,7 @@ class EmailValidator(object): r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"$)', # quoted-string re.IGNORECASE) domain_regex = re.compile( - r'(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?$)' # domain + r'(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}|[A-Z0-9-]{2,})\.?$' # domain # literal form, ipv4 address (SMTP 4.1.3) r'|^\[(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}\]$', re.IGNORECASE) diff --git a/django/db/__init__.py b/django/db/__init__.py index 0d7fbe2a34..e1af430dc2 100644 --- a/django/db/__init__.py +++ b/django/db/__init__.py @@ -1,20 +1,25 @@ import warnings from django.core import signals -from django.db.utils import (DEFAULT_DB_ALIAS, - DataError, OperationalError, IntegrityError, InternalError, - ProgrammingError, NotSupportedError, DatabaseError, - InterfaceError, Error, - load_backend, ConnectionHandler, ConnectionRouter) +from django.db.utils import (DEFAULT_DB_ALIAS, DataError, OperationalError, + IntegrityError, InternalError, ProgrammingError, NotSupportedError, + DatabaseError, InterfaceError, Error, load_backend, + ConnectionHandler, ConnectionRouter) from django.utils.functional import cached_property -__all__ = ('backend', 'connection', 'connections', 'router', 'DatabaseError', - 'IntegrityError', 'DEFAULT_DB_ALIAS') + +__all__ = [ + 'backend', 'connection', 'connections', 'router', 'DatabaseError', + 'IntegrityError', 'InternalError', 'ProgrammingError', 'DataError', + 'NotSupportedError', 'Error', 'InterfaceError', 'OperationalError', + 'DEFAULT_DB_ALIAS' +] connections = ConnectionHandler() router = ConnectionRouter() + # `connection`, `DatabaseError` and `IntegrityError` are convenient aliases # for backend bits. @@ -39,8 +44,15 @@ class DefaultConnectionProxy(object): def __delattr__(self, name): return delattr(connections[DEFAULT_DB_ALIAS], name) + def __eq__(self, other): + return connections[DEFAULT_DB_ALIAS] == other + + def __ne__(self, other): + return connections[DEFAULT_DB_ALIAS] != other + connection = DefaultConnectionProxy() + class DefaultBackendProxy(object): """ Temporary proxy class used during deprecation period of the `backend` module @@ -63,6 +75,7 @@ class DefaultBackendProxy(object): backend = DefaultBackendProxy() + def close_connection(**kwargs): warnings.warn( "close_connection is superseded by close_old_connections.", @@ -76,12 +89,14 @@ def close_connection(**kwargs): transaction.abort(conn) connections[conn].close() + # Register an event to reset saved queries when a Django request is started. def reset_queries(**kwargs): for conn in connections.all(): conn.queries = [] signals.request_started.connect(reset_queries) + # Register an event to reset transaction state and close connections past # their lifetime. NB: abort() doesn't do anything outside of a transaction. def close_old_connections(**kwargs): diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py index 451cf4baf1..80e66b3ad4 100644 --- a/django/db/backends/__init__.py +++ b/django/db/backends/__init__.py @@ -70,7 +70,9 @@ class BaseDatabaseWrapper(object): self._thread_ident = thread.get_ident() def __eq__(self, other): - return self.alias == other.alias + if isinstance(other, BaseDatabaseWrapper): + return self.alias == other.alias + return NotImplemented def __ne__(self, other): return not self == other @@ -1184,6 +1186,7 @@ FieldInfo = namedtuple('FieldInfo', 'name type_code display_size internal_size precision scale null_ok' ) + class BaseDatabaseIntrospection(object): """ This class encapsulates all backend-specific introspection utilities diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py index 2767fcb48d..2ebbbbf2d5 100644 --- a/django/db/backends/creation.py +++ b/django/db/backends/creation.py @@ -253,12 +253,13 @@ class BaseDatabaseCreation(object): r_col = model._meta.get_field(f.rel.field_name).column r_name = '%s_refs_%s_%s' % ( col, r_col, self._digest(table, r_table)) - output.append('%s %s %s %s;' % \ - (style.SQL_KEYWORD('ALTER TABLE'), + output.append('%s %s %s %s;' % ( + style.SQL_KEYWORD('ALTER TABLE'), style.SQL_TABLE(qn(table)), style.SQL_KEYWORD(self.connection.ops.drop_foreignkey_sql()), style.SQL_FIELD(qn(truncate_name( - r_name, self.connection.ops.max_name_length()))))) + r_name, self.connection.ops.max_name_length()))) + )) del references_to_delete[model] return output diff --git a/django/db/backends/dummy/base.py b/django/db/backends/dummy/base.py index 9a220ffd8b..3e6d3e4c5a 100644 --- a/django/db/backends/dummy/base.py +++ b/django/db/backends/dummy/base.py @@ -8,33 +8,43 @@ ImproperlyConfigured. """ from django.core.exceptions import ImproperlyConfigured -from django.db.backends import * +from django.db.backends import (BaseDatabaseOperations, BaseDatabaseClient, + BaseDatabaseIntrospection, BaseDatabaseWrapper, BaseDatabaseFeatures, + BaseDatabaseValidation) from django.db.backends.creation import BaseDatabaseCreation + def complain(*args, **kwargs): raise ImproperlyConfigured("settings.DATABASES is improperly configured. " "Please supply the ENGINE value. Check " "settings documentation for more details.") + def ignore(*args, **kwargs): pass + class DatabaseError(Exception): pass + class IntegrityError(DatabaseError): pass + class DatabaseOperations(BaseDatabaseOperations): quote_name = complain + class DatabaseClient(BaseDatabaseClient): runshell = complain + class DatabaseCreation(BaseDatabaseCreation): create_test_db = ignore destroy_test_db = ignore + class DatabaseIntrospection(BaseDatabaseIntrospection): get_table_list = complain get_table_description = complain @@ -42,6 +52,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): get_indexes = complain get_key_columns = complain + class DatabaseWrapper(BaseDatabaseWrapper): operators = {} # Override the base class implementations with null diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index 8a689f66ed..15eacec679 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -37,7 +37,8 @@ except ImportError: from django.conf import settings from django.db import utils -from django.db.backends import * +from django.db.backends import (util, BaseDatabaseFeatures, + BaseDatabaseOperations, BaseDatabaseWrapper) from django.db.backends.mysql.client import DatabaseClient from django.db.backends.mysql.creation import DatabaseCreation from django.db.backends.mysql.introspection import DatabaseIntrospection @@ -60,6 +61,7 @@ IntegrityError = Database.IntegrityError # It's impossible to import datetime_or_None directly from MySQLdb.times parse_datetime = conversions[FIELD_TYPE.DATETIME] + def parse_datetime_with_timezone_support(value): dt = parse_datetime(value) # Confirm that dt is naive before overwriting its tzinfo. @@ -67,6 +69,7 @@ def parse_datetime_with_timezone_support(value): dt = dt.replace(tzinfo=timezone.utc) return dt + def adapt_datetime_with_timezone_support(value, conv): # Equivalent to DateTimeField.get_db_prep_value. Used only by raw SQL. if settings.USE_TZ: @@ -101,6 +104,7 @@ django_conversions.update({ # http://dev.mysql.com/doc/refman/5.0/en/news.html . server_version_re = re.compile(r'(\d{1,2})\.(\d{1,2})\.(\d{1,2})') + # MySQLdb-1.2.1 and newer automatically makes use of SHOW WARNINGS on # MySQL-4.1 and newer, so the MysqlDebugWrapper is unnecessary. Since the # point is to raise Warnings as exceptions, this can be done with the Python @@ -151,6 +155,7 @@ class CursorWrapper(object): def __iter__(self): return iter(self.cursor) + class DatabaseFeatures(BaseDatabaseFeatures): empty_fetchmany_value = () update_can_self_select = False @@ -208,6 +213,7 @@ class DatabaseFeatures(BaseDatabaseFeatures): cursor.execute("SELECT 1 FROM mysql.time_zone LIMIT 1") return cursor.fetchone() is not None + class DatabaseOperations(BaseDatabaseOperations): compiler_module = "django.db.backends.mysql.compiler" @@ -323,7 +329,7 @@ class DatabaseOperations(BaseDatabaseOperations): # Truncate already resets the AUTO_INCREMENT field from # MySQL version 5.0.13 onwards. Refs #16961. if self.connection.mysql_version < (5, 0, 13): - return ["%s %s %s %s %s;" % \ + return ["%s %s %s %s %s;" % (style.SQL_KEYWORD('ALTER'), style.SQL_KEYWORD('TABLE'), style.SQL_TABLE(self.quote_name(sequence['table'])), @@ -377,6 +383,7 @@ class DatabaseOperations(BaseDatabaseOperations): items_sql = "(%s)" % ", ".join(["%s"] * len(fields)) return "VALUES " + ", ".join([items_sql] * num_values) + class DatabaseWrapper(BaseDatabaseWrapper): vendor = 'mysql' operators = { diff --git a/django/db/backends/mysql/client.py b/django/db/backends/mysql/client.py index 1cf8ceef9c..8364c7b6e6 100644 --- a/django/db/backends/mysql/client.py +++ b/django/db/backends/mysql/client.py @@ -3,6 +3,7 @@ import sys from django.db.backends import BaseDatabaseClient + class DatabaseClient(BaseDatabaseClient): executable_name = 'mysql' @@ -37,4 +38,3 @@ class DatabaseClient(BaseDatabaseClient): sys.exit(os.system(" ".join(args))) else: os.execvp(self.executable_name, args) - diff --git a/django/db/backends/mysql/compiler.py b/django/db/backends/mysql/compiler.py index 4e033e3d93..b7d1d7b98d 100644 --- a/django/db/backends/mysql/compiler.py +++ b/django/db/backends/mysql/compiler.py @@ -22,20 +22,26 @@ class SQLCompiler(compiler.SQLCompiler): sql, params = self.as_sql() return '(%s) IN (%s)' % (', '.join(['%s.%s' % (qn(alias), qn2(column)) for column in columns]), sql), params + class SQLInsertCompiler(compiler.SQLInsertCompiler, SQLCompiler): pass + class SQLDeleteCompiler(compiler.SQLDeleteCompiler, SQLCompiler): pass + class SQLUpdateCompiler(compiler.SQLUpdateCompiler, SQLCompiler): pass + class SQLAggregateCompiler(compiler.SQLAggregateCompiler, SQLCompiler): pass + class SQLDateCompiler(compiler.SQLDateCompiler, SQLCompiler): pass + class SQLDateTimeCompiler(compiler.SQLDateTimeCompiler, SQLCompiler): pass diff --git a/django/db/backends/mysql/creation.py b/django/db/backends/mysql/creation.py index 3a57c29479..b59b225f4f 100644 --- a/django/db/backends/mysql/creation.py +++ b/django/db/backends/mysql/creation.py @@ -1,34 +1,35 @@ from django.db.backends.creation import BaseDatabaseCreation + class DatabaseCreation(BaseDatabaseCreation): # This dictionary maps Field objects to their associated MySQL column # types, as strings. Column-type strings can contain format strings; they'll # be interpolated against the values of Field.__dict__ before being output. # If a column type is set to None, it won't be included in the output. data_types = { - 'AutoField': 'integer AUTO_INCREMENT', - 'BinaryField': 'longblob', - 'BooleanField': 'bool', - 'CharField': 'varchar(%(max_length)s)', + 'AutoField': 'integer AUTO_INCREMENT', + 'BinaryField': 'longblob', + 'BooleanField': 'bool', + 'CharField': 'varchar(%(max_length)s)', 'CommaSeparatedIntegerField': 'varchar(%(max_length)s)', - 'DateField': 'date', - 'DateTimeField': 'datetime', - 'DecimalField': 'numeric(%(max_digits)s, %(decimal_places)s)', - 'FileField': 'varchar(%(max_length)s)', - 'FilePathField': 'varchar(%(max_length)s)', - 'FloatField': 'double precision', - 'IntegerField': 'integer', - 'BigIntegerField': 'bigint', - 'IPAddressField': 'char(15)', + 'DateField': 'date', + 'DateTimeField': 'datetime', + 'DecimalField': 'numeric(%(max_digits)s, %(decimal_places)s)', + 'FileField': 'varchar(%(max_length)s)', + 'FilePathField': 'varchar(%(max_length)s)', + 'FloatField': 'double precision', + 'IntegerField': 'integer', + 'BigIntegerField': 'bigint', + 'IPAddressField': 'char(15)', 'GenericIPAddressField': 'char(39)', - 'NullBooleanField': 'bool', - 'OneToOneField': 'integer', + 'NullBooleanField': 'bool', + 'OneToOneField': 'integer', 'PositiveIntegerField': 'integer UNSIGNED', 'PositiveSmallIntegerField': 'smallint UNSIGNED', - 'SlugField': 'varchar(%(max_length)s)', + 'SlugField': 'varchar(%(max_length)s)', 'SmallIntegerField': 'smallint', - 'TextField': 'longtext', - 'TimeField': 'time', + 'TextField': 'longtext', + 'TimeField': 'time', } def sql_table_creation_suffix(self): diff --git a/django/db/backends/mysql/introspection.py b/django/db/backends/mysql/introspection.py index 00c567a90b..e2d382b895 100644 --- a/django/db/backends/mysql/introspection.py +++ b/django/db/backends/mysql/introspection.py @@ -7,6 +7,7 @@ from django.utils.encoding import force_text foreign_key_re = re.compile(r"\sCONSTRAINT `[^`]*` FOREIGN KEY \(`([^`]*)`\) REFERENCES `([^`]*)` \(`([^`]*)`\)") + class DatabaseIntrospection(BaseDatabaseIntrospection): data_types_reverse = { FIELD_TYPE.BLOB: 'TextField', diff --git a/django/db/backends/mysql/validation.py b/django/db/backends/mysql/validation.py index 2ce957cce7..17b7cde756 100644 --- a/django/db/backends/mysql/validation.py +++ b/django/db/backends/mysql/validation.py @@ -1,5 +1,6 @@ from django.db.backends import BaseDatabaseValidation + class DatabaseValidation(BaseDatabaseValidation): def validate_field(self, errors, opts, f): """ diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index 5fb806807d..63d38bdafd 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -7,11 +7,12 @@ from __future__ import unicode_literals import decimal import re +import platform import sys import warnings + def _setup_environment(environ): - import platform # Cygwin requires some special voodoo to set the environment variables # properly so that Oracle will see them. if platform.system().upper().startswith('CYGWIN'): @@ -91,6 +92,7 @@ class DatabaseFeatures(BaseDatabaseFeatures): supports_tablespaces = True supports_sequence_reset = False + class DatabaseOperations(BaseDatabaseOperations): compiler_module = "django.db.backends.oracle.compiler" @@ -268,7 +270,7 @@ WHEN (new.%(col_name)s IS NULL) # http://cx-oracle.sourceforge.net/html/cursor.html#Cursor.statement # The DB API definition does not define this attribute. statement = cursor.statement - if not six.PY3 and not isinstance(statement, unicode): + if statement and not six.PY3 and not isinstance(statement, unicode): statement = statement.decode('utf-8') # Unlike Psycopg's `query` and MySQLdb`'s `_last_executed`, CxOracle's # `statement` doesn't contain the query parameters. refs #20010. @@ -309,7 +311,7 @@ WHEN (new.%(col_name)s IS NULL) # Oracle puts the query text into a (query % args) construct, so % signs # in names need to be escaped. The '%%' will be collapsed back to '%' at # that stage so we aren't really making the name longer here. - name = name.replace('%','%%') + name = name.replace('%', '%%') return name.upper() def random_function_sql(self): @@ -763,7 +765,7 @@ class FormatStylePlaceholderCursor(object): def _format_params(self, params): try: - return dict((k,OracleParam(v, self, True)) for k,v in params.items()) + return dict((k, OracleParam(v, self, True)) for k, v in params.items()) except AttributeError: return tuple([OracleParam(p, self, True) for p in params]) @@ -783,12 +785,12 @@ class FormatStylePlaceholderCursor(object): for i, value in enumerate(params): if value.input_size: sizes[i] = value.input_size - self.setinputsizes(*sizes) + self.setinputsizes(*sizes) def _param_generator(self, params): # Try dict handling; if that fails, treat as sequence if hasattr(params, 'items'): - return dict((k, v.force_bytes) for k,v in params.items()) + return dict((k, v.force_bytes) for k, v in params.items()) else: return [p.force_bytes for p in params] @@ -804,14 +806,14 @@ class FormatStylePlaceholderCursor(object): query = convert_unicode(query, self.charset) elif hasattr(params, 'keys'): # Handle params as dict - args = dict((k, ":%s"%k) for k in params.keys()) + args = dict((k, ":%s" % k) for k in params.keys()) query = convert_unicode(query % args, self.charset) else: # Handle params as sequence args = [(':arg%d' % i) for i in range(len(params))] query = convert_unicode(query % tuple(args), self.charset) return query, self._format_params(params) - + def execute(self, query, params=None): query, params = self._fix_for_params(query, params) self._guess_input_sizes([params]) @@ -830,9 +832,9 @@ class FormatStylePlaceholderCursor(object): # uniform treatment for sequences and iterables params_iter = iter(params) query, firstparams = self._fix_for_params(query, next(params_iter)) - # we build a list of formatted params; as we're going to traverse it + # we build a list of formatted params; as we're going to traverse it # more than once, we can't make it lazy by using a generator - formatted = [firstparams]+[self._format_params(p) for p in params_iter] + formatted = [firstparams] + [self._format_params(p) for p in params_iter] self._guess_input_sizes(formatted) try: return self.cursor.executemany(query, diff --git a/django/db/backends/oracle/client.py b/django/db/backends/oracle/client.py index ccc64ebffc..ac6b79041f 100644 --- a/django/db/backends/oracle/client.py +++ b/django/db/backends/oracle/client.py @@ -3,6 +3,7 @@ import sys from django.db.backends import BaseDatabaseClient + class DatabaseClient(BaseDatabaseClient): executable_name = 'sqlplus' @@ -13,4 +14,3 @@ class DatabaseClient(BaseDatabaseClient): sys.exit(os.system(" ".join(args))) else: os.execvp(self.executable_name, args) - diff --git a/django/db/backends/oracle/compiler.py b/django/db/backends/oracle/compiler.py index cbee27951c..d2d4cd3ac9 100644 --- a/django/db/backends/oracle/compiler.py +++ b/django/db/backends/oracle/compiler.py @@ -60,17 +60,22 @@ class SQLCompiler(compiler.SQLCompiler): class SQLInsertCompiler(compiler.SQLInsertCompiler, SQLCompiler): pass + class SQLDeleteCompiler(compiler.SQLDeleteCompiler, SQLCompiler): pass + class SQLUpdateCompiler(compiler.SQLUpdateCompiler, SQLCompiler): pass + class SQLAggregateCompiler(compiler.SQLAggregateCompiler, SQLCompiler): pass + class SQLDateCompiler(compiler.SQLDateCompiler, SQLCompiler): pass + class SQLDateTimeCompiler(compiler.SQLDateTimeCompiler, SQLCompiler): pass diff --git a/django/db/backends/oracle/creation.py b/django/db/backends/oracle/creation.py index 7f1192ed8a..f7d43ae7b6 100644 --- a/django/db/backends/oracle/creation.py +++ b/django/db/backends/oracle/creation.py @@ -5,9 +5,11 @@ from django.conf import settings from django.db.backends.creation import BaseDatabaseCreation from django.utils.six.moves import input + TEST_DATABASE_PREFIX = 'test_' PASSWORD = 'Im_a_lumberjack' + class DatabaseCreation(BaseDatabaseCreation): # This dictionary maps Field objects to their associated Oracle column # types, as strings. Column-type strings can contain format strings; they'll @@ -18,30 +20,30 @@ class DatabaseCreation(BaseDatabaseCreation): # output (the "qn_" prefix is stripped before the lookup is performed. data_types = { - 'AutoField': 'NUMBER(11)', - 'BinaryField': 'BLOB', - 'BooleanField': 'NUMBER(1)', - 'CharField': 'NVARCHAR2(%(max_length)s)', - 'CommaSeparatedIntegerField': 'VARCHAR2(%(max_length)s)', - 'DateField': 'DATE', - 'DateTimeField': 'TIMESTAMP', - 'DecimalField': 'NUMBER(%(max_digits)s, %(decimal_places)s)', - 'FileField': 'NVARCHAR2(%(max_length)s)', - 'FilePathField': 'NVARCHAR2(%(max_length)s)', - 'FloatField': 'DOUBLE PRECISION', - 'IntegerField': 'NUMBER(11)', - 'BigIntegerField': 'NUMBER(19)', - 'IPAddressField': 'VARCHAR2(15)', - 'GenericIPAddressField': 'VARCHAR2(39)', - 'NullBooleanField': 'NUMBER(1)', - 'OneToOneField': 'NUMBER(11)', - 'PositiveIntegerField': 'NUMBER(11)', - 'PositiveSmallIntegerField': 'NUMBER(11)', - 'SlugField': 'NVARCHAR2(%(max_length)s)', - 'SmallIntegerField': 'NUMBER(11)', - 'TextField': 'NCLOB', - 'TimeField': 'TIMESTAMP', - 'URLField': 'VARCHAR2(%(max_length)s)', + 'AutoField': 'NUMBER(11)', + 'BinaryField': 'BLOB', + 'BooleanField': 'NUMBER(1)', + 'CharField': 'NVARCHAR2(%(max_length)s)', + 'CommaSeparatedIntegerField': 'VARCHAR2(%(max_length)s)', + 'DateField': 'DATE', + 'DateTimeField': 'TIMESTAMP', + 'DecimalField': 'NUMBER(%(max_digits)s, %(decimal_places)s)', + 'FileField': 'NVARCHAR2(%(max_length)s)', + 'FilePathField': 'NVARCHAR2(%(max_length)s)', + 'FloatField': 'DOUBLE PRECISION', + 'IntegerField': 'NUMBER(11)', + 'BigIntegerField': 'NUMBER(19)', + 'IPAddressField': 'VARCHAR2(15)', + 'GenericIPAddressField': 'VARCHAR2(39)', + 'NullBooleanField': 'NUMBER(1)', + 'OneToOneField': 'NUMBER(11)', + 'PositiveIntegerField': 'NUMBER(11)', + 'PositiveSmallIntegerField': 'NUMBER(11)', + 'SlugField': 'NVARCHAR2(%(max_length)s)', + 'SmallIntegerField': 'NUMBER(11)', + 'TextField': 'NCLOB', + 'TimeField': 'TIMESTAMP', + 'URLField': 'VARCHAR2(%(max_length)s)', } data_type_check_constraints = { @@ -190,7 +192,7 @@ class DatabaseCreation(BaseDatabaseCreation): statements = [ 'DROP TABLESPACE %(tblspace)s INCLUDING CONTENTS AND DATAFILES CASCADE CONSTRAINTS', 'DROP TABLESPACE %(tblspace_temp)s INCLUDING CONTENTS AND DATAFILES CASCADE CONSTRAINTS', - ] + ] self._execute_statements(cursor, statements, parameters, verbosity) def _destroy_test_user(self, cursor, parameters, verbosity): diff --git a/django/db/backends/oracle/introspection.py b/django/db/backends/oracle/introspection.py index 361308a62c..a2fad92509 100644 --- a/django/db/backends/oracle/introspection.py +++ b/django/db/backends/oracle/introspection.py @@ -1,10 +1,13 @@ -from django.db.backends import BaseDatabaseIntrospection, FieldInfo -from django.utils.encoding import force_text -import cx_Oracle import re +import cx_Oracle + +from django.db.backends import BaseDatabaseIntrospection, FieldInfo +from django.utils.encoding import force_text + foreign_key_re = re.compile(r"\sCONSTRAINT `[^`]*` FOREIGN KEY \(`([^`]*)`\) REFERENCES `([^`]*)` \(`([^`]*)`\)") + class DatabaseIntrospection(BaseDatabaseIntrospection): # Maps type objects to Django Field types. data_types_reverse = { @@ -95,11 +98,11 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): SELECT ccol.column_name, rcol.table_name AS referenced_table, rcol.column_name AS referenced_column FROM user_constraints c JOIN user_cons_columns ccol - ON ccol.constraint_name = c.constraint_name + ON ccol.constraint_name = c.constraint_name JOIN user_cons_columns rcol - ON rcol.constraint_name = c.r_constraint_name - WHERE c.table_name = %s AND c.constraint_type = 'R'""" , [table_name.upper()]) - return [tuple(cell.lower() for cell in row) + ON rcol.constraint_name = c.r_constraint_name + WHERE c.table_name = %s AND c.constraint_type = 'R'""", [table_name.upper()]) + return [tuple(cell.lower() for cell in row) for row in cursor.fetchall()] def get_indexes(self, cursor, table_name): diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py index bf75459b4a..f283476429 100644 --- a/django/db/backends/postgresql_psycopg2/base.py +++ b/django/db/backends/postgresql_psycopg2/base.py @@ -6,7 +6,9 @@ Requires psycopg 2: http://initd.org/projects/psycopg2 import logging import sys -from django.db.backends import * +from django.conf import settings +from django.db.backends import (BaseDatabaseFeatures, BaseDatabaseWrapper, + BaseDatabaseValidation) from django.db.backends.postgresql_psycopg2.operations import DatabaseOperations from django.db.backends.postgresql_psycopg2.client import DatabaseClient from django.db.backends.postgresql_psycopg2.creation import DatabaseCreation @@ -34,11 +36,13 @@ psycopg2.extensions.register_adapter(SafeText, psycopg2.extensions.QuotedString) logger = logging.getLogger('django.db.backends') + def utc_tzinfo_factory(offset): if offset != 0: raise AssertionError("database connection isn't set to UTC") return utc + class DatabaseFeatures(BaseDatabaseFeatures): needs_datetime_string_cast = False can_return_id_from_insert = True @@ -55,6 +59,7 @@ class DatabaseFeatures(BaseDatabaseFeatures): can_rollback_ddl = True supports_combined_alters = True + class DatabaseWrapper(BaseDatabaseWrapper): vendor = 'postgresql' operators = { @@ -135,7 +140,8 @@ class DatabaseWrapper(BaseDatabaseWrapper): # Set the time zone in autocommit mode (see #17062) self.set_autocommit(True) self.connection.cursor().execute( - self.ops.set_time_zone_sql(), [tz]) + self.ops.set_time_zone_sql(), [tz] + ) self.connection.set_isolation_level(self.isolation_level) def create_cursor(self): diff --git a/django/db/backends/postgresql_psycopg2/client.py b/django/db/backends/postgresql_psycopg2/client.py index a5c02969ea..23ac9f2975 100644 --- a/django/db/backends/postgresql_psycopg2/client.py +++ b/django/db/backends/postgresql_psycopg2/client.py @@ -3,6 +3,7 @@ import sys from django.db.backends import BaseDatabaseClient + class DatabaseClient(BaseDatabaseClient): executable_name = 'psql' @@ -20,4 +21,3 @@ class DatabaseClient(BaseDatabaseClient): sys.exit(os.system(" ".join(args))) else: os.execvp(self.executable_name, args) - diff --git a/django/db/backends/postgresql_psycopg2/creation.py b/django/db/backends/postgresql_psycopg2/creation.py index 1bfda6354d..954e198764 100644 --- a/django/db/backends/postgresql_psycopg2/creation.py +++ b/django/db/backends/postgresql_psycopg2/creation.py @@ -8,29 +8,29 @@ class DatabaseCreation(BaseDatabaseCreation): # be interpolated against the values of Field.__dict__ before being output. # If a column type is set to None, it won't be included in the output. data_types = { - 'AutoField': 'serial', - 'BinaryField': 'bytea', - 'BooleanField': 'boolean', - 'CharField': 'varchar(%(max_length)s)', + 'AutoField': 'serial', + 'BinaryField': 'bytea', + 'BooleanField': 'boolean', + 'CharField': 'varchar(%(max_length)s)', 'CommaSeparatedIntegerField': 'varchar(%(max_length)s)', - 'DateField': 'date', - 'DateTimeField': 'timestamp with time zone', - 'DecimalField': 'numeric(%(max_digits)s, %(decimal_places)s)', - 'FileField': 'varchar(%(max_length)s)', - 'FilePathField': 'varchar(%(max_length)s)', - 'FloatField': 'double precision', - 'IntegerField': 'integer', - 'BigIntegerField': 'bigint', - 'IPAddressField': 'inet', + 'DateField': 'date', + 'DateTimeField': 'timestamp with time zone', + 'DecimalField': 'numeric(%(max_digits)s, %(decimal_places)s)', + 'FileField': 'varchar(%(max_length)s)', + 'FilePathField': 'varchar(%(max_length)s)', + 'FloatField': 'double precision', + 'IntegerField': 'integer', + 'BigIntegerField': 'bigint', + 'IPAddressField': 'inet', 'GenericIPAddressField': 'inet', - 'NullBooleanField': 'boolean', - 'OneToOneField': 'integer', + 'NullBooleanField': 'boolean', + 'OneToOneField': 'integer', 'PositiveIntegerField': 'integer', 'PositiveSmallIntegerField': 'smallint', - 'SlugField': 'varchar(%(max_length)s)', + 'SlugField': 'varchar(%(max_length)s)', 'SmallIntegerField': 'smallint', - 'TextField': 'text', - 'TimeField': 'time', + 'TextField': 'text', + 'TimeField': 'time', } data_type_check_constraints = { @@ -59,7 +59,7 @@ class DatabaseCreation(BaseDatabaseCreation): def get_index_sql(index_name, opclass=''): return (style.SQL_KEYWORD('CREATE INDEX') + ' ' + - style.SQL_TABLE(qn(truncate_name(index_name,self.connection.ops.max_name_length()))) + ' ' + + style.SQL_TABLE(qn(truncate_name(index_name, self.connection.ops.max_name_length()))) + ' ' + style.SQL_KEYWORD('ON') + ' ' + style.SQL_TABLE(qn(db_table)) + ' ' + "(%s%s)" % (style.SQL_FIELD(qn(f.column)), opclass) + diff --git a/django/db/backends/postgresql_psycopg2/introspection.py b/django/db/backends/postgresql_psycopg2/introspection.py index 4f77059376..a816bb34d8 100644 --- a/django/db/backends/postgresql_psycopg2/introspection.py +++ b/django/db/backends/postgresql_psycopg2/introspection.py @@ -25,7 +25,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): 1266: 'TimeField', 1700: 'DecimalField', } - + def get_table_list(self, cursor): "Returns a list of table names in the current database." cursor.execute(""" @@ -47,7 +47,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): WHERE table_name = %s""", [table_name]) null_map = dict(cursor.fetchall()) cursor.execute("SELECT * FROM %s LIMIT 1" % self.connection.ops.quote_name(table_name)) - return [FieldInfo(*((force_text(line[0]),) + line[1:6] + (null_map[force_text(line[0])]=='YES',))) + return [FieldInfo(*((force_text(line[0]),) + line[1:6] + (null_map[force_text(line[0])] == 'YES',))) for line in cursor.description] def get_relations(self, cursor, table_name): @@ -81,7 +81,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): ON ccu.constraint_catalog = tc.constraint_catalog AND ccu.constraint_schema = tc.constraint_schema AND ccu.constraint_name = tc.constraint_name - WHERE kcu.table_name = %s AND tc.constraint_type = 'FOREIGN KEY'""" , [table_name]) + WHERE kcu.table_name = %s AND tc.constraint_type = 'FOREIGN KEY'""", [table_name]) key_columns.extend(cursor.fetchall()) return key_columns diff --git a/django/db/backends/postgresql_psycopg2/operations.py b/django/db/backends/postgresql_psycopg2/operations.py index c5aab84693..cc78ffe449 100644 --- a/django/db/backends/postgresql_psycopg2/operations.py +++ b/django/db/backends/postgresql_psycopg2/operations.py @@ -135,7 +135,7 @@ class DatabaseOperations(BaseDatabaseOperations): # This will be the case if it's an m2m using an autogenerated # intermediate table (see BaseDatabaseIntrospection.sequence_list) column_name = 'id' - sql.append("%s setval(pg_get_serial_sequence('%s','%s'), 1, false);" % \ + sql.append("%s setval(pg_get_serial_sequence('%s','%s'), 1, false);" % (style.SQL_KEYWORD('SELECT'), style.SQL_TABLE(self.quote_name(table_name)), style.SQL_FIELD(column_name)) @@ -161,7 +161,7 @@ class DatabaseOperations(BaseDatabaseOperations): for f in model._meta.local_fields: if isinstance(f, models.AutoField): - output.append("%s setval(pg_get_serial_sequence('%s','%s'), coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \ + output.append("%s setval(pg_get_serial_sequence('%s','%s'), coalesce(max(%s), 1), max(%s) %s null) %s %s;" % (style.SQL_KEYWORD('SELECT'), style.SQL_TABLE(qn(model._meta.db_table)), style.SQL_FIELD(f.column), @@ -173,7 +173,7 @@ class DatabaseOperations(BaseDatabaseOperations): break # Only one AutoField is allowed per model, so don't bother continuing. for f in model._meta.many_to_many: if not f.rel.through: - output.append("%s setval(pg_get_serial_sequence('%s','%s'), coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \ + output.append("%s setval(pg_get_serial_sequence('%s','%s'), coalesce(max(%s), 1), max(%s) %s null) %s %s;" % (style.SQL_KEYWORD('SELECT'), style.SQL_TABLE(qn(f.m2m_db_table())), style.SQL_FIELD('id'), diff --git a/django/db/backends/postgresql_psycopg2/version.py b/django/db/backends/postgresql_psycopg2/version.py index 8ef516704e..dae94f2dac 100644 --- a/django/db/backends/postgresql_psycopg2/version.py +++ b/django/db/backends/postgresql_psycopg2/version.py @@ -19,7 +19,8 @@ def _parse_version(text): try: return int(major) * 10000 + int(major2) * 100 + int(minor) except (ValueError, TypeError): - return int(major) * 10000 + int(major2) * 100 + return int(major) * 10000 + int(major2) * 100 + def get_version(connection): """ diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py index e330082108..960b6def03 100644 --- a/django/db/backends/sqlite3/base.py +++ b/django/db/backends/sqlite3/base.py @@ -11,8 +11,10 @@ import decimal import warnings import re +from django.conf import settings from django.db import utils -from django.db.backends import * +from django.db.backends import (util, BaseDatabaseFeatures, + BaseDatabaseOperations, BaseDatabaseWrapper, BaseDatabaseValidation) from django.db.backends.sqlite3.client import DatabaseClient from django.db.backends.sqlite3.creation import DatabaseCreation from django.db.backends.sqlite3.introspection import DatabaseIntrospection @@ -43,6 +45,7 @@ except ImportError: DatabaseError = Database.DatabaseError IntegrityError = Database.IntegrityError + def parse_datetime_with_timezone_support(value): dt = parse_datetime(value) # Confirm that dt is naive before overwriting its tzinfo. @@ -50,6 +53,7 @@ def parse_datetime_with_timezone_support(value): dt = dt.replace(tzinfo=timezone.utc) return dt + def adapt_datetime_with_timezone_support(value): # Equivalent to DateTimeField.get_db_prep_value. Used only by raw SQL. if settings.USE_TZ: @@ -62,6 +66,7 @@ def adapt_datetime_with_timezone_support(value): value = value.astimezone(timezone.utc).replace(tzinfo=None) return value.isoformat(str(" ")) + def decoder(conv_func): """ The Python sqlite3 interface returns always byte strings. This function converts the received value to a regular string before @@ -82,6 +87,7 @@ Database.register_adapter(decimal.Decimal, util.rev_typecast_decimal) Database.register_adapter(str, lambda s: s.decode('utf-8')) Database.register_adapter(SafeBytes, lambda s: s.decode('utf-8')) + class DatabaseFeatures(BaseDatabaseFeatures): # SQLite cannot handle us only partially reading from a cursor's result set # and then writing the same rows to the database in another cursor. This @@ -127,6 +133,7 @@ class DatabaseFeatures(BaseDatabaseFeatures): def has_zoneinfo_database(self): return pytz is not None + class DatabaseOperations(BaseDatabaseOperations): def bulk_batch_size(self, fields, objs): """ @@ -275,6 +282,7 @@ class DatabaseOperations(BaseDatabaseOperations): res.extend(["UNION ALL SELECT %s" % ", ".join(["%s"] * len(fields))] * (num_values - 1)) return " ".join(res) + class DatabaseWrapper(BaseDatabaseWrapper): vendor = 'sqlite' # SQLite requires LIKE statements to include an ESCAPE clause if the value @@ -433,6 +441,7 @@ class DatabaseWrapper(BaseDatabaseWrapper): FORMAT_QMARK_REGEX = re.compile(r'(? 1 - # Create a forloop value in the context. We'll update counters on each - # iteration just below. - loop_dict = context['forloop'] = {'parentloop': parentloop} - for i, item in enumerate(values): - # Shortcuts for current loop iteration number. - loop_dict['counter0'] = i - loop_dict['counter'] = i+1 - # Reverse counter iteration numbers. - loop_dict['revcounter'] = len_values - i - loop_dict['revcounter0'] = len_values - i - 1 - # Boolean values designating first and last times through loop. - loop_dict['first'] = (i == 0) - loop_dict['last'] = (i == len_values - 1) + with context.push(): + try: + values = self.sequence.resolve(context, True) + except VariableDoesNotExist: + values = [] + if values is None: + values = [] + if not hasattr(values, '__len__'): + values = list(values) + len_values = len(values) + if len_values < 1: + return self.nodelist_empty.render(context) + nodelist = NodeList() + if self.is_reversed: + values = reversed(values) + unpack = len(self.loopvars) > 1 + # Create a forloop value in the context. We'll update counters on each + # iteration just below. + loop_dict = context['forloop'] = {'parentloop': parentloop} + for i, item in enumerate(values): + # Shortcuts for current loop iteration number. + loop_dict['counter0'] = i + loop_dict['counter'] = i+1 + # Reverse counter iteration numbers. + loop_dict['revcounter'] = len_values - i + loop_dict['revcounter0'] = len_values - i - 1 + # Boolean values designating first and last times through loop. + loop_dict['first'] = (i == 0) + loop_dict['last'] = (i == len_values - 1) - pop_context = False - if unpack: - # If there are multiple loop variables, unpack the item into - # them. - try: - unpacked_vars = dict(zip(self.loopvars, item)) - except TypeError: - pass - else: - pop_context = True - context.update(unpacked_vars) - else: - context[self.loopvars[0]] = item - # In TEMPLATE_DEBUG mode provide source of the node which - # actually raised the exception - if settings.TEMPLATE_DEBUG: - for node in self.nodelist_loop: + pop_context = False + if unpack: + # If there are multiple loop variables, unpack the item into + # them. try: + unpacked_vars = dict(zip(self.loopvars, item)) + except TypeError: + pass + else: + pop_context = True + context.update(unpacked_vars) + else: + context[self.loopvars[0]] = item + # In TEMPLATE_DEBUG mode provide source of the node which + # actually raised the exception + if settings.TEMPLATE_DEBUG: + for node in self.nodelist_loop: + try: + nodelist.append(node.render(context)) + except Exception as e: + if not hasattr(e, 'django_template_source'): + e.django_template_source = node.source + raise + else: + for node in self.nodelist_loop: nodelist.append(node.render(context)) - except Exception as e: - if not hasattr(e, 'django_template_source'): - e.django_template_source = node.source - raise - else: - for node in self.nodelist_loop: - nodelist.append(node.render(context)) - if pop_context: - # The loop variables were pushed on to the context so pop them - # off again. This is necessary because the tag lets the length - # of loopvars differ to the length of each set of items and we - # don't want to leave any vars from the previous loop on the - # context. - context.pop() - context.pop() + if pop_context: + # The loop variables were pushed on to the context so pop them + # off again. This is necessary because the tag lets the length + # of loopvars differ to the length of each set of items and we + # don't want to leave any vars from the previous loop on the + # context. + context.pop() return nodelist.render(context) class IfChangedNode(Node): @@ -500,10 +497,9 @@ class WithNode(Node): def render(self, context): values = dict([(key, val.resolve(context)) for key, val in six.iteritems(self.extra_context)]) - context.update(values) - output = self.nodelist.render(context) - context.pop() - return output + with context.push(**values): + return self.nodelist.render(context) + @register.tag def autoescape(parser, token): diff --git a/django/template/loader.py b/django/template/loader.py index 6df4e43c4f..44b8f600fb 100644 --- a/django/template/loader.py +++ b/django/template/loader.py @@ -164,11 +164,8 @@ def render_to_string(template_name, dictionary=None, context_instance=None): return t.render(Context(dictionary)) # Add the dictionary to the context stack, ensuring it gets removed again # to keep the context_instance in the same state it started in. - context_instance.update(dictionary) - try: + with context_instance.push(dictionary): return t.render(context_instance) - finally: - context_instance.pop() def select_template(template_name_list): "Given a list of template names, returns the first that can be loaded." diff --git a/django/template/loader_tags.py b/django/template/loader_tags.py index 767f0e5ff8..406775da9d 100644 --- a/django/template/loader_tags.py +++ b/django/template/loader_tags.py @@ -47,22 +47,21 @@ class BlockNode(Node): def render(self, context): block_context = context.render_context.get(BLOCK_CONTEXT_KEY) - context.push() - if block_context is None: - context['block'] = self - result = self.nodelist.render(context) - else: - push = block = block_context.pop(self.name) - if block is None: - block = self - # Create new block so we can store context without thread-safety issues. - block = BlockNode(block.name, block.nodelist) - block.context = context - context['block'] = block - result = block.nodelist.render(context) - if push is not None: - block_context.push(self.name, push) - context.pop() + with context.push(): + if block_context is None: + context['block'] = self + result = self.nodelist.render(context) + else: + push = block = block_context.pop(self.name) + if block is None: + block = self + # Create new block so we can store context without thread-safety issues. + block = BlockNode(block.name, block.nodelist) + block.context = context + context['block'] = block + result = block.nodelist.render(context) + if push is not None: + block_context.push(self.name, push) return result def super(self): @@ -133,10 +132,9 @@ class BaseIncludeNode(Node): in six.iteritems(self.extra_context)]) if self.isolated_context: return template.render(context.new(values)) - context.update(values) - output = template.render(context) - context.pop() - return output + with context.push(**values): + return template.render(context) + class ConstantIncludeNode(BaseIncludeNode): def __init__(self, template_path, *args, **kwargs): diff --git a/django/test/client.py b/django/test/client.py index 94cfada725..8dbd33ccf1 100644 --- a/django/test/client.py +++ b/django/test/client.py @@ -180,7 +180,11 @@ def encode_multipart(boundary, data): def encode_file(boundary, key, file): to_bytes = lambda s: force_bytes(s, settings.DEFAULT_CHARSET) - content_type = mimetypes.guess_type(file.name)[0] + if hasattr(file, 'content_type'): + content_type = file.content_type + else: + content_type = mimetypes.guess_type(file.name)[0] + if content_type is None: content_type = 'application/octet-stream' return [ diff --git a/django/test/runner.py b/django/test/runner.py index 6897906098..c7881ada63 100644 --- a/django/test/runner.py +++ b/django/test/runner.py @@ -238,6 +238,7 @@ def setup_databases(verbosity, interactive, **kwargs): mirrored_aliases = {} test_databases = {} dependencies = {} + default_sig = connections[DEFAULT_DB_ALIAS].creation.test_db_signature() for alias in connections: connection = connections[alias] if connection.settings_dict['TEST_MIRROR']: @@ -259,7 +260,7 @@ def setup_databases(verbosity, interactive, **kwargs): dependencies[alias] = ( connection.settings_dict['TEST_DEPENDENCIES']) else: - if alias != DEFAULT_DB_ALIAS: + if alias != DEFAULT_DB_ALIAS and connection.creation.test_db_signature() != default_sig: dependencies[alias] = connection.settings_dict.get( 'TEST_DEPENDENCIES', [DEFAULT_DB_ALIAS]) @@ -271,15 +272,16 @@ def setup_databases(verbosity, interactive, **kwargs): test_databases.items(), dependencies): test_db_name = None # Actually create the database for the first connection - for alias in aliases: connection = connections[alias] - old_names.append((connection, db_name, True)) if test_db_name is None: test_db_name = connection.creation.create_test_db( verbosity, autoclobber=not interactive) + destroy = True else: connection.settings_dict['NAME'] = test_db_name + destroy = False + old_names.append((connection, db_name, destroy)) for alias, mirror_alias in mirrored_aliases.items(): mirrors.append((alias, connections[alias].settings_dict['NAME'])) diff --git a/django/test/signals.py b/django/test/signals.py index a96bdff3b3..de8802b381 100644 --- a/django/test/signals.py +++ b/django/test/signals.py @@ -1,5 +1,6 @@ import os import time +import warnings from django.conf import settings from django.db import connections @@ -9,11 +10,14 @@ from django.utils.functional import empty template_rendered = Signal(providing_args=["template", "context"]) -setting_changed = Signal(providing_args=["setting", "value"]) +setting_changed = Signal(providing_args=["setting", "value", "enter"]) # Most setting_changed receivers are supposed to be added below, # except for cases where the receiver is related to a contrib app. +# Settings that may not work well when using 'override_settings' (#19031) +COMPLEX_OVERRIDE_SETTINGS = set(['DATABASES']) + @receiver(setting_changed) def update_connections_time_zone(**kwargs): @@ -74,8 +78,15 @@ def language_changed(**kwargs): if kwargs['setting'] == 'LOCALE_PATHS': trans_real._translations = {} + @receiver(setting_changed) def file_storage_changed(**kwargs): if kwargs['setting'] in ('MEDIA_ROOT', 'DEFAULT_FILE_STORAGE'): from django.core.files.storage import default_storage default_storage._wrapped = empty + + +@receiver(setting_changed) +def complex_setting_changed(**kwargs): + if kwargs['enter'] and kwargs['setting'] in COMPLEX_OVERRIDE_SETTINGS: + warnings.warn("Overriding setting %s can lead to unexpected behaviour." % kwargs['setting']) diff --git a/django/test/testcases.py b/django/test/testcases.py index c5299bdabc..6f3f1c00e4 100644 --- a/django/test/testcases.py +++ b/django/test/testcases.py @@ -8,7 +8,6 @@ import json import os import re import sys -import select import socket import threading import unittest @@ -880,10 +879,19 @@ class TestCase(TransactionTestCase): self.atomics[db_name].__exit__(None, None, None) +class CheckCondition(object): + """Descriptor class for deferred condition checking""" + def __init__(self, cond_func): + self.cond_func = cond_func + + def __get__(self, obj, objtype): + return self.cond_func() + + def _deferredSkip(condition, reason): def decorator(test_func): if not (isinstance(test_func, type) and - issubclass(test_func, TestCase)): + issubclass(test_func, unittest.TestCase)): @wraps(test_func) def skip_wrapper(*args, **kwargs): if condition(): @@ -891,7 +899,9 @@ def _deferredSkip(condition, reason): return test_func(*args, **kwargs) test_item = skip_wrapper else: + # Assume a class is decorated test_item = test_func + test_item.__unittest_skip__ = CheckCondition(condition) test_item.__unittest_skip_why__ = reason return test_item return decorator @@ -924,104 +934,6 @@ class QuietWSGIRequestHandler(WSGIRequestHandler): pass -if sys.version_info >= (3, 3, 0): - _ImprovedEvent = threading.Event -elif sys.version_info >= (2, 7, 0): - _ImprovedEvent = threading._Event -else: - class _ImprovedEvent(threading._Event): - """ - Does the same as `threading.Event` except it overrides the wait() method - with some code borrowed from Python 2.7 to return the set state of the - event (see: http://hg.python.org/cpython/rev/b5aa8aa78c0f/). This allows - to know whether the wait() method exited normally or because of the - timeout. This class can be removed when Django supports only Python >= 2.7. - """ - - def wait(self, timeout=None): - self._Event__cond.acquire() - try: - if not self._Event__flag: - self._Event__cond.wait(timeout) - return self._Event__flag - finally: - self._Event__cond.release() - - -class StoppableWSGIServer(WSGIServer): - """ - The code in this class is borrowed from the `SocketServer.BaseServer` class - in Python 2.6. The important functionality here is that the server is non- - blocking and that it can be shut down at any moment. This is made possible - by the server regularly polling the socket and checking if it has been - asked to stop. - Note for the future: Once Django stops supporting Python 2.6, this class - can be removed as `WSGIServer` will have this ability to shutdown on - demand and will not require the use of the _ImprovedEvent class whose code - is borrowed from Python 2.7. - """ - - def __init__(self, *args, **kwargs): - super(StoppableWSGIServer, self).__init__(*args, **kwargs) - self.__is_shut_down = _ImprovedEvent() - self.__serving = False - - def serve_forever(self, poll_interval=0.5): - """ - Handle one request at a time until shutdown. - - Polls for shutdown every poll_interval seconds. - """ - self.__serving = True - self.__is_shut_down.clear() - while self.__serving: - r, w, e = select.select([self], [], [], poll_interval) - if r: - self._handle_request_noblock() - self.__is_shut_down.set() - - def shutdown(self): - """ - Stops the serve_forever loop. - - Blocks until the loop has finished. This must be called while - serve_forever() is running in another thread, or it will - deadlock. - """ - self.__serving = False - if not self.__is_shut_down.wait(2): - raise RuntimeError( - "Failed to shutdown the live test server in 2 seconds. The " - "server might be stuck or generating a slow response.") - - def handle_request(self): - """Handle one request, possibly blocking. - """ - fd_sets = select.select([self], [], [], None) - if not fd_sets[0]: - return - self._handle_request_noblock() - - def _handle_request_noblock(self): - """ - Handle one request, without blocking. - - I assume that select.select has returned that the socket is - readable before this function was called, so there should be - no risk of blocking in get_request(). - """ - try: - request, client_address = self.get_request() - except socket.error: - return - if self.verify_request(request, client_address): - try: - self.process_request(request, client_address) - except Exception: - self.handle_error(request, client_address) - self.close_request(request) - - class _MediaFilesHandler(StaticFilesHandler): """ Handler for serving the media files. This is a private class that is @@ -1071,7 +983,7 @@ class LiveServerThread(threading.Thread): # one that is free to use for the WSGI server. for index, port in enumerate(self.possible_ports): try: - self.httpd = StoppableWSGIServer( + self.httpd = WSGIServer( (self.host, port), QuietWSGIRequestHandler) except WSGIServerException as e: if (index + 1 < len(self.possible_ports) and @@ -1128,7 +1040,7 @@ class LiveServerTestCase(TransactionTestCase): for conn in connections.all(): # If using in-memory sqlite databases, pass the connections to # the server thread. - if (conn.settings_dict['ENGINE'].rsplit('.', 1)[-1] in ('sqlite3', 'spatialite') + if (conn.vendor == 'sqlite' and conn.settings_dict['NAME'] == ':memory:'): # Explicitly enable thread-shareability for this connection conn.allow_thread_sharing = True @@ -1180,7 +1092,7 @@ class LiveServerTestCase(TransactionTestCase): # Restore sqlite connections' non-sharability for conn in connections.all(): - if (conn.settings_dict['ENGINE'].rsplit('.', 1)[-1] in ('sqlite3', 'spatialite') + if (conn.vendor == 'sqlite' and conn.settings_dict['NAME'] == ':memory:'): conn.allow_thread_sharing = False diff --git a/django/test/utils.py b/django/test/utils.py index 70ce640239..dc3e5952ea 100644 --- a/django/test/utils.py +++ b/django/test/utils.py @@ -228,7 +228,7 @@ class override_settings(object): settings._wrapped = override for key, new_value in self.options.items(): setting_changed.send(sender=settings._wrapped.__class__, - setting=key, value=new_value) + setting=key, value=new_value, enter=True) def disable(self): settings._wrapped = self.wrapped @@ -236,7 +236,7 @@ class override_settings(object): for key in self.options: new_value = getattr(settings, key, None) setting_changed.send(sender=settings._wrapped.__class__, - setting=key, value=new_value) + setting=key, value=new_value, enter=False) def compare_xml(want, got): diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py index 7eba842a89..de32b9f8cc 100644 --- a/django/utils/feedgenerator.py +++ b/django/utils/feedgenerator.py @@ -114,11 +114,11 @@ class SyndicationFeed(object): def add_item(self, title, link, description, author_email=None, author_name=None, author_link=None, pubdate=None, comments=None, unique_id=None, unique_id_is_permalink=None, enclosure=None, - categories=(), item_copyright=None, ttl=None, **kwargs): + categories=(), item_copyright=None, ttl=None, updateddate=None, **kwargs): """ Adds an item to the feed. All args are expected to be Python Unicode - objects except pubdate, which is a datetime.datetime object, and - enclosure, which is an instance of the Enclosure class. + objects except pubdate and updateddate, which are datetime.datetime + objects, and enclosure, which is an instance of the Enclosure class. """ to_unicode = lambda s: force_text(s, strings_only=True) if categories: @@ -134,6 +134,7 @@ class SyndicationFeed(object): 'author_name': to_unicode(author_name), 'author_link': iri_to_uri(author_link), 'pubdate': pubdate, + 'updateddate': updateddate, 'comments': to_unicode(comments), 'unique_id': to_unicode(unique_id), 'unique_id_is_permalink': unique_id_is_permalink, @@ -191,15 +192,20 @@ class SyndicationFeed(object): def latest_post_date(self): """ - Returns the latest item's pubdate. If none of them have a pubdate, - this returns the current date/time. + Returns the latest item's pubdate or updateddate. If no items + have either of these attributes this returns the current date/time. """ - updates = [i['pubdate'] for i in self.items if i['pubdate'] is not None] - if len(updates) > 0: - updates.sort() - return updates[-1] - else: - return datetime.datetime.now() + latest_date = None + date_keys = ('updateddate', 'pubdate') + + for item in self.items: + for date_key in date_keys: + item_date = item.get(date_key) + if item_date: + if latest_date is None or item_date > latest_date: + latest_date = item_date + + return latest_date or datetime.datetime.now() class Enclosure(object): "Represents an RSS enclosure" @@ -349,8 +355,12 @@ class Atom1Feed(SyndicationFeed): def add_item_elements(self, handler, item): handler.addQuickElement("title", item['title']) handler.addQuickElement("link", "", {"href": item['link'], "rel": "alternate"}) + if item['pubdate'] is not None: - handler.addQuickElement("updated", rfc3339_date(item['pubdate'])) + handler.addQuickElement('published', rfc3339_date(item['pubdate'])) + + if item['updateddate'] is not None: + handler.addQuickElement('updated', rfc3339_date(item['updateddate'])) # Author information. if item['author_name'] is not None: diff --git a/django/utils/functional.py b/django/utils/functional.py index 0606c775ef..e23bd3ff80 100644 --- a/django/utils/functional.py +++ b/django/utils/functional.py @@ -403,9 +403,8 @@ def partition(predicate, values): if sys.version_info >= (2, 7, 2): from functools import total_ordering else: - # For Python < 2.7.2. Python 2.6 does not have total_ordering, and - # total_ordering in 2.7 versions prior to 2.7.2 is buggy. See - # http://bugs.python.org/issue10042 for details. For these versions use + # For Python < 2.7.2. total_ordering in versions prior to 2.7.2 is buggy. + # See http://bugs.python.org/issue10042 for details. For these versions use # code borrowed from Python 2.7.3. def total_ordering(cls): """Class decorator that fills in missing ordering methods""" diff --git a/django/utils/image.py b/django/utils/image.py index 2fd0c6e6b0..dd2fab6197 100644 --- a/django/utils/image.py +++ b/django/utils/image.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ To provide a shim layer over Pillow/PIL situation until the PIL support is -removed. +removed. See #19934. Combinations To Account For @@ -132,6 +132,8 @@ def _detect_image_library(): try: from PIL import ImageFile as PILImageFile except ImportError: + # This import cannot fail unless Pillow/PIL install is completely + # broken (e.g. missing Python modules). import ImageFile as PILImageFile # Finally, warn about deprecation... diff --git a/django/utils/itercompat.py b/django/utils/itercompat.py index 1df1e57cb2..096f808671 100644 --- a/django/utils/itercompat.py +++ b/django/utils/itercompat.py @@ -4,9 +4,6 @@ Where possible, we try to use the system-native version and only fall back to these implementations if necessary. """ -import collections -import sys - def is_iterable(x): "A implementation independent way of checking for iterables" @@ -16,14 +13,3 @@ def is_iterable(x): return False else: return True - -def is_iterator(x): - """An implementation independent way of checking for iterators - - Python 2.6 has a different implementation of collections.Iterator which - accepts anything with a `next` method. 2.7+ requires and `__iter__` method - as well. - """ - if sys.version_info >= (2, 7): - return isinstance(x, collections.Iterator) - return isinstance(x, collections.Iterator) and hasattr(x, '__iter__') diff --git a/django/utils/timesince.py b/django/utils/timesince.py index 46c387f262..8fb0f64e09 100644 --- a/django/utils/timesince.py +++ b/django/utils/timesince.py @@ -17,7 +17,8 @@ def timesince(d, now=None, reversed=False): displayed. For example, "2 weeks, 3 days" and "1 year, 3 months" are possible outputs, but "2 weeks, 3 hours" and "1 year, 5 days" are not. - Adapted from http://blog.natbat.co.uk/archive/2003/Jun/14/time_since + Adapted from + http://web.archive.org/web/20060617175230/http://blog.natbat.co.uk/archive/2003/Jun/14/time_since """ chunks = ( (60 * 60 * 24 * 365, ungettext_lazy('%d year', '%d years')), diff --git a/docs/faq/admin.txt b/docs/faq/admin.txt index ec40754094..dbcd725a8d 100644 --- a/docs/faq/admin.txt +++ b/docs/faq/admin.txt @@ -82,7 +82,7 @@ How can I customize the functionality of the admin interface? You've got several options. If you want to piggyback on top of an add/change form that Django automatically generates, you can attach arbitrary JavaScript modules to the page via the model's class Admin :ref:`js parameter -`. That parameter is a list of URLs, as strings, +`. That parameter is a list of URLs, as strings, pointing to JavaScript modules that will be included within the admin form via a `` -The FancyCalendar widget inherits all the media from its parent widget. If -you don't want media to be inherited in this way, add an ``extend=False`` -declaration to the media declaration:: +The FancyCalendar widget inherits all the assets from its parent +widget. If you don't want ``Media`` to be inherited in this way, add +an ``extend=False`` declaration to the ``Media`` declaration:: >>> class FancyCalendarWidget(CalendarWidget): ... class Media: @@ -165,23 +167,24 @@ declaration to the media declaration:: -If you require even more control over media inheritance, define your media -using a :ref:`dynamic property `. Dynamic properties give -you complete control over which media files are inherited, and which are not. +If you require even more control over inheritance, define your assets using a +:ref:`dynamic property `. Dynamic properties give you +complete control over which files are inherited, and which are not. .. _dynamic-property: -Media as a dynamic property ---------------------------- +``Media`` as a dynamic property +------------------------------- -If you need to perform some more sophisticated manipulation of media -requirements, you can define the media property directly. This is done -by defining a widget property that returns an instance of ``forms.Media``. -The constructor for ``forms.Media`` accepts ``css`` and ``js`` keyword -arguments in the same format as that used in a static media definition. +If you need to perform some more sophisticated manipulation of asset +requirements, you can define the ``media`` property directly. This is +done by defining a widget property that returns an instance of +``forms.Media``. The constructor for ``forms.Media`` accepts ``css`` +and ``js`` keyword arguments in the same format as that used in a +static media definition. -For example, the static media definition for our Calendar Widget could -also be defined in a dynamic fashion:: +For example, the static definition for our Calendar Widget could also +be defined in a dynamic fashion:: class CalendarWidget(forms.TextInput): def _media(self): @@ -190,17 +193,17 @@ also be defined in a dynamic fashion:: media = property(_media) See the section on `Media objects`_ for more details on how to construct -return values for dynamic media properties. +return values for dynamic ``media`` properties. -.. _form-media-paths: +.. _form-asset-paths: -Paths in media definitions +Paths in asset definitions -------------------------- -Paths used to specify media can be either relative or absolute. If a path -starts with ``/``, ``http://`` or ``https://``, it will be interpreted as an -absolute path, and left as-is. All other paths will be prepended with the value -of the appropriate prefix. +Paths used to specify assets can be either relative or absolute. If a +path starts with ``/``, ``http://`` or ``https://``, it will be +interpreted as an absolute path, and left as-is. All other paths will +be prepended with the value of the appropriate prefix. As part of the introduction of the :doc:`staticfiles app ` two new settings were added @@ -236,21 +239,22 @@ But if :setting:`STATIC_URL` is ``'http://static.example.com/'``:: -Media objects -------------- +``Media`` objects +----------------- -When you interrogate the media attribute of a widget or form, the value that -is returned is a ``forms.Media`` object. As we have already seen, the string -representation of a Media object is the HTML required to include media -in the ```` block of your HTML page. +When you interrogate the ``media`` attribute of a widget or form, the +value that is returned is a ``forms.Media`` object. As we have already +seen, the string representation of a ``Media`` object is the HTML +required to include the relevant files in the ```` block of your +HTML page. -However, Media objects have some other interesting properties. +However, ``Media`` objects have some other interesting properties. -Media subsets -~~~~~~~~~~~~~ +Subsets of assets +~~~~~~~~~~~~~~~~~ -If you only want media of a particular type, you can use the subscript operator -to filter out a medium of interest. For example:: +If you only want files of a particular type, you can use the subscript +operator to filter out a medium of interest. For example:: >>> w = CalendarWidget() >>> print(w.media) @@ -258,17 +262,18 @@ to filter out a medium of interest. For example:: - >>> print(w.media)['css'] + >>> print(w.media['css']) -When you use the subscript operator, the value that is returned is a new -Media object -- but one that only contains the media of interest. +When you use the subscript operator, the value that is returned is a +new ``Media`` object -- but one that only contains the media of interest. -Combining media objects -~~~~~~~~~~~~~~~~~~~~~~~ +Combining ``Media`` objects +~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Media objects can also be added together. When two media objects are added, -the resulting Media object contains the union of the media from both files:: +``Media`` objects can also be added together. When two ``Media`` objects are +added, the resulting ``Media`` object contains the union of the assets +specified by both:: >>> from django import forms >>> class CalendarWidget(forms.TextInput): @@ -290,17 +295,19 @@ the resulting Media object contains the union of the media from both files:: -Media on Forms --------------- +``Media`` on Forms +------------------ -Widgets aren't the only objects that can have media definitions -- forms -can also define media. The rules for media definitions on forms are the -same as the rules for widgets: declarations can be static or dynamic; -path and inheritance rules for those declarations are exactly the same. +Widgets aren't the only objects that can have ``media`` definitions -- +forms can also define ``media``. The rules for ``media`` definitions +on forms are the same as the rules for widgets: declarations can be +static or dynamic; path and inheritance rules for those declarations +are exactly the same. -Regardless of whether you define a media declaration, *all* Form objects -have a media property. The default value for this property is the result -of adding the media definitions for all widgets that are part of the form:: +Regardless of whether you define a ``media`` declaration, *all* Form +objects have a ``media`` property. The default value for this property +is the result of adding the ``media`` definitions for all widgets that +are part of the form:: >>> from django import forms >>> class ContactForm(forms.Form): @@ -314,8 +321,9 @@ of adding the media definitions for all widgets that are part of the form:: -If you want to associate additional media with a form -- for example, CSS for form -layout -- simply add a media declaration to the form:: +If you want to associate additional assets with a form -- for example, +CSS for form layout -- simply add a ``Media`` declaration to the +form:: >>> class ContactForm(forms.Form): ... date = DateField(widget=CalendarWidget) diff --git a/docs/topics/forms/modelforms.txt b/docs/topics/forms/modelforms.txt index bd9e14aea4..0f3c5bb815 100644 --- a/docs/topics/forms/modelforms.txt +++ b/docs/topics/forms/modelforms.txt @@ -162,6 +162,7 @@ Consider this set of models:: title = models.CharField(max_length=3, choices=TITLE_CHOICES) birth_date = models.DateField(blank=True, null=True) + # On Python 3: def __str__(self): def __unicode__(self): return self.name @@ -196,29 +197,89 @@ we'll discuss in a moment.):: name = forms.CharField(max_length=100) authors = forms.ModelMultipleChoiceField(queryset=Author.objects.all()) -.. _modelform-is-valid-and-errors: +.. _validation-on-modelform: -The ``is_valid()`` method and ``errors`` ----------------------------------------- +Validation on a ``ModelForm`` +----------------------------- -The first time you call ``is_valid()`` or access the ``errors`` attribute of a -``ModelForm`` triggers :ref:`form validation ` as -well as :ref:`model validation `. This has the side-effect -of cleaning the model you pass to the ``ModelForm`` constructor. For instance, -calling ``is_valid()`` on your form will convert any date fields on your model -to actual date objects. If form validation fails, only some of the updates -may be applied. For this reason, you'll probably want to avoid reusing the -model instance passed to the form, especially if validation fails. +There are two main steps involved in validating a ``ModelForm``: +1. :ref:`Validating the form ` +2. :ref:`Validating the model instance ` + +Just like normal form validation, model form validation is triggered implicitly +when calling :meth:`~django.forms.Form.is_valid()` or accessing the +:attr:`~django.forms.Form.errors` attribute and explicitly when calling +``full_clean()``, although you will typically not use the latter method in +practice. + +``Model`` validation (:meth:`Model.full_clean() +`) is triggered from within the form +validation step, right after the form's ``clean()`` method is called. + +.. warning:: + + The cleaning process modifies the model instance passed to the + ``ModelForm`` constructor in various ways. For instance, any date fields on + the model are converted into actual date objects. Failed validation may + leave the underlying model instance in an inconsistent state and therefore + it's not recommended to reuse it. + +.. _overriding-modelform-clean-method: + +Overriding the clean() method +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +You can override the ``clean()`` method on a model form to provide additional +validation in the same way you can on a normal form. + +A model form instance bound to a model object will contain an ``instance`` +attribute that gives its methods access to that specific model instance. + +.. warning:: + + The ``ModelForm.clean()`` method sets a flag that makes the :ref:`model + validation ` step validate the uniqueness of model + fields that are marked as ``unique``, ``unique_together`` or + ``unique_for_date|month|year``. + + If you would like to override the ``clean()`` method and maintain this + validation, you must call the parent class's ``clean()`` method. + +Interaction with model validation +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +As part of the validation process, ``ModelForm`` will call the ``clean()`` +method of each field on your model that has a corresponding field on your form. +If you have excluded any model fields, validation will not be run on those +fields. See the :doc:`form validation ` documentation +for more on how field cleaning and validation work. + +The model's ``clean()`` method will be called before any uniqueness checks are +made. See :ref:`Validating objects ` for more information +on the model's ``clean()`` hook. + +Considerations regarding fields' ``error_messages`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Error messages defined at the +:attr:`form field ` level or at the +:ref:`form Meta ` level always take +precedence over the error messages defined at the +:attr:`model field ` level. +Error messages defined on :attr:`model fields +` are only used when the +``ValidationError`` is raised during the :ref:`model validation +` step and no corresponding error messages are defined at +the form level. The ``save()`` method --------------------- -Every form produced by ``ModelForm`` also has a ``save()`` -method. This method creates and saves a database object from the data -bound to the form. A subclass of ``ModelForm`` can accept an existing -model instance as the keyword argument ``instance``; if this is -supplied, ``save()`` will update that instance. If it's not supplied, +Every ``ModelForm`` also has a ``save()`` method. This method creates and saves +a database object from the data bound to the form. A subclass of ``ModelForm`` +can accept an existing model instance as the keyword argument ``instance``; if +this is supplied, ``save()`` will update that instance. If it's not supplied, ``save()`` will create a new instance of the specified model: .. code-block:: python @@ -239,7 +300,7 @@ supplied, ``save()`` will update that instance. If it's not supplied, >>> f.save() Note that if the form :ref:`hasn't been validated -`, calling ``save()`` will do so by checking +`, calling ``save()`` will do so by checking ``form.errors``. A ``ValueError`` will be raised if the data in the form doesn't validate -- i.e., if ``form.errors`` evaluates to ``True``. @@ -262,7 +323,9 @@ exists in the database. To work around this problem, every time you save a form using ``commit=False``, Django adds a ``save_m2m()`` method to your ``ModelForm`` subclass. After you've manually saved the instance produced by the form, you can invoke -``save_m2m()`` to save the many-to-many form data. For example:: +``save_m2m()`` to save the many-to-many form data. For example: + +.. code-block:: python # Create a form instance with POST data. >>> f = AuthorForm(request.POST) @@ -282,7 +345,9 @@ you've manually saved the instance produced by the form, you can invoke Calling ``save_m2m()`` is only required if you use ``save(commit=False)``. When you use a simple ``save()`` on a form, all data -- including many-to-many data -- is saved without the need for any additional method calls. -For example:: +For example: + +.. code-block:: python # Create a form instance with POST data. >>> a = Author() @@ -536,27 +601,6 @@ attribute on the ``Meta`` class. If ``localized_fields`` is set to the special value ``'__all__'``, all fields will be localized. -.. _overriding-modelform-clean-method: - -Overriding the clean() method ------------------------------ - -You can override the ``clean()`` method on a model form to provide additional -validation in the same way you can on a normal form. - -In this regard, model forms have two specific characteristics when compared to -forms: - -By default the ``clean()`` method validates the uniqueness of fields that are -marked as ``unique``, ``unique_together`` or ``unique_for_date|month|year`` on -the model. Therefore, if you would like to override the ``clean()`` method and -maintain the default validation, you must call the parent class's ``clean()`` -method. - -Also, a model form instance bound to a model object will contain a -``self.instance`` attribute that gives model form methods access to that -specific model instance. - Form inheritance ---------------- @@ -595,18 +639,6 @@ There are a couple of things to note, however. Chances are these notes won't affect you unless you're trying to do something tricky with subclassing. -Interaction with model validation ---------------------------------- - -As part of its validation process, ``ModelForm`` will call the ``clean()`` -method of each field on your model that has a corresponding field on your form. -If you have excluded any model fields, validation will not be run on those -fields. See the :doc:`form validation ` documentation -for more on how field cleaning and validation work. Also, your model's -``clean()`` method will be called before any uniqueness checks are made. See -:ref:`Validating objects ` for more information on the -model's ``clean()`` hook. - .. _modelforms-factory: ModelForm factory function @@ -856,14 +888,16 @@ than that of a "normal" formset. The only difference is that we call ``formset.save()`` to save the data into the database. (This was described above, in :ref:`saving-objects-in-the-formset`.) -Overiding ``clean()`` on a ``model_formset`` +.. _model-formsets-overriding-clean: + +Overriding ``clean()`` on a ``ModelFormSet`` -------------------------------------------- Just like with ``ModelForms``, by default the ``clean()`` method of a -``model_formset`` will validate that none of the items in the formset violate +``ModelFormSet`` will validate that none of the items in the formset violate the unique constraints on your model (either ``unique``, ``unique_together`` or ``unique_for_date|month|year``). If you want to override the ``clean()`` method -on a ``model_formset`` and maintain this validation, you must call the parent +on a ``ModelFormSet`` and maintain this validation, you must call the parent class's ``clean`` method:: from django.forms.models import BaseModelFormSet @@ -968,6 +1002,8 @@ primary key that isn't called ``id``, make sure it gets rendered.) Inline formsets =============== +.. class:: models.BaseInlineFormSet + Inline formsets is a small abstraction layer on top of model formsets. These simplify the case of working with related objects via a foreign key. Suppose you have these two models:: @@ -999,6 +1035,13 @@ a particular author, you could do this:: :ref:`Manually rendered can_delete and can_order `. +Overriding ``clean()`` on an ``InlineFormSet`` +---------------------------------------------- + +See :ref:`model-formsets-overriding-clean`, but subclass +:class:`~models.BaseInlineFormSet` rather than +:class:`~models.BaseModelFormSet`. + More than one foreign key to the same model ------------------------------------------- diff --git a/docs/topics/http/file-uploads.txt b/docs/topics/http/file-uploads.txt index f6fa27e27c..2cdab9ea9b 100644 --- a/docs/topics/http/file-uploads.txt +++ b/docs/topics/http/file-uploads.txt @@ -240,6 +240,18 @@ In addition to those inherited from :class:`~django.core.files.File`, all need to validate that the file contains the content that the content-type header claims -- "trust but verify." +.. attribute:: UploadedFile.content_type_extra + + .. versionadded:: 1.7 + + A dictionary containing extra parameters passed to the ``content-type`` + header. This is typically provided by services, such as Google App Engine, + that intercept and handle file uploads on your behalf. As a result your + handler may not receive the uploaded file content, but instead a URL or + other pointer to the file. (see `RFC 2388`_ section 5.3). + + .. _RFC 2388: http://www.ietf.org/rfc/rfc2388.txt + .. attribute:: UploadedFile.charset For :mimetype:`text/*` content-types, the character set (i.e. ``utf8``) @@ -350,6 +362,10 @@ list:: Writing custom upload handlers ------------------------------ +.. currentmodule:: django.core.files.uploadhandler + +.. class:: FileUploadHandler + All file upload handlers should be subclasses of ``django.core.files.uploadhandler.FileUploadHandler``. You can define upload handlers wherever you wish. @@ -359,7 +375,8 @@ Required methods Custom file upload handlers **must** define the following methods: -``FileUploadHandler.receive_data_chunk(self, raw_data, start)`` +.. method:: FileUploadHandler.receive_data_chunk(self, raw_data, start) + Receives a "chunk" of data from the file upload. ``raw_data`` is a byte string containing the uploaded data. @@ -379,7 +396,8 @@ Custom file upload handlers **must** define the following methods: If you raise a ``StopUpload`` or a ``SkipFile`` exception, the upload will abort or the file will be completely skipped. -``FileUploadHandler.file_complete(self, file_size)`` +.. method:: FileUploadHandler.file_complete(self, file_size) + Called when a file has finished uploading. The handler should return an ``UploadedFile`` object that will be stored @@ -392,7 +410,8 @@ Optional methods Custom upload handlers may also define any of the following optional methods or attributes: -``FileUploadHandler.chunk_size`` +.. attribute:: FileUploadHandler.chunk_size + Size, in bytes, of the "chunks" Django should store into memory and feed into the handler. That is, this attribute controls the size of chunks fed into ``FileUploadHandler.receive_data_chunk``. @@ -404,7 +423,8 @@ attributes: The default is 64*2\ :sup:`10` bytes, or 64 KB. -``FileUploadHandler.new_file(self, field_name, file_name, content_type, content_length, charset)`` +.. method:: FileUploadHandler.new_file(self, field_name, file_name, content_type, content_length, charset, content_type_extra) + Callback signaling that a new file upload is starting. This is called before any data has been fed to any upload handlers. @@ -421,13 +441,23 @@ attributes: ``charset`` is the character set (i.e. ``utf8``) given by the browser. Like ``content_length``, this sometimes won't be provided. + ``content_type_extra`` is extra information about the file from the + ``content-type`` header. See :attr:`UploadedFile.content_type_extra + `. + This method may raise a ``StopFutureHandlers`` exception to prevent future handlers from handling this file. -``FileUploadHandler.upload_complete(self)`` + .. versionadded:: 1.7 + + The ``content_type_extra`` parameter was added. + +.. method:: FileUploadHandler.upload_complete(self) + Callback signaling that the entire upload (all files) has completed. -``FileUploadHandler.handle_raw_input(self, input_data, META, content_length, boundary, encoding)`` +.. method:: FileUploadHandler.handle_raw_input(self, input_data, META, content_length, boundary, encoding) + Allows the handler to completely override the parsing of the raw HTTP input. diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index ce6697908f..e724837ce1 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -29,9 +29,7 @@ use internationalization, you should take the two seconds to set :setting:`USE_I18N = False ` in your settings file. Then Django will make some optimizations so as not to load the internationalization machinery. You'll probably also want to remove ``'django.core.context_processors.i18n'`` -from your :setting:`TEMPLATE_CONTEXT_PROCESSORS` setting and -``'django.middleware.locale.LocaleMiddleware'`` from your -:setting:`MIDDLEWARE_CLASSES` setting. +from your :setting:`TEMPLATE_CONTEXT_PROCESSORS` setting. .. note:: @@ -1238,13 +1236,16 @@ German. The script should be run from one of two places: -* The root directory of your Django project. -* The root directory of your Django app. +* The root directory of your Django project (the one that contains + ``manage.py``). +* The root directory of one of your Django apps. The script runs over your project source tree or your application source tree -and pulls out all strings marked for translation. It creates (or updates) a -message file in the directory ``locale/LANG/LC_MESSAGES``. In the ``de`` -example, the file will be ``locale/de/LC_MESSAGES/django.po``. +and pulls out all strings marked for translation (see +:ref:`how-django-discovers-translations` and be sure :setting:`LOCALE_PATHS` +is configured correctly). It creates (or updates) a message file in the +directory ``locale/LANG/LC_MESSAGES``. In the ``de`` example, the file will be +``locale/de/LC_MESSAGES/django.po``. By default :djadmin:`django-admin.py makemessages ` examines every file that has the ``.html`` or ``.txt`` file extension. In case you want to @@ -1560,15 +1561,9 @@ If you want to let each individual user specify which language he or she prefers, use ``LocaleMiddleware``. ``LocaleMiddleware`` enables language selection based on data from the request. It customizes content for each user. -``LocaleMiddleware`` is enabled in the default settings file: the -:setting:`MIDDLEWARE_CLASSES` setting contains -``'django.middleware.locale.LocaleMiddleware'``. - -.. versionchanged:: 1.6 - - In previous versions, ``LocaleMiddleware`` wasn't enabled by default. - -Because middleware order matters, you should follow these guidelines: +To use ``LocaleMiddleware``, add ``'django.middleware.locale.LocaleMiddleware'`` +to your :setting:`MIDDLEWARE_CLASSES` setting. Because middleware order +matters, you should follow these guidelines: * Make sure it's one of the first middlewares installed. * It should come after ``SessionMiddleware``, because ``LocaleMiddleware`` diff --git a/docs/topics/localflavor.txt b/docs/topics/localflavor.txt index 8ae435463d..8bc8b2f9e3 100644 --- a/docs/topics/localflavor.txt +++ b/docs/topics/localflavor.txt @@ -48,7 +48,7 @@ The following countries have django-localflavor- packages. * Chile: https://github.com/django/django-localflavor-cl * China: https://github.com/django/django-localflavor-cn * Colombia: https://github.com/django/django-localflavor-co -* Croatia: https://github.com/django/django-localflavor-cr +* Croatia: https://github.com/django/django-localflavor-hr * Czech Republic: https://github.com/django/django-localflavor-cz * Ecuador: https://github.com/django/django-localflavor-ec * Finland: https://github.com/django/django-localflavor-fi diff --git a/docs/topics/signing.txt b/docs/topics/signing.txt index 68afd6962a..480af18db7 100644 --- a/docs/topics/signing.txt +++ b/docs/topics/signing.txt @@ -37,8 +37,6 @@ generate their own signed values. Using the low-level API ======================= -.. class:: Signer - Django's signing methods live in the ``django.core.signing`` module. To sign a value, first instantiate a ``Signer`` instance:: @@ -74,6 +72,11 @@ generate signatures. You can use a different secret by passing it to the >>> value 'My string:EkfQJafvGyiofrdGnuthdxImIJw' +.. class:: Signer(key=None, sep=':', salt=None) + + Returns a signer which uses ``key`` to generate signatures and ``sep`` + to separate values. + Using the salt argument ----------------------- @@ -105,8 +108,6 @@ secret. Verifying timestamped values ---------------------------- -.. class:: TimestampSigner - ``TimestampSigner`` is a subclass of :class:`~Signer` that appends a signed timestamp to the value. This allows you to confirm that a signed value was created within a specified period of time:: @@ -124,6 +125,17 @@ created within a specified period of time:: >>> signer.unsign(value, max_age=20) u'hello' +.. class:: TimestampSigner(key=None, sep=':', salt=None) + + .. method:: sign(value) + + Sign ``value`` and append current timestamp to it. + + .. method:: unsign(value, max_age=None) + + Checks if ``value`` was signed less than ``max_age`` seconds ago, + otherwise raises ``SignatureExpired``. + Protecting complex data structures ---------------------------------- @@ -142,8 +154,10 @@ to execute arbitrary commands by exploiting the pickle format.:: .. function:: dumps(obj, key=None, salt='django.core.signing', compress=False) - Returns URL-safe, sha1 signed base64 compressed JSON string. + Returns URL-safe, sha1 signed base64 compressed JSON string. Serialized + object is signed using :class:`~TimestampSigner`. .. function:: loads(string, key=None, salt='django.core.signing', max_age=None) - Reverse of dumps(), raises ``BadSignature`` if signature fails. + Reverse of ``dumps()``, raises ``BadSignature`` if signature fails. + Checks ``max_age`` (in seconds) if given. diff --git a/docs/topics/testing/advanced.txt b/docs/topics/testing/advanced.txt index b8e70b592b..2417274ab5 100644 --- a/docs/topics/testing/advanced.txt +++ b/docs/topics/testing/advanced.txt @@ -37,18 +37,25 @@ Example The following is a simple unit test using the request factory:: - import unittest + from django.contrib.auth.models import User + from django.test import TestCase from django.test.client import RequestFactory - class SimpleTest(unittest.TestCase): + class SimpleTest(TestCase): def setUp(self): # Every test needs access to the request factory. self.factory = RequestFactory() + self.user = User.objects.create_user( + first_name='jacob', email='jacob@…', password='top_secret') def test_details(self): # Create an instance of a GET request. request = self.factory.get('/customer/details') + # Recall that middleware are not suported. You can simulate a + # logged-in user by setting request.user manually. + request.user = self.user + # Test my_view() as if it were deployed at /customer/details response = my_view(request) self.assertEqual(response.status_code, 200) diff --git a/docs/topics/testing/overview.txt b/docs/topics/testing/overview.txt index 6f75a3b7a8..0380d6931b 100644 --- a/docs/topics/testing/overview.txt +++ b/docs/topics/testing/overview.txt @@ -1403,6 +1403,23 @@ The decorator can also be applied to test case classes:: the original ``LoginTestCase`` is still equally affected by the decorator. +.. warning:: + + The settings file contains some settings that are only consulted during + initialization of Django internals. If you change them with + ``override_settings``, the setting is changed if you access it via the + ``django.conf.settings`` module, however, Django's internals access it + differently. Effectively, using ``override_settings`` with these settings + is probably not going to do what you expect it to do. + + We do not recommend using ``override_settings`` with :setting:`DATABASES`. + Using ``override_settings`` with :setting:`CACHES` is possible, but a bit + tricky if you are using internals that make using of caching, like + :mod:`django.contrib.sessions`. For example, you will have to reinitialize + the session backend in a test that uses cached sessions and overrides + :setting:`CACHES`. + + You can also simulate the absence of a setting by deleting it after settings have been overriden, like this:: @@ -1787,7 +1804,8 @@ for skipping tests. .. function:: skipIfDBFeature(feature_name_string) -Skip the decorated test if the named database feature is supported. +Skip the decorated test or ``TestCase`` if the named database feature is +supported. For example, the following test will not be executed if the database supports transactions (e.g., it would *not* run under PostgreSQL, but @@ -1798,9 +1816,13 @@ it would under MySQL with MyISAM tables):: def test_transaction_behavior(self): # ... conditional test code +.. versionchanged:: 1.7 + + ``skipIfDBFeature`` can now be used to decorate a ``TestCase`` class. + .. function:: skipUnlessDBFeature(feature_name_string) -Skip the decorated test if the named database feature is *not* +Skip the decorated test or ``TestCase`` if the named database feature is *not* supported. For example, the following test will only be executed if the database @@ -1811,3 +1833,7 @@ under MySQL with MyISAM tables):: @skipUnlessDBFeature('supports_transactions') def test_transaction_behavior(self): # ... conditional test code + +.. versionchanged:: 1.7 + + ``skipUnlessDBFeature`` can now be used to decorate a ``TestCase`` class. diff --git a/scripts/manage_translations.py b/scripts/manage_translations.py index 3e58040187..d1390c0181 100644 --- a/scripts/manage_translations.py +++ b/scripts/manage_translations.py @@ -114,6 +114,9 @@ def lang_stats(resources=None, languages=None): if p.returncode == 0: # msgfmt output stats on stderr print("%s: %s" % (lang, errors.strip())) + else: + print("Errors happened when checking %s translation for %s:\n%s" % ( + lang, name, errors)) def fetch(resources=None, languages=None): @@ -121,6 +124,7 @@ def fetch(resources=None, languages=None): Fetch translations from Transifex, wrap long lines, generate mo files. """ locale_dirs = _get_locale_dirs() + errors = [] for name, dir_ in locale_dirs: if resources and not name in resources: @@ -140,8 +144,14 @@ def fetch(resources=None, languages=None): po_path = '%(path)s/%(lang)s/LC_MESSAGES/django%(ext)s.po' % { 'path': dir_, 'lang': lang, 'ext': 'js' if name.endswith('-js') else ''} call('msgcat -o %s %s' % (po_path, po_path), shell=True) - mo_path = '%s.mo' % po_path[:-3] - call('msgfmt -o %s %s' % (mo_path, po_path), shell=True) + res = call('msgfmt -c -o %s.mo %s' % (po_path[:-3], po_path), shell=True) + if res != 0: + errors.append((name, lang)) + if errors: + print("\nWARNING: Errors have occurred in following cases:") + for resource, lang in errors: + print("\tResource %s for language %s" % (resource, lang)) + exit(1) if __name__ == "__main__": diff --git a/tests/admin_inlines/admin.py b/tests/admin_inlines/admin.py index 2f88248ca4..62f9e04e5b 100644 --- a/tests/admin_inlines/admin.py +++ b/tests/admin_inlines/admin.py @@ -12,8 +12,26 @@ class BookInline(admin.TabularInline): model = Author.books.through +class NonAutoPKBookTabularInline(admin.TabularInline): + model = NonAutoPKBook + + +class NonAutoPKBookStackedInline(admin.StackedInline): + model = NonAutoPKBook + + +class EditablePKBookTabularInline(admin.TabularInline): + model = EditablePKBook + + +class EditablePKBookStackedInline(admin.StackedInline): + model = EditablePKBook + + class AuthorAdmin(admin.ModelAdmin): - inlines = [BookInline] + inlines = [BookInline, + NonAutoPKBookTabularInline, NonAutoPKBookStackedInline, + EditablePKBookTabularInline, EditablePKBookStackedInline] class InnerInline(admin.StackedInline): diff --git a/tests/admin_inlines/models.py b/tests/admin_inlines/models.py index d4ba0ab6bc..dde5cf79e3 100644 --- a/tests/admin_inlines/models.py +++ b/tests/admin_inlines/models.py @@ -3,6 +3,7 @@ Testing of admin inline formsets. """ from __future__ import unicode_literals +import random from django.db import models from django.contrib.contenttypes.models import ContentType @@ -48,6 +49,25 @@ class Author(models.Model): books = models.ManyToManyField(Book) +class NonAutoPKBook(models.Model): + rand_pk = models.IntegerField(primary_key=True, editable=False) + author = models.ForeignKey(Author) + title = models.CharField(max_length=50) + + def save(self, *args, **kwargs): + while not self.rand_pk: + test_pk = random.randint(1, 99999) + if not NonAutoPKBook.objects.filter(rand_pk=test_pk).exists(): + self.rand_pk = test_pk + super(NonAutoPKBook, self).save(*args, **kwargs) + + +class EditablePKBook(models.Model): + manual_pk = models.IntegerField(primary_key=True) + author = models.ForeignKey(Author) + title = models.CharField(max_length=50) + + class Holder(models.Model): dummy = models.IntegerField() diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py index 41dc0e32de..465b224d4f 100644 --- a/tests/admin_inlines/tests.py +++ b/tests/admin_inlines/tests.py @@ -211,6 +211,24 @@ class TestInline(TestCase): self.assertContains(response, max_forms_input % 2) self.assertContains(response, total_forms_hidden) + def test_inline_nonauto_noneditable_pk(self): + response = self.client.get('/admin/admin_inlines/author/add/') + self.assertContains(response, + '', + html=True) + self.assertContains(response, + '', + html=True) + + def test_inline_editable_pk(self): + response = self.client.get('/admin/admin_inlines/author/add/') + self.assertContains(response, + '', + html=True, count=1) + self.assertContains(response, + '', + html=True, count=1) + @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) class TestInlineMedia(TestCase): diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py index a6ad7cc0bc..039abb819b 100644 --- a/tests/admin_views/admin.py +++ b/tests/admin_views/admin.py @@ -777,3 +777,8 @@ from django.contrib.auth.models import User, Group from django.contrib.auth.admin import UserAdmin, GroupAdmin site.register(User, UserAdmin) site.register(Group, GroupAdmin) + +# Used to test URL namespaces +site2 = admin.AdminSite(name="namespaced_admin") +site2.register(User, UserAdmin) +site2.register(Group, GroupAdmin) diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 101fcd90f6..7decf6f471 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -26,7 +26,6 @@ from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase from django.contrib.auth import REDIRECT_FIELD_NAME from django.contrib.auth.models import Group, User, Permission from django.contrib.contenttypes.models import ContentType -from django.core.urlresolvers import reverse from django.db import connection from django.forms.util import ErrorList from django.template.response import TemplateResponse @@ -53,6 +52,7 @@ from .models import (Article, BarAccount, CustomArticle, EmptyModel, FooAccount, AdminOrderedModelMethod, AdminOrderedAdminMethod, AdminOrderedCallable, Report, MainPrepopulated, RelatedPrepopulated, UnorderedObject, Simple, UndeletableObject, Choice, ShortMessage, Telegram) +from .admin import site, site2 ERROR_MESSAGE = "Please enter the correct username and password \ @@ -3824,6 +3824,59 @@ class CSSTest(TestCase): self.assertContains(response, '') self.assertContains(response, '') + def testAppModelInFormBodyClass(self): + """ + Ensure app and model tag are correcly read by change_form template + """ + response = self.client.get('/test_admin/admin/admin_views/section/add/') + self.assertEqual(response.status_code, 200) + self.assertContains(response, + ' (2,6), "warnings captured only in Python >= 2.7") class WarningLoggerTests(TestCase): """ Tests that warnings output for DeprecationWarnings is enabled diff --git a/tests/mail/tests.py b/tests/mail/tests.py index c90dc7e22a..822c572b0f 100644 --- a/tests/mail/tests.py +++ b/tests/mail/tests.py @@ -9,6 +9,8 @@ import smtpd import sys import tempfile import threading +from smtplib import SMTPException +from ssl import SSLError from django.core import mail from django.core.mail import (EmailMessage, mail_admins, mail_managers, @@ -621,11 +623,23 @@ class ConsoleBackendTests(BaseEmailBackendTests, TestCase): self.assertTrue(s.getvalue().startswith('Content-Type: text/plain; charset="utf-8"\nMIME-Version: 1.0\nContent-Transfer-Encoding: 7bit\nSubject: Subject\nFrom: from@example.com\nTo: to@example.com\nDate: ')) +class FakeSMTPChannel(smtpd.SMTPChannel): + + def collect_incoming_data(self, data): + try: + super(FakeSMTPChannel, self).collect_incoming_data(data) + except UnicodeDecodeError: + # ignore decode error in SSL/TLS connection tests as we only care + # whether the connection attempt was made + pass + + class FakeSMTPServer(smtpd.SMTPServer, threading.Thread): """ Asyncore SMTP server wrapped into a thread. Based on DummyFTPServer from: http://svn.python.org/view/python/branches/py3k/Lib/test/test_ftplib.py?revision=86061&view=markup """ + channel_class = FakeSMTPChannel def __init__(self, *args, **kwargs): threading.Thread.__init__(self) @@ -738,3 +752,44 @@ class SMTPBackendTests(BaseEmailBackendTests, TestCase): backend.close() except Exception as e: self.fail("close() unexpectedly raised an exception: %s" % e) + + @override_settings(EMAIL_USE_TLS=True) + def test_email_tls_use_settings(self): + backend = smtp.EmailBackend() + self.assertTrue(backend.use_tls) + + @override_settings(EMAIL_USE_TLS=True) + def test_email_tls_override_settings(self): + backend = smtp.EmailBackend(use_tls=False) + self.assertFalse(backend.use_tls) + + def test_email_tls_default_disabled(self): + backend = smtp.EmailBackend() + self.assertFalse(backend.use_tls) + + @override_settings(EMAIL_USE_SSL=True) + def test_email_ssl_use_settings(self): + backend = smtp.EmailBackend() + self.assertTrue(backend.use_ssl) + + @override_settings(EMAIL_USE_SSL=True) + def test_email_ssl_override_settings(self): + backend = smtp.EmailBackend(use_ssl=False) + self.assertFalse(backend.use_ssl) + + def test_email_ssl_default_disabled(self): + backend = smtp.EmailBackend() + self.assertFalse(backend.use_ssl) + + @override_settings(EMAIL_USE_TLS=True) + def test_email_tls_attempts_starttls(self): + backend = smtp.EmailBackend() + self.assertTrue(backend.use_tls) + self.assertRaisesMessage(SMTPException, + 'STARTTLS extension not supported by server.', backend.open) + + @override_settings(EMAIL_USE_SSL=True) + def test_email_ssl_attempts_ssl_connection(self): + backend = smtp.EmailBackend() + self.assertTrue(backend.use_ssl) + self.assertRaises(SSLError, backend.open) diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py index 6546c49ec7..1ce5eba3e9 100644 --- a/tests/model_fields/tests.py +++ b/tests/model_fields/tests.py @@ -468,3 +468,16 @@ class BinaryFieldTests(test.TestCase): def test_max_length(self): dm = DataModel(short_data=self.binary_data*4) self.assertRaises(ValidationError, dm.full_clean) + +class GenericIPAddressFieldTests(test.TestCase): + def test_genericipaddressfield_formfield_protocol(self): + """ + Test that GenericIPAddressField with a specified protocol does not + generate a formfield with no specified protocol. See #20740. + """ + model_field = models.GenericIPAddressField(protocol='IPv4') + form_field = model_field.formfield() + self.assertRaises(ValidationError, form_field.clean, '::1') + model_field = models.GenericIPAddressField(protocol='IPv6') + form_field = model_field.formfield() + self.assertRaises(ValidationError, form_field.clean, '127.0.0.1') diff --git a/tests/model_formsets/tests.py b/tests/model_formsets/tests.py index 09a3ba1778..4411bbf59a 100644 --- a/tests/model_formsets/tests.py +++ b/tests/model_formsets/tests.py @@ -576,7 +576,7 @@ class ModelFormsetTest(TestCase): formset = AuthorBooksFormSet2(instance=author) self.assertEqual(len(formset.forms), 1) self.assertHTMLEqual(formset.forms[0].as_p(), - '

\n' + '

\n' '

') data = { diff --git a/tests/model_package/models/article.py b/tests/model_package/models/article.py index f70c971c7e..4dfcdc1056 100644 --- a/tests/model_package/models/article.py +++ b/tests/model_package/models/article.py @@ -6,6 +6,3 @@ class Article(models.Model): sites = models.ManyToManyField(Site) headline = models.CharField(max_length=100) publications = models.ManyToManyField("model_package.Publication", null=True, blank=True,) - - class Meta: - app_label = 'model_package' diff --git a/tests/model_package/models/publication.py b/tests/model_package/models/publication.py index 29828b9295..b0a49a94a1 100644 --- a/tests/model_package/models/publication.py +++ b/tests/model_package/models/publication.py @@ -3,6 +3,3 @@ from django.db import models class Publication(models.Model): title = models.CharField(max_length=30) - - class Meta: - app_label = 'model_package' diff --git a/tests/model_package/tests.py b/tests/model_package/tests.py index 5cf464858b..5d856a9608 100644 --- a/tests/model_package/tests.py +++ b/tests/model_package/tests.py @@ -14,9 +14,6 @@ class Advertisment(models.Model): "model_package.Publication", null=True, blank=True ) - class Meta: - app_label = 'model_package' - class ModelPackageTests(TestCase): def test_model_packages(self): diff --git a/tests/queries/tests.py b/tests/queries/tests.py index 6520eb0176..87d54b637e 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -2148,13 +2148,6 @@ class ConditionalTests(BaseQuerysetTest): t4 = Tag.objects.create(name='t4', parent=t3) t5 = Tag.objects.create(name='t5', parent=t3) - - # In Python 2.6 beta releases, exceptions raised in __len__ are swallowed - # (Python issue 1242657), so these cases return an empty list, rather than - # raising an exception. Not a lot we can do about that, unfortunately, due to - # the way Python handles list() calls internally. Thus, we skip the tests for - # Python 2.6. - @unittest.skipIf(sys.version_info[:2] == (2, 6), "Python version is 2.6") def test_infinite_loop(self): # If you're not careful, it's possible to introduce infinite loops via # default ordering on foreign keys in a cycle. We detect that. diff --git a/tests/requests/tests.py b/tests/requests/tests.py index b00eec87a9..8c56e48f58 100644 --- a/tests/requests/tests.py +++ b/tests/requests/tests.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals from datetime import datetime, timedelta from io import BytesIO +from itertools import chain import time from unittest import skipIf import warnings @@ -122,221 +123,6 @@ class RequestsTests(SimpleTestCase): self.assertEqual(request.build_absolute_uri(location="/path/with:colons"), 'http://www.example.com/path/with:colons') - @override_settings( - USE_X_FORWARDED_HOST=False, - ALLOWED_HOSTS=[ - 'forward.com', 'example.com', 'internal.com', '12.34.56.78', - '[2001:19f0:feee::dead:beef:cafe]', 'xn--4ca9at.com', - '.multitenant.com', 'INSENSITIVE.com', - ]) - def test_http_get_host(self): - # Check if X_FORWARDED_HOST is provided. - request = HttpRequest() - request.META = { - 'HTTP_X_FORWARDED_HOST': 'forward.com', - 'HTTP_HOST': 'example.com', - 'SERVER_NAME': 'internal.com', - 'SERVER_PORT': 80, - } - # X_FORWARDED_HOST is ignored. - self.assertEqual(request.get_host(), 'example.com') - - # Check if X_FORWARDED_HOST isn't provided. - request = HttpRequest() - request.META = { - 'HTTP_HOST': 'example.com', - 'SERVER_NAME': 'internal.com', - 'SERVER_PORT': 80, - } - self.assertEqual(request.get_host(), 'example.com') - - # Check if HTTP_HOST isn't provided. - request = HttpRequest() - request.META = { - 'SERVER_NAME': 'internal.com', - 'SERVER_PORT': 80, - } - self.assertEqual(request.get_host(), 'internal.com') - - # Check if HTTP_HOST isn't provided, and we're on a nonstandard port - request = HttpRequest() - request.META = { - 'SERVER_NAME': 'internal.com', - 'SERVER_PORT': 8042, - } - self.assertEqual(request.get_host(), 'internal.com:8042') - - # Poisoned host headers are rejected as suspicious - legit_hosts = [ - 'example.com', - 'example.com:80', - '12.34.56.78', - '12.34.56.78:443', - '[2001:19f0:feee::dead:beef:cafe]', - '[2001:19f0:feee::dead:beef:cafe]:8080', - 'xn--4ca9at.com', # Punnycode for öäü.com - 'anything.multitenant.com', - 'multitenant.com', - 'insensitive.com', - ] - - poisoned_hosts = [ - 'example.com@evil.tld', - 'example.com:dr.frankenstein@evil.tld', - 'example.com:dr.frankenstein@evil.tld:80', - 'example.com:80/badpath', - 'example.com: recovermypassword.com', - 'other.com', # not in ALLOWED_HOSTS - ] - - for host in legit_hosts: - request = HttpRequest() - request.META = { - 'HTTP_HOST': host, - } - request.get_host() - - for host in poisoned_hosts: - with self.assertRaises(SuspiciousOperation): - request = HttpRequest() - request.META = { - 'HTTP_HOST': host, - } - request.get_host() - - @override_settings(USE_X_FORWARDED_HOST=True, ALLOWED_HOSTS=['*']) - def test_http_get_host_with_x_forwarded_host(self): - # Check if X_FORWARDED_HOST is provided. - request = HttpRequest() - request.META = { - 'HTTP_X_FORWARDED_HOST': 'forward.com', - 'HTTP_HOST': 'example.com', - 'SERVER_NAME': 'internal.com', - 'SERVER_PORT': 80, - } - # X_FORWARDED_HOST is obeyed. - self.assertEqual(request.get_host(), 'forward.com') - - # Check if X_FORWARDED_HOST isn't provided. - request = HttpRequest() - request.META = { - 'HTTP_HOST': 'example.com', - 'SERVER_NAME': 'internal.com', - 'SERVER_PORT': 80, - } - self.assertEqual(request.get_host(), 'example.com') - - # Check if HTTP_HOST isn't provided. - request = HttpRequest() - request.META = { - 'SERVER_NAME': 'internal.com', - 'SERVER_PORT': 80, - } - self.assertEqual(request.get_host(), 'internal.com') - - # Check if HTTP_HOST isn't provided, and we're on a nonstandard port - request = HttpRequest() - request.META = { - 'SERVER_NAME': 'internal.com', - 'SERVER_PORT': 8042, - } - self.assertEqual(request.get_host(), 'internal.com:8042') - - # Poisoned host headers are rejected as suspicious - legit_hosts = [ - 'example.com', - 'example.com:80', - '12.34.56.78', - '12.34.56.78:443', - '[2001:19f0:feee::dead:beef:cafe]', - '[2001:19f0:feee::dead:beef:cafe]:8080', - 'xn--4ca9at.com', # Punnycode for öäü.com - ] - - poisoned_hosts = [ - 'example.com@evil.tld', - 'example.com:dr.frankenstein@evil.tld', - 'example.com:dr.frankenstein@evil.tld:80', - 'example.com:80/badpath', - 'example.com: recovermypassword.com', - ] - - for host in legit_hosts: - request = HttpRequest() - request.META = { - 'HTTP_HOST': host, - } - request.get_host() - - for host in poisoned_hosts: - with self.assertRaises(SuspiciousOperation): - request = HttpRequest() - request.META = { - 'HTTP_HOST': host, - } - request.get_host() - - - @override_settings(DEBUG=True, ALLOWED_HOSTS=[]) - def test_host_validation_disabled_in_debug_mode(self): - """If ALLOWED_HOSTS is empty and DEBUG is True, all hosts pass.""" - request = HttpRequest() - request.META = { - 'HTTP_HOST': 'example.com', - } - self.assertEqual(request.get_host(), 'example.com') - - - @override_settings(ALLOWED_HOSTS=[]) - def test_get_host_suggestion_of_allowed_host(self): - """get_host() makes helpful suggestions if a valid-looking host is not in ALLOWED_HOSTS.""" - msg_invalid_host = "Invalid HTTP_HOST header: %r." - msg_suggestion = msg_invalid_host + "You may need to add %r to ALLOWED_HOSTS." - - for host in [ # Valid-looking hosts - 'example.com', - '12.34.56.78', - '[2001:19f0:feee::dead:beef:cafe]', - 'xn--4ca9at.com', # Punnycode for öäü.com - ]: - request = HttpRequest() - request.META = {'HTTP_HOST': host} - self.assertRaisesMessage( - SuspiciousOperation, - msg_suggestion % (host, host), - request.get_host - ) - - for domain, port in [ # Valid-looking hosts with a port number - ('example.com', 80), - ('12.34.56.78', 443), - ('[2001:19f0:feee::dead:beef:cafe]', 8080), - ]: - host = '%s:%s' % (domain, port) - request = HttpRequest() - request.META = {'HTTP_HOST': host} - self.assertRaisesMessage( - SuspiciousOperation, - msg_suggestion % (host, domain), - request.get_host - ) - - for host in [ # Invalid hosts - 'example.com@evil.tld', - 'example.com:dr.frankenstein@evil.tld', - 'example.com:dr.frankenstein@evil.tld:80', - 'example.com:80/badpath', - 'example.com: recovermypassword.com', - ]: - request = HttpRequest() - request.META = {'HTTP_HOST': host} - self.assertRaisesMessage( - SuspiciousOperation, - msg_invalid_host % host, - request.get_host - ) - - def test_near_expiration(self): "Cookie will expire when an near expiration time is provided" response = HttpResponse() @@ -678,8 +464,209 @@ class RequestsTests(SimpleTestCase): request.FILES +class HostValidationTests(SimpleTestCase): + poisoned_hosts = [ + 'example.com@evil.tld', + 'example.com:dr.frankenstein@evil.tld', + 'example.com:dr.frankenstein@evil.tld:80', + 'example.com:80/badpath', + 'example.com: recovermypassword.com', + ] + + @override_settings( + USE_X_FORWARDED_HOST=False, + ALLOWED_HOSTS=[ + 'forward.com', 'example.com', 'internal.com', '12.34.56.78', + '[2001:19f0:feee::dead:beef:cafe]', 'xn--4ca9at.com', + '.multitenant.com', 'INSENSITIVE.com', + ]) + def test_http_get_host(self): + # Check if X_FORWARDED_HOST is provided. + request = HttpRequest() + request.META = { + 'HTTP_X_FORWARDED_HOST': 'forward.com', + 'HTTP_HOST': 'example.com', + 'SERVER_NAME': 'internal.com', + 'SERVER_PORT': 80, + } + # X_FORWARDED_HOST is ignored. + self.assertEqual(request.get_host(), 'example.com') + + # Check if X_FORWARDED_HOST isn't provided. + request = HttpRequest() + request.META = { + 'HTTP_HOST': 'example.com', + 'SERVER_NAME': 'internal.com', + 'SERVER_PORT': 80, + } + self.assertEqual(request.get_host(), 'example.com') + + # Check if HTTP_HOST isn't provided. + request = HttpRequest() + request.META = { + 'SERVER_NAME': 'internal.com', + 'SERVER_PORT': 80, + } + self.assertEqual(request.get_host(), 'internal.com') + + # Check if HTTP_HOST isn't provided, and we're on a nonstandard port + request = HttpRequest() + request.META = { + 'SERVER_NAME': 'internal.com', + 'SERVER_PORT': 8042, + } + self.assertEqual(request.get_host(), 'internal.com:8042') + + legit_hosts = [ + 'example.com', + 'example.com:80', + '12.34.56.78', + '12.34.56.78:443', + '[2001:19f0:feee::dead:beef:cafe]', + '[2001:19f0:feee::dead:beef:cafe]:8080', + 'xn--4ca9at.com', # Punnycode for öäü.com + 'anything.multitenant.com', + 'multitenant.com', + 'insensitive.com', + ] + + for host in legit_hosts: + request = HttpRequest() + request.META = { + 'HTTP_HOST': host, + } + request.get_host() + + # Poisoned host headers are rejected as suspicious + for host in chain(self.poisoned_hosts, ['other.com']): + with self.assertRaises(SuspiciousOperation): + request = HttpRequest() + request.META = { + 'HTTP_HOST': host, + } + request.get_host() + + @override_settings(USE_X_FORWARDED_HOST=True, ALLOWED_HOSTS=['*']) + def test_http_get_host_with_x_forwarded_host(self): + # Check if X_FORWARDED_HOST is provided. + request = HttpRequest() + request.META = { + 'HTTP_X_FORWARDED_HOST': 'forward.com', + 'HTTP_HOST': 'example.com', + 'SERVER_NAME': 'internal.com', + 'SERVER_PORT': 80, + } + # X_FORWARDED_HOST is obeyed. + self.assertEqual(request.get_host(), 'forward.com') + + # Check if X_FORWARDED_HOST isn't provided. + request = HttpRequest() + request.META = { + 'HTTP_HOST': 'example.com', + 'SERVER_NAME': 'internal.com', + 'SERVER_PORT': 80, + } + self.assertEqual(request.get_host(), 'example.com') + + # Check if HTTP_HOST isn't provided. + request = HttpRequest() + request.META = { + 'SERVER_NAME': 'internal.com', + 'SERVER_PORT': 80, + } + self.assertEqual(request.get_host(), 'internal.com') + + # Check if HTTP_HOST isn't provided, and we're on a nonstandard port + request = HttpRequest() + request.META = { + 'SERVER_NAME': 'internal.com', + 'SERVER_PORT': 8042, + } + self.assertEqual(request.get_host(), 'internal.com:8042') + + # Poisoned host headers are rejected as suspicious + legit_hosts = [ + 'example.com', + 'example.com:80', + '12.34.56.78', + '12.34.56.78:443', + '[2001:19f0:feee::dead:beef:cafe]', + '[2001:19f0:feee::dead:beef:cafe]:8080', + 'xn--4ca9at.com', # Punnycode for öäü.com + ] + + for host in legit_hosts: + request = HttpRequest() + request.META = { + 'HTTP_HOST': host, + } + request.get_host() + + for host in self.poisoned_hosts: + with self.assertRaises(SuspiciousOperation): + request = HttpRequest() + request.META = { + 'HTTP_HOST': host, + } + request.get_host() + + + @override_settings(DEBUG=True, ALLOWED_HOSTS=[]) + def test_host_validation_disabled_in_debug_mode(self): + """If ALLOWED_HOSTS is empty and DEBUG is True, all hosts pass.""" + request = HttpRequest() + request.META = { + 'HTTP_HOST': 'example.com', + } + self.assertEqual(request.get_host(), 'example.com') + + + @override_settings(ALLOWED_HOSTS=[]) + def test_get_host_suggestion_of_allowed_host(self): + """get_host() makes helpful suggestions if a valid-looking host is not in ALLOWED_HOSTS.""" + msg_invalid_host = "Invalid HTTP_HOST header: %r." + msg_suggestion = msg_invalid_host + "You may need to add %r to ALLOWED_HOSTS." + + for host in [ # Valid-looking hosts + 'example.com', + '12.34.56.78', + '[2001:19f0:feee::dead:beef:cafe]', + 'xn--4ca9at.com', # Punnycode for öäü.com + ]: + request = HttpRequest() + request.META = {'HTTP_HOST': host} + self.assertRaisesMessage( + SuspiciousOperation, + msg_suggestion % (host, host), + request.get_host + ) + + for domain, port in [ # Valid-looking hosts with a port number + ('example.com', 80), + ('12.34.56.78', 443), + ('[2001:19f0:feee::dead:beef:cafe]', 8080), + ]: + host = '%s:%s' % (domain, port) + request = HttpRequest() + request.META = {'HTTP_HOST': host} + self.assertRaisesMessage( + SuspiciousOperation, + msg_suggestion % (host, domain), + request.get_host + ) + + for host in self.poisoned_hosts: + request = HttpRequest() + request.META = {'HTTP_HOST': host} + self.assertRaisesMessage( + SuspiciousOperation, + msg_invalid_host % host, + request.get_host + ) + + @skipIf(connection.vendor == 'sqlite' - and connection.settings_dict['NAME'] in ('', ':memory:'), + and connection.settings_dict['TEST_NAME'] in (None, '', ':memory:'), "Cannot establish two connections to an in-memory SQLite database.") class DatabaseConnectionHandlingTests(TransactionTestCase): diff --git a/tests/requirements/base.txt b/tests/requirements/base.txt new file mode 100644 index 0000000000..89bd8230b2 --- /dev/null +++ b/tests/requirements/base.txt @@ -0,0 +1,6 @@ +bcrypt +docutils +Pillow +PyYAML +pytz +selenium diff --git a/tests/requirements/mysql.txt b/tests/requirements/mysql.txt new file mode 100644 index 0000000000..c7a2347407 --- /dev/null +++ b/tests/requirements/mysql.txt @@ -0,0 +1 @@ +MySQL-python diff --git a/tests/requirements/oracle.txt b/tests/requirements/oracle.txt new file mode 100644 index 0000000000..ae5b7349cd --- /dev/null +++ b/tests/requirements/oracle.txt @@ -0,0 +1 @@ +cx_oracle diff --git a/tests/requirements/postgres.txt b/tests/requirements/postgres.txt new file mode 100644 index 0000000000..658130bb2c --- /dev/null +++ b/tests/requirements/postgres.txt @@ -0,0 +1 @@ +psycopg2 diff --git a/tests/requirements/py2.txt b/tests/requirements/py2.txt new file mode 100644 index 0000000000..a9f6804039 --- /dev/null +++ b/tests/requirements/py2.txt @@ -0,0 +1,2 @@ +-r base.txt +python-memcached diff --git a/tests/requirements/py3.txt b/tests/requirements/py3.txt new file mode 100644 index 0000000000..ced3eed101 --- /dev/null +++ b/tests/requirements/py3.txt @@ -0,0 +1,2 @@ +-r base.txt +python3-memcached diff --git a/tests/runtests.py b/tests/runtests.py index b604155190..8d5b375fb3 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -22,6 +22,8 @@ TEMP_DIR = tempfile.mkdtemp(prefix='django_') os.environ['DJANGO_TEST_TEMP_DIR'] = TEMP_DIR SUBDIRS_TO_SKIP = [ + 'data', + 'requirements', 'templates', 'test_discovery_sample', 'test_discovery_sample2', @@ -49,10 +51,18 @@ ALWAYS_INSTALLED_APPS = [ def get_test_modules(): + from django.contrib.gis.tests.utils import HAS_SPATIAL_DB modules = [] - for modpath, dirpath in ( + discovery_paths = [ (None, RUNTESTS_DIR), - (CONTRIB_MODULE_PATH, CONTRIB_DIR)): + (CONTRIB_MODULE_PATH, CONTRIB_DIR) + ] + if HAS_SPATIAL_DB: + discovery_paths.append( + ('django.contrib.gis.tests', os.path.join(CONTRIB_DIR, 'gis', 'tests')) + ) + + for modpath, dirpath in discovery_paths: for f in os.listdir(dirpath): if ('.' in f or # Python 3 byte code dirs (PEP 3147) @@ -64,6 +74,7 @@ def get_test_modules(): modules.append((modpath, f)) return modules + def get_installed(): from django.db.models.loading import get_apps return [app.__name__.rsplit('.', 1)[0] for app in get_apps()] @@ -125,14 +136,6 @@ def setup(verbosity, test_labels): bits = bits[:1] test_labels_set.add('.'.join(bits)) - # If GeoDjango, then we'll want to add in the test applications - # that are a part of its test suite. - from django.contrib.gis.tests.utils import HAS_SPATIAL_DB - if HAS_SPATIAL_DB: - from django.contrib.gis.tests import geo_apps - test_modules.extend(geo_apps()) - settings.INSTALLED_APPS.extend(['django.contrib.gis', 'django.contrib.sitemaps']) - for modpath, module_name in test_modules: if modpath: module_label = '.'.join([modpath, module_name]) diff --git a/tests/select_for_update/tests.py b/tests/select_for_update/tests.py index b8a8ad19bf..3204d74224 100644 --- a/tests/select_for_update/tests.py +++ b/tests/select_for_update/tests.py @@ -99,15 +99,8 @@ class SelectForUpdateTests(TransactionTestCase): list(Person.objects.all().select_for_update(nowait=True)) self.assertTrue(self.has_for_update_sql(connection, nowait=True)) - # In Python 2.6 beta and some final releases, exceptions raised in __len__ - # are swallowed (Python issue 1242657), so these cases return an empty - # list, rather than raising an exception. Not a lot we can do about that, - # unfortunately, due to the way Python handles list() calls internally. - # Python 2.6.1 is the "in the wild" version affected by this, so we skip - # the test for that version. @requires_threading @skipUnlessDBFeature('has_select_for_update_nowait') - @unittest.skipIf(sys.version_info[:3] == (2, 6, 1), "Python version is 2.6.1") def test_nowait_raises_error_on_block(self): """ If nowait is specified, we expect an error to be raised rather @@ -128,15 +121,8 @@ class SelectForUpdateTests(TransactionTestCase): self.end_blocking_transaction() self.assertIsInstance(status[-1], DatabaseError) - # In Python 2.6 beta and some final releases, exceptions raised in __len__ - # are swallowed (Python issue 1242657), so these cases return an empty - # list, rather than raising an exception. Not a lot we can do about that, - # unfortunately, due to the way Python handles list() calls internally. - # Python 2.6.1 is the "in the wild" version affected by this, so we skip - # the test for that version. @skipIfDBFeature('has_select_for_update_nowait') @skipUnlessDBFeature('has_select_for_update') - @unittest.skipIf(sys.version_info[:3] == (2, 6, 1), "Python version is 2.6.1") def test_unsupported_nowait_raises_error(self): """ If a SELECT...FOR UPDATE NOWAIT is run on a database backend diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py index bfd8d607a9..87ed4d4f5e 100644 --- a/tests/settings_tests/tests.py +++ b/tests/settings_tests/tests.py @@ -203,6 +203,29 @@ class SettingsTests(TestCase): 'ALLOWED_INCLUDE_ROOTS', '/var/www/ssi/') +class TestComplexSettingOverride(TestCase): + def setUp(self): + self.old_warn_override_settings = signals.COMPLEX_OVERRIDE_SETTINGS.copy() + signals.COMPLEX_OVERRIDE_SETTINGS.add('TEST_WARN') + + def tearDown(self): + signals.COMPLEX_OVERRIDE_SETTINGS = self.old_warn_override_settings + self.assertFalse('TEST_WARN' in signals.COMPLEX_OVERRIDE_SETTINGS) + + def test_complex_override_warning(self): + """Regression test for #19031""" + with warnings.catch_warnings(record=True) as w: + warnings.simplefilter("always") + + override = override_settings(TEST_WARN='override') + override.enable() + self.assertEqual('override', settings.TEST_WARN) + override.disable() + + self.assertEqual(len(w), 1) + self.assertEqual('Overriding setting TEST_WARN can lead to unexpected behaviour.', str(w[-1].message)) + + class TrailingSlashURLTests(TestCase): """ Tests for the MEDIA_URL and STATIC_URL settings. diff --git a/tests/syndication/feeds.py b/tests/syndication/feeds.py index 0956820bf0..1cd5c3d988 100644 --- a/tests/syndication/feeds.py +++ b/tests/syndication/feeds.py @@ -33,7 +33,10 @@ class TestRss2Feed(views.Feed): return "Overridden description: %s" % item def item_pubdate(self, item): - return item.date + return item.published + + def item_updateddate(self, item): + return item.updated item_author_name = 'Sally Smith' item_author_email = 'test@example.com' @@ -72,6 +75,17 @@ class TestAtomFeed(TestRss2Feed): subtitle = TestRss2Feed.description +class TestLatestFeed(TestRss2Feed): + """ + A feed where the latest entry date is an `updated` element. + """ + feed_type = feedgenerator.Atom1Feed + subtitle = TestRss2Feed.description + + def items(self): + return Entry.objects.exclude(pk=5) + + class ArticlesFeed(TestRss2Feed): """ A feed to test no link being defined. Articles have no get_absolute_url() @@ -115,7 +129,7 @@ class NaiveDatesFeed(TestAtomFeed): A feed with naive (non-timezone-aware) dates. """ def item_pubdate(self, item): - return item.date + return item.published class TZAwareDatesFeed(TestAtomFeed): @@ -126,7 +140,7 @@ class TZAwareDatesFeed(TestAtomFeed): # Provide a weird offset so that the test can know it's getting this # specific offset and not accidentally getting on from # settings.TIME_ZONE. - return item.date.replace(tzinfo=tzinfo.FixedOffset(42)) + return item.published.replace(tzinfo=tzinfo.FixedOffset(42)) class TestFeedUrlFeed(TestAtomFeed): diff --git a/tests/syndication/fixtures/feeddata.json b/tests/syndication/fixtures/feeddata.json index 167115c925..52e5028fcd 100644 --- a/tests/syndication/fixtures/feeddata.json +++ b/tests/syndication/fixtures/feeddata.json @@ -4,7 +4,8 @@ "pk": 1, "fields": { "title": "My first entry", - "date": "1850-01-01 12:30:00" + "updated": "1850-01-01 12:30:00", + "published": "1066-09-25 20:15:00" } }, { @@ -12,7 +13,8 @@ "pk": 2, "fields": { "title": "My second entry", - "date": "2008-01-02 12:30:00" + "updated": "2008-01-02 12:30:00", + "published": "2006-03-17 18:00:00" } }, { @@ -20,7 +22,8 @@ "pk": 3, "fields": { "title": "My third entry", - "date": "2008-01-02 13:30:00" + "updated": "2008-01-02 13:30:00", + "published": "2005-06-14 10:45:00" } }, { @@ -28,7 +31,17 @@ "pk": 4, "fields": { "title": "A & B < C > D", - "date": "2008-01-03 13:30:00" + "updated": "2008-01-03 13:30:00", + "published": "2005-11-25 12:11:23" + } + }, + { + "model": "syndication.entry", + "pk": 5, + "fields": { + "title": "My last entry", + "updated": "2013-01-20 00:00:00", + "published": "2013-03-25 20:00:00" } }, { diff --git a/tests/syndication/models.py b/tests/syndication/models.py index 10b3fe3a0c..166acd69ca 100644 --- a/tests/syndication/models.py +++ b/tests/syndication/models.py @@ -5,10 +5,11 @@ from django.utils.encoding import python_2_unicode_compatible @python_2_unicode_compatible class Entry(models.Model): title = models.CharField(max_length=200) - date = models.DateTimeField() + updated = models.DateTimeField() + published = models.DateTimeField() class Meta: - ordering = ('date',) + ordering = ('updated',) def __str__(self): return self.title @@ -24,4 +25,3 @@ class Article(models.Model): def __str__(self): return self.title - diff --git a/tests/syndication/tests.py b/tests/syndication/tests.py index 1627f7182b..d3b0058d53 100644 --- a/tests/syndication/tests.py +++ b/tests/syndication/tests.py @@ -58,7 +58,7 @@ class SyndicationFeedTest(FeedTestCase): chan = chan_elem[0] # Find the last build date - d = Entry.objects.latest('date').date + d = Entry.objects.latest('published').published ltz = tzinfo.LocalTimezone(d) last_build_date = rfc2822_date(d.replace(tzinfo=ltz)) @@ -88,7 +88,7 @@ class SyndicationFeedTest(FeedTestCase): ) # Find the pubdate of the first feed item - d = Entry.objects.get(pk=1).date + d = Entry.objects.get(pk=1).published ltz = tzinfo.LocalTimezone(d) pub_date = rfc2822_date(d.replace(tzinfo=ltz)) @@ -203,10 +203,61 @@ class SyndicationFeedTest(FeedTestCase): entries = feed.getElementsByTagName('entry') self.assertEqual(len(entries), Entry.objects.count()) for entry in entries: - self.assertChildNodes(entry, ['title', 'link', 'id', 'summary', 'category', 'updated', 'rights', 'author']) + self.assertChildNodes(entry, [ + 'title', + 'link', + 'id', + 'summary', + 'category', + 'updated', + 'published', + 'rights', + 'author', + ]) summary = entry.getElementsByTagName('summary')[0] self.assertEqual(summary.getAttribute('type'), 'html') + def test_atom_feed_published_and_updated_elements(self): + """ + Test that the published and updated elements are not + the same and now adhere to RFC 4287. + """ + response = self.client.get('/syndication/atom/') + feed = minidom.parseString(response.content).firstChild + entries = feed.getElementsByTagName('entry') + + published = entries[0].getElementsByTagName('published')[0].firstChild.wholeText + updated = entries[0].getElementsByTagName('updated')[0].firstChild.wholeText + + self.assertNotEqual(published, updated) + + def test_latest_post_date(self): + """ + Test that both the published and updated dates are + considered when determining the latest post date. + """ + # this feed has a `published` element with the latest date + response = self.client.get('/syndication/atom/') + feed = minidom.parseString(response.content).firstChild + updated = feed.getElementsByTagName('updated')[0].firstChild.wholeText + + d = Entry.objects.latest('published').published + ltz = tzinfo.LocalTimezone(d) + latest_published = rfc3339_date(d.replace(tzinfo=ltz)) + + self.assertEqual(updated, latest_published) + + # this feed has an `updated` element with the latest date + response = self.client.get('/syndication/latest/') + feed = minidom.parseString(response.content).firstChild + updated = feed.getElementsByTagName('updated')[0].firstChild.wholeText + + d = Entry.objects.exclude(pk=5).latest('updated').updated + ltz = tzinfo.LocalTimezone(d) + latest_updated = rfc3339_date(d.replace(tzinfo=ltz)) + + self.assertEqual(updated, latest_updated) + def test_custom_feed_generator(self): response = self.client.get('/syndication/custom/') feed = minidom.parseString(response.content).firstChild @@ -219,7 +270,18 @@ class SyndicationFeedTest(FeedTestCase): self.assertEqual(len(entries), Entry.objects.count()) for entry in entries: self.assertEqual(entry.getAttribute('bacon'), 'yum') - self.assertChildNodes(entry, ['title', 'link', 'id', 'summary', 'ministry', 'rights', 'author', 'updated', 'category']) + self.assertChildNodes(entry, [ + 'title', + 'link', + 'id', + 'summary', + 'ministry', + 'rights', + 'author', + 'updated', + 'published', + 'category', + ]) summary = entry.getElementsByTagName('summary')[0] self.assertEqual(summary.getAttribute('type'), 'html') @@ -245,7 +307,7 @@ class SyndicationFeedTest(FeedTestCase): doc = minidom.parseString(response.content) updated = doc.getElementsByTagName('updated')[0].firstChild.wholeText - d = Entry.objects.latest('date').date + d = Entry.objects.latest('published').published ltz = tzinfo.LocalTimezone(d) latest = rfc3339_date(d.replace(tzinfo=ltz)) @@ -257,12 +319,12 @@ class SyndicationFeedTest(FeedTestCase): """ response = self.client.get('/syndication/aware-dates/') doc = minidom.parseString(response.content) - updated = doc.getElementsByTagName('updated')[0].firstChild.wholeText - self.assertEqual(updated[-6:], '+00:42') + published = doc.getElementsByTagName('published')[0].firstChild.wholeText + self.assertEqual(published[-6:], '+00:42') def test_feed_last_modified_time(self): response = self.client.get('/syndication/naive-dates/') - self.assertEqual(response['Last-Modified'], 'Thu, 03 Jan 2008 19:30:00 GMT') + self.assertEqual(response['Last-Modified'], 'Tue, 26 Mar 2013 01:00:00 GMT') # No last-modified when feed has no item_pubdate response = self.client.get('/syndication/no_pubdate/') diff --git a/tests/syndication/urls.py b/tests/syndication/urls.py index 1dd7e92332..06a75a4e68 100644 --- a/tests/syndication/urls.py +++ b/tests/syndication/urls.py @@ -15,6 +15,7 @@ urlpatterns = patterns('django.contrib.syndication.views', (r'^syndication/rss091/$', feeds.TestRss091Feed()), (r'^syndication/no_pubdate/$', feeds.TestNoPubdateFeed()), (r'^syndication/atom/$', feeds.TestAtomFeed()), + (r'^syndication/latest/$', feeds.TestLatestFeed()), (r'^syndication/custom/$', feeds.TestCustomFeed()), (r'^syndication/naive-dates/$', feeds.NaiveDatesFeed()), (r'^syndication/aware-dates/$', feeds.TZAwareDatesFeed()), diff --git a/tests/template_tests/test_context.py b/tests/template_tests/test_context.py index 224b94d060..ca167a73f3 100644 --- a/tests/template_tests/test_context.py +++ b/tests/template_tests/test_context.py @@ -16,3 +16,12 @@ class ContextTests(TestCase): self.assertEqual(c.pop(), {"a": 2}) self.assertEqual(c["a"], 1) self.assertEqual(c.get("foo", 42), 42) + + with c.push(): + c['a'] = 2 + self.assertEqual(c['a'], 2) + self.assertEqual(c['a'], 1) + + with c.push(a=3): + self.assertEqual(c['a'], 3) + self.assertEqual(c['a'], 1) diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py index 4e9e44bc12..72200e40d3 100644 --- a/tests/test_runner/tests.py +++ b/tests/test_runner/tests.py @@ -291,6 +291,65 @@ class DummyBackendTest(unittest.TestCase): db.connections = old_db_connections +class AliasedDefaultTestSetupTest(unittest.TestCase): + def test_setup_aliased_default_database(self): + """ + Test that setup_datebases() doesn't fail when 'default' is aliased + """ + runner_instance = runner.DiscoverRunner(verbosity=0) + old_db_connections = db.connections + try: + db.connections = db.ConnectionHandler({ + 'default': { + 'NAME': 'dummy' + }, + 'aliased': { + 'NAME': 'dummy' + } + }) + old_config = runner_instance.setup_databases() + runner_instance.teardown_databases(old_config) + except Exception as e: + self.fail("setup_databases/teardown_databases unexpectedly raised " + "an error: %s" % e) + finally: + db.connections = old_db_connections + + +class AliasedDatabaseTeardownTest(unittest.TestCase): + def test_setup_aliased_databases(self): + from django.db.backends.dummy.base import DatabaseCreation + + runner_instance = runner.DiscoverRunner(verbosity=0) + old_db_connections = db.connections + old_destroy_test_db = DatabaseCreation.destroy_test_db + old_create_test_db = DatabaseCreation.create_test_db + try: + destroyed_names = [] + DatabaseCreation.destroy_test_db = lambda self, old_database_name, verbosity=1: destroyed_names.append(old_database_name) + DatabaseCreation.create_test_db = lambda self, verbosity=1, autoclobber=False: self._get_test_db_name() + + db.connections = db.ConnectionHandler({ + 'default': { + 'ENGINE': 'django.db.backends.dummy', + 'NAME': 'dbname', + }, + 'other': { + 'ENGINE': 'django.db.backends.dummy', + 'NAME': 'dbname', + } + }) + + old_config = runner_instance.setup_databases() + runner_instance.teardown_databases(old_config) + + self.assertEqual(destroyed_names.count('dbname'), 1) + finally: + DatabaseCreation.create_test_db = old_create_test_db + DatabaseCreation.destroy_test_db = old_destroy_test_db + db.connections = old_db_connections + + class DeprecationDisplayTest(AdminScriptTestCase): # tests for 19546 def setUp(self): @@ -308,8 +367,6 @@ class DeprecationDisplayTest(AdminScriptTestCase): self.assertIn("DeprecationWarning: warning from test", err) self.assertIn("DeprecationWarning: module-level warning from deprecation_app", err) - @unittest.skipIf(sys.version_info[:2] == (2, 6), - "On Python 2.6, DeprecationWarnings are visible anyway") def test_runner_deprecation_verbosity_zero(self): args = ['test', '--settings=settings', '--verbosity=0'] out, err = self.run_django_admin(args) diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py index 2c2bc24d72..24aa433dd3 100644 --- a/tests/test_utils/tests.py +++ b/tests/test_utils/tests.py @@ -2,13 +2,12 @@ from __future__ import absolute_import, unicode_literals import unittest -from unittest import skip from django.db import connection from django.forms import EmailField, IntegerField from django.http import HttpResponse from django.template.loader import render_to_string -from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature +from django.test import SimpleTestCase, TestCase, skipIfDBFeature, skipUnlessDBFeature from django.test.html import HTMLParseError, parse_html from django.test.utils import CaptureQueriesContext, IgnoreAllDeprecationWarningsMixin from django.utils import six @@ -27,6 +26,29 @@ class SkippingTestCase(TestCase): self.assertRaises(ValueError, test_func) +class SkippingClassTestCase(TestCase): + def test_skip_class_unless_db_feature(self): + @skipUnlessDBFeature("__class__") + class NotSkippedTests(unittest.TestCase): + def test_dummy(self): + return + + @skipIfDBFeature("__class__") + class SkippedTests(unittest.TestCase): + def test_will_be_skipped(self): + self.fail("We should never arrive here.") + + test_suite = unittest.TestSuite() + test_suite.addTest(NotSkippedTests('test_dummy')) + try: + test_suite.addTest(SkippedTests('test_will_be_skipped')) + except unittest.SkipTest: + self.fail("SkipTest should not be raised at this stage") + result = unittest.TextTestRunner(stream=six.StringIO()).run(test_suite) + self.assertEqual(result.testsRun, 2) + self.assertEqual(len(result.skipped), 1) + + class AssertNumQueriesTests(TestCase): urls = 'test_utils.urls' @@ -561,7 +583,7 @@ class SkippingExtraTests(TestCase): with self.assertNumQueries(0): super(SkippingExtraTests, self).__call__(result) - @skip("Fixture loading should not be performed for skipped tests.") + @unittest.skip("Fixture loading should not be performed for skipped tests.") def test_fixtures_are_skipped(self): pass diff --git a/tests/transactions_regress/tests.py b/tests/transactions_regress/tests.py index bd9e78b033..01f8fc4186 100644 --- a/tests/transactions_regress/tests.py +++ b/tests/transactions_regress/tests.py @@ -191,10 +191,9 @@ class TestTransactionClosing(IgnoreDeprecationWarningsMixin, TransactionTestCase """ self.test_failing_query_transaction_closed() -@skipIf(connection.vendor == 'sqlite' and - (connection.settings_dict['NAME'] == ':memory:' or - not connection.settings_dict['NAME']), - 'Test uses multiple connections, but in-memory sqlite does not support this') +@skipIf(connection.vendor == 'sqlite' + and connection.settings_dict['TEST_NAME'] in (None, '', ':memory:'), + "Cannot establish two connections to an in-memory SQLite database.") class TestNewConnection(IgnoreDeprecationWarningsMixin, TransactionTestCase): """ Check that new connections don't have special behaviour. diff --git a/tests/validators/tests.py b/tests/validators/tests.py index ec3e2dc8c1..9be49d7726 100644 --- a/tests/validators/tests.py +++ b/tests/validators/tests.py @@ -46,6 +46,7 @@ TEST_DATA = ( (validate_email, 'example@-invalid.com', ValidationError), (validate_email, 'example@inv-.alid-.com', ValidationError), (validate_email, 'example@inv-.-alid.com', ValidationError), + (validate_email, 'test@example.com\n\n