Ticket #16963: relocate_view_class-2.diff

new file django/views/base.py

@@ +1 @@
+from functools import update_wrapper
+
+from django import http
+from django.utils.decorators import classonlymethod
+from django.utils.log import getLogger
+
+logger = getLogger('django.request')
+
+class View(object):
+    """
+    Intentionally simple parent class for all class-based views. Only
+    implements dispatch-by-method and simple sanity checking.
+    """
+
+    http_method_names = ['get', 'post', 'put', 'delete', 'head', 'options', 'trace']
+
+    def __init__(self, **kwargs):
+        """
+        Constructor. Called in the URLconf; can contain helpful extra
+        keyword arguments, and other things.
+        """
+        # Go through keyword arguments, and either save their values to our
+        # instance, or raise an error.
+        for key, value in kwargs.iteritems():
+            setattr(self, key, value)
+
+    @classonlymethod
+    def as_view(cls, **initkwargs):
+        """
+        Main entry point for a request-response process.
+        """
+        # sanitize keyword arguments
+        for key in initkwargs:
+            if key in cls.http_method_names:
+                raise TypeError(u"You tried to pass in the %s method name as a "
+                                u"keyword argument to %s(). Don't do that."
+                                % (key, cls.__name__))
+            if not hasattr(cls, key):
+                raise TypeError(u"%s() received an invalid keyword %r" % (
+                    cls.__name__, key))
+
+        def view(request, *args, **kwargs):
+            self = cls(**initkwargs)
+            return self.dispatch(request, *args, **kwargs)
+
+        # take name and docstring from class
+        update_wrapper(view, cls, updated=())
+
+        # and possible attributes set by decorators
+        # like csrf_exempt from dispatch
+        update_wrapper(view, cls.dispatch, assigned=())
+        return view
+
+    def dispatch(self, request, *args, **kwargs):
+        # Try to dispatch to the right method; if a method doesn't exist,
+        # defer to the error handler. Also defer to the error handler if the
+        # request method isn't on the approved list.
+        if request.method.lower() in self.http_method_names:
+            handler = getattr(self, request.method.lower(), self.http_method_not_allowed)
+        else:
+            handler = self.http_method_not_allowed
+        self.request = request
+        self.args = args
+        self.kwargs = kwargs
+        return handler(request, *args, **kwargs)
+
+    def http_method_not_allowed(self, request, *args, **kwargs):
+        allowed_methods = [m for m in self.http_method_names if hasattr(self, m)]
+        logger.warning('Method Not Allowed (%s): %s' % (request.method, request.path),
+            extra={
+                'status_code': 405,
+                'request': self.request
+            }
+        )
+        return http.HttpResponseNotAllowed(allowed_methods)
+
+    def head(self, *args, **kwargs):
+        return self.get(*args, **kwargs)
+
+

django/views/generic/__init__.py

@@ -1 @@
-from django.views.generic.base import View, TemplateView, RedirectView
+from django.views.base import View
+from django.views.generic.base import TemplateView, RedirectView
 from django.views.generic.dates import (ArchiveIndexView, YearArchiveView, MonthArchiveView,
                                      WeekArchiveView, DayArchiveView, TodayArchiveView,
                                      DateDetailView)

django/views/generic/base.py

@@ -1 @@
-from functools import update_wrapper
 from django import http
 from django.core.exceptions import ImproperlyConfigured
 from django.template.response import TemplateResponse
 from django.utils.log import getLogger
-from django.utils.decorators import classonlymethod
+from django.views.base import View
 
 logger = getLogger('django.request')
 
 
-class View(object):
-    """
-    Intentionally simple parent class for all views. Only implements
-    dispatch-by-method and simple sanity checking.
-    """
-
-    http_method_names = ['get', 'post', 'put', 'delete', 'head', 'options', 'trace']
-
-    def __init__(self, **kwargs):
-        """
-        Constructor. Called in the URLconf; can contain helpful extra
-        keyword arguments, and other things.
-        """
-        # Go through keyword arguments, and either save their values to our
-        # instance, or raise an error.
-        for key, value in kwargs.iteritems():
-            setattr(self, key, value)
-
-    @classonlymethod
-    def as_view(cls, **initkwargs):
-        """
-        Main entry point for a request-response process.
-        """
-        # sanitize keyword arguments
-        for key in initkwargs:
-            if key in cls.http_method_names:
-                raise TypeError(u"You tried to pass in the %s method name as a "
-                                u"keyword argument to %s(). Don't do that."
-                                % (key, cls.__name__))
-            if not hasattr(cls, key):
-                raise TypeError(u"%s() received an invalid keyword %r" % (
-                    cls.__name__, key))
-
-        def view(request, *args, **kwargs):
-            self = cls(**initkwargs)
-            return self.dispatch(request, *args, **kwargs)
-
-        # take name and docstring from class
-        update_wrapper(view, cls, updated=())
-
-        # and possible attributes set by decorators
-        # like csrf_exempt from dispatch
-        update_wrapper(view, cls.dispatch, assigned=())
-        return view
-
-    def dispatch(self, request, *args, **kwargs):
-        # Try to dispatch to the right method; if a method doesn't exist,
-        # defer to the error handler. Also defer to the error handler if the
-        # request method isn't on the approved list.
-        if request.method.lower() in self.http_method_names:
-            handler = getattr(self, request.method.lower(), self.http_method_not_allowed)
-        else:
-            handler = self.http_method_not_allowed
-        self.request = request
-        self.args = args
-        self.kwargs = kwargs
-        return handler(request, *args, **kwargs)
-
-    def http_method_not_allowed(self, request, *args, **kwargs):
-        allowed_methods = [m for m in self.http_method_names if hasattr(self, m)]
-        logger.warning('Method Not Allowed (%s): %s' % (request.method, request.path),
-            extra={
-                'status_code': 405,
-                'request': self.request
-            }
-        )
-        return http.HttpResponseNotAllowed(allowed_methods)
-
-    def head(self, *args, **kwargs):
-        return self.get(*args, **kwargs)
-
-
 class TemplateResponseMixin(object):
     """
     A mixin that can be used to render a template.

django/views/generic/dates.py

@@ -4 +4 @@
 from django.http import Http404
 from django.utils.encoding import force_unicode
 from django.utils.translation import ugettext as _
-from django.views.generic.base import View
+from django.views.base import View
 from django.views.generic.detail import BaseDetailView, SingleObjectTemplateResponseMixin
 from django.views.generic.list import MultipleObjectMixin, MultipleObjectTemplateResponseMixin
 

django/views/generic/detail.py

@@ -2 +2 @@
 from django.http import Http404
 from django.utils.encoding import smart_str
 from django.utils.translation import ugettext as _
-from django.views.generic.base import TemplateResponseMixin, View
+from django.views.base import View
+from django.views.generic.base import TemplateResponseMixin
 
 
 class SingleObjectMixin(object):

django/views/generic/edit.py

@@ -1 +1 @@
 from django.forms import models as model_forms
 from django.core.exceptions import ImproperlyConfigured
 from django.http import HttpResponseRedirect
-from django.views.generic.base import TemplateResponseMixin, View
+from django.views.base import View
+from django.views.generic.base import TemplateResponseMixin
 from django.views.generic.detail import (SingleObjectMixin,
                         SingleObjectTemplateResponseMixin, BaseDetailView)
 

django/views/generic/list.py

@@ -3 +3 @@
 from django.http import Http404
 from django.utils.encoding import smart_str
 from django.utils.translation import ugettext as _
-from django.views.generic.base import TemplateResponseMixin, View
+from django.views.base import View
+from django.views.generic.base import TemplateResponseMixin
 
 
 class MultipleObjectMixin(object):

docs/ref/class-based-views.txt

@@ -41 +41 @@
 For example, the :class:`~django.views.generic.base.detail.DetailView`
 is composed from:
 
-    * :class:`~django.db.views.generic.base.View`, which provides the
+    * :class:`~django.views.base.View`, which provides the
       basic class-based behavior
-    * :class:`~django.db.views.generic.detail.SingleObjectMixin`, which
+    * :class:`~django.views.generic.detail.SingleObjectMixin`, which
       provides the utilities for retrieving and displaying a single object
-    * :class:`~django.db.views.generic.detail.SingleObjectTemplateResponseMixin`,
+    * :class:`~django.views.generic.detail.SingleObjectTemplateResponseMixin`,
       which provides the tools for rendering a single object into a
       template-based response.
 
@@ -817 +817 @@
         See :meth:`~django.db.models.query.QuerySet.dates()` for the
         ways that the ``date_type`` argument can be used.
 
+Class-based view base class
+===========================
 
-Generic views
-=============
-
-Simple generic views
---------------------
-
-.. currentmodule:: django.views.generic.base
+.. currentmodule:: django.views.base
 
 View
 ~~~~
 .. class:: View()
 
-    The master class-based base view. All other generic class-based views
+    The master class-based base view. All generic class-based views
     inherit from this base class.
 
-    Each request served by a :class:`~django.views.generic.base.View` has an
+    Each request served by a :class:`~django.views.base.View` has an
     independent state; therefore, it is safe to store state variables on the
     instance (i.e., ``self.foo = 3`` is a thread-safe operation).
 
@@ -879 +875 @@
         The default implementation returns ``HttpResponseNotAllowed`` with list
         of allowed methods in plain text.
 
+Generic views
+=============
+
+Simple generic views
+--------------------
+
+.. currentmodule:: django.views.generic.base
+
 TemplateView
 ~~~~~~~~~~~~
 .. class:: TemplateView()

docs/topics/class-based-views.txt

@@ -566 +566 @@
 ---------------------
 
 The simplest way of decorating class-based views is to decorate the
-result of the :meth:`~django.views.generic.base.View.as_view` method.
+result of the :meth:`~django.views.base.View.as_view` method.
 The easiest place to do this is in the URLconf where you deploy your
 view::
 
@@ -589 +589 @@
 
 To decorate every instance of a class-based view, you need to decorate
 the class definition itself. To do this you apply the decorator to the
-:meth:`~django.views.generic.base.View.dispatch` method of the class.
+:meth:`~django.views.base.View.dispatch` method of the class.
 
 A method on a class isn't quite the same as a standalone function, so
 you can't just apply a function decorator to the method -- you need to

tests/regressiontests/generic_views/base.py

@@ -4 +4 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.http import HttpResponse
 from django.test import TestCase, RequestFactory
-from django.views.generic import View, TemplateView, RedirectView
+from django.views.base import View
+from django.views.generic import TemplateView, RedirectView
 
 
 class SimpleView(View):

tests/regressiontests/special_headers/views.py

@@ -1 +1 @@
 # -*- coding:utf-8 -*-
 from django.http import HttpResponse
 from django.utils.decorators import decorator_from_middleware
-from django.views.generic import View
+from django.views.base import View
 from django.middleware.doc import XViewMiddleware
 
 xview_dec = decorator_from_middleware(XViewMiddleware)