Merge branch 'master' into schema-alteration

Conflicts:
	django/db/backends/__init__.py
	django/db/backends/mysql/base.py
	django/db/backends/oracle/base.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/fields/related.py

1 files changed, 29 insertions, 0 deletions

diff --git a/tests/conditional_processing/views.py b/tests/conditional_processing/views.py
new file mode 100644
index 0000000000..14a5a83a45
--- /dev/null
+++ b/tests/conditional_processing/views.py
@@ -0,0 +1,29 @@
+# -*- coding:utf-8 -*-
+from __future__ import absolute_import
+
+from django.views.decorators.http import condition, etag, last_modified
+from django.http import HttpResponse
+
+from .tests import FULL_RESPONSE, LAST_MODIFIED, ETAG
+
+
+def index(request):
+    return HttpResponse(FULL_RESPONSE)
+index = condition(lambda r: ETAG, lambda r: LAST_MODIFIED)(index)
+
+def last_modified_view1(request):
+    return HttpResponse(FULL_RESPONSE)
+last_modified_view1 = condition(last_modified_func=lambda r: LAST_MODIFIED)(last_modified_view1)
+
+def last_modified_view2(request):
+    return HttpResponse(FULL_RESPONSE)
+last_modified_view2 = last_modified(lambda r: LAST_MODIFIED)(last_modified_view2)
+
+def etag_view1(request):
+    return HttpResponse(FULL_RESPONSE)
+etag_view1 = condition(etag_func=lambda r: ETAG)(etag_view1)
+
+def etag_view2(request):
+    return HttpResponse(FULL_RESPONSE)
+etag_view2 = etag(lambda r: ETAG)(etag_view2)
+