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, 34 insertions, 0 deletions

diff --git a/rest_framework/tests/files.py b/rest_framework/tests/files.py
new file mode 100644
index 00000000..61d7f7b1
--- /dev/null
+++ b/rest_framework/tests/files.py
@@ -0,0 +1,34 @@
+# from django.test import TestCase
+# from django import forms
+
+# from django.test.client import RequestFactory
+# from rest_framework.views import View
+# from rest_framework.response import Response
+
+# import StringIO
+
+
+# class UploadFilesTests(TestCase):
+#     """Check uploading of files"""
+#     def setUp(self):
+#         self.factory = RequestFactory()
+
+#     def test_upload_file(self):
+
+#         class FileForm(forms.Form):
+#             file = forms.FileField()
+
+#         class MockView(View):
+#             permissions = ()
+#             form = FileForm
+
+#             def post(self, request, *args, **kwargs):
+#                 return Response({'FILE_NAME': self.CONTENT['file'].name,
+#                         'FILE_CONTENT': self.CONTENT['file'].read()})
+
+#         file = StringIO.StringIO('stuff')
+#         file.name = 'stuff.txt'
+#         request = self.factory.post('/', {'file': file})
+#         view = MockView.as_view()
+#         response = view(request)
+#         self.assertEquals(response.raw_content, {"FILE_CONTENT": "stuff", "FILE_NAME": "stuff.txt"})