Merge branch 'restframework2' into rest-framework-2-merge2.0.0

Conflicts:
	.gitignore
	.travis.yml
	AUTHORS
	README.rst
	djangorestframework/mixins.py
	djangorestframework/renderers.py
	djangorestframework/resources.py
	djangorestframework/serializer.py
	djangorestframework/templates/djangorestframework/base.html
	djangorestframework/templates/djangorestframework/login.html
	djangorestframework/templatetags/add_query_param.py
	djangorestframework/tests/accept.py
	djangorestframework/tests/authentication.py
	djangorestframework/tests/content.py
	djangorestframework/tests/reverse.py
	djangorestframework/tests/serializer.py
	djangorestframework/views.py
	docs/examples.rst
	docs/examples/blogpost.rst
	docs/examples/modelviews.rst
	docs/examples/objectstore.rst
	docs/examples/permissions.rst
	docs/examples/pygments.rst
	docs/examples/views.rst
	docs/howto/alternativeframeworks.rst
	docs/howto/mixin.rst
	docs/howto/reverse.rst
	docs/howto/usingurllib2.rst
	docs/index.rst
	docs/topics/release-notes.md
	examples/sandbox/views.py
	rest_framework/__init__.py
	rest_framework/compat.py
	rest_framework/utils/breadcrumbs.py
	setup.py

1 files changed, 0 insertions, 292 deletions

diff --git a/djangorestframework/views.py b/djangorestframework/views.py
deleted file mode 100644
index 4aa6ca0c..00000000
--- a/djangorestframework/views.py
+++ /dev/null
@@ -1,292 +0,0 @@
-"""
-The :mod:`views` module provides the Views you will most probably
-be subclassing in your implementation.
-
-By setting or modifying class attributes on your view, you change it's predefined behaviour.
-"""
-
-import re
-from django.http import HttpResponse
-from django.utils.html import escape
-from django.utils.safestring import mark_safe
-from django.views.decorators.csrf import csrf_exempt
-
-from djangorestframework.compat import View as DjangoView, apply_markdown
-from djangorestframework.response import Response, ErrorResponse
-from djangorestframework.mixins import *
-from djangorestframework import resources, renderers, parsers, authentication, permissions, status
-
-
-__all__ = (
-    'View',
-    'ModelView',
-    'InstanceModelView',
-    'ListModelView',
-    'ListOrCreateModelView'
-)
-
-
-def _remove_trailing_string(content, trailing):
-    """
-    Strip trailing component `trailing` from `content` if it exists.
-    Used when generating names from view/resource classes.
-    """
-    if content.endswith(trailing) and content != trailing:
-        return content[:-len(trailing)]
-    return content
-
-
-def _remove_leading_indent(content):
-    """
-    Remove leading indent from a block of text.
-    Used when generating descriptions from docstrings.
-    """
-    whitespace_counts = [len(line) - len(line.lstrip(' '))
-                         for line in content.splitlines()[1:] if line.lstrip()]
-
-    # unindent the content if needed
-    if whitespace_counts:
-        whitespace_pattern = '^' + (' ' * min(whitespace_counts))
-        return re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content)
-    return content
-
-
-def _camelcase_to_spaces(content):
-    """
-    Translate 'CamelCaseNames' to 'Camel Case Names'.
-    Used when generating names from view/resource classes.
-    """
-    camelcase_boundry = '(((?<=[a-z])[A-Z])|([A-Z](?![A-Z]|$)))'
-    return re.sub(camelcase_boundry, ' \\1', content).strip()
-
-
-_resource_classes = (
-    None,
-    resources.Resource,
-    resources.FormResource,
-    resources.ModelResource
-)
-
-
-class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView):
-    """
-    Handles incoming requests and maps them to REST operations.
-    Performs request deserialization, response serialization, authentication and input validation.
-    """
-
-    resource = None
-    """
-    The resource to use when validating requests and filtering responses,
-    or `None` to use default behaviour.
-    """
-
-    renderers = renderers.DEFAULT_RENDERERS
-    """
-    List of renderers the resource can serialize the response with, ordered by preference.
-    """
-
-    parsers = parsers.DEFAULT_PARSERS
-    """
-    List of parsers the resource can parse the request with.
-    """
-
-    authentication = (authentication.UserLoggedInAuthentication,
-                       authentication.BasicAuthentication)
-    """
-    List of all authenticating methods to attempt.
-    """
-
-    permissions = (permissions.FullAnonAccess,)
-    """
-    List of all permissions that must be checked.
-    """
-
-    @classmethod
-    def as_view(cls, **initkwargs):
-        """
-        Override the default :meth:`as_view` to store an instance of the view
-        as an attribute on the callable function.  This allows us to discover
-        information about the view when we do URL reverse lookups.
-        """
-        view = super(View, cls).as_view(**initkwargs)
-        view.cls_instance = cls(**initkwargs)
-        return view
-
-    @property
-    def allowed_methods(self):
-        """
-        Return the list of allowed HTTP methods, uppercased.
-        """
-        return [method.upper() for method in self.http_method_names if hasattr(self, method)]
-
-    def get_name(self):
-        """
-        Return the resource or view class name for use as this view's name.
-        Override to customize.
-        """
-        # If this view has a resource that's been overridden, then use that resource for the name
-        if getattr(self, 'resource', None) not in _resource_classes:
-            name = self.resource.__name__
-            name = _remove_trailing_string(name, 'Resource')
-            name += getattr(self, '_suffix', '')
-
-        # If it's a view class with no resource then grok the name from the class name
-        else:
-            name = self.__class__.__name__
-            name = _remove_trailing_string(name, 'View')
-
-        return _camelcase_to_spaces(name)
-
-    def get_description(self, html=False):
-        """
-        Return the resource or view docstring for use as this view's description.
-        Override to customize.
-        """
-
-        description = None
-
-        # If this view has a resource that's been overridden,
-        # then try to use the resource's docstring
-        if getattr(self, 'resource', None) not in _resource_classes:
-            description = self.resource.__doc__
-
-        # Otherwise use the view docstring
-        if not description:
-            description = self.__doc__ or ''
-
-        description = _remove_leading_indent(description)
-
-        if not isinstance(description, unicode):
-            description = description.decode('UTF-8')
-
-        if html:
-            return self.markup_description(description)
-        return description
-
-    def markup_description(self, description):
-        if apply_markdown:
-            description = apply_markdown(description)
-        else:
-            description = escape(description).replace('\n', '<br />')
-        return mark_safe(description)
-
-    def http_method_not_allowed(self, request, *args, **kwargs):
-        """
-        Return an HTTP 405 error if an operation is called which does not have a handler method.
-        """
-        raise ErrorResponse(status.HTTP_405_METHOD_NOT_ALLOWED,
-                            {'detail': 'Method \'%s\' not allowed on this resource.' % self.method})
-
-    def initial(self, request, *args, **kargs):
-        """
-        Hook for any code that needs to run prior to anything else.
-        Required if you want to do things like set `request.upload_handlers` before
-        the authentication and dispatch handling is run.
-        """
-        pass
-
-    def final(self, request, response, *args, **kargs):
-        """
-        Hook for any code that needs to run after everything else in the view.
-        """
-        # Always add these headers.
-        response.headers['Allow'] = ', '.join(self.allowed_methods)
-        # sample to allow caching using Vary http header
-        response.headers['Vary'] = 'Authenticate, Accept'
-
-        # merge with headers possibly set at some point in the view
-        response.headers.update(self.headers)
-        return self.render(response)
-
-    def add_header(self, field, value):
-        """
-        Add *field* and *value* to the :attr:`headers` attribute of the :class:`View` class.
-        """
-        self.headers[field] = value
-
-    # Note: session based authentication is explicitly CSRF validated,
-    # all other authentication is CSRF exempt.
-    @csrf_exempt
-    def dispatch(self, request, *args, **kwargs):
-        self.request = request
-        self.args = args
-        self.kwargs = kwargs
-        self.headers = {}
-
-        try:
-            self.initial(request, *args, **kwargs)
-
-            # Authenticate and check request has the relevant permissions
-            self._check_permissions()
-
-            # Get the appropriate handler method
-            if self.method.lower() in self.http_method_names:
-                handler = getattr(self, self.method.lower(), self.http_method_not_allowed)
-            else:
-                handler = self.http_method_not_allowed
-
-            response_obj = handler(request, *args, **kwargs)
-
-            # Allow return value to be either HttpResponse, Response, or an object, or None
-            if isinstance(response_obj, HttpResponse):
-                return response_obj
-            elif isinstance(response_obj, Response):
-                response = response_obj
-            elif response_obj is not None:
-                response = Response(status.HTTP_200_OK, response_obj)
-            else:
-                response = Response(status.HTTP_204_NO_CONTENT)
-
-            # Pre-serialize filtering (eg filter complex objects into natively serializable types)
-            response.cleaned_content = self.filter_response(response.raw_content)
-
-        except ErrorResponse, exc:
-            response = exc.response
-
-        return self.final(request, response, *args, **kwargs)
-
-    def options(self, request, *args, **kwargs):
-        response_obj = {
-            'name': self.get_name(),
-            'description': self.get_description(),
-            'renders': self._rendered_media_types,
-            'parses': self._parsed_media_types,
-        }
-        form = self.get_bound_form()
-        if form is not None:
-            field_name_types = {}
-            for name, field in form.fields.iteritems():
-                field_name_types[name] = field.__class__.__name__
-            response_obj['fields'] = field_name_types
-        # Note 'ErrorResponse' is misleading, it's just any response
-        # that should be rendered and returned immediately, without any
-        # response filtering.
-        raise ErrorResponse(status.HTTP_200_OK, response_obj)
-
-
-class ModelView(View):
-    """
-    A RESTful view that maps to a model in the database.
-    """
-    resource = resources.ModelResource
-
-
-class InstanceModelView(ReadModelMixin, UpdateModelMixin, DeleteModelMixin, ModelView):
-    """
-    A view which provides default operations for read/update/delete against a model instance.
-    """
-    _suffix = 'Instance'
-
-
-class ListModelView(ListModelMixin, ModelView):
-    """
-    A view which provides default operations for list, against a model in the database.
-    """
-    _suffix = 'List'
-
-
-class ListOrCreateModelView(ListModelMixin, CreateModelMixin, ModelView):
-    """
-    A view which provides default operations for list and create, against a model in the database.
-    """
-    _suffix = 'List'