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, 49 deletions

diff --git a/examples/pygments_api/tests.py b/examples/pygments_api/tests.py
deleted file mode 100644
index 24726647..00000000
--- a/examples/pygments_api/tests.py
+++ /dev/null
@@ -1,49 +0,0 @@
-from django.test import TestCase

-from django.utils import simplejson as json

-

-from djangorestframework.compat import RequestFactory

-

-from pygments_api import views

-import tempfile, shutil

-

-

-

-class TestPygmentsExample(TestCase):

-

-    def setUp(self):

-        self.factory = RequestFactory()

-        self.temp_dir = tempfile.mkdtemp()

-        views.HIGHLIGHTED_CODE_DIR = self.temp_dir

-        

-    def tearDown(self):

-        try:

-            shutil.rmtree(self.temp_dir)

-        except Exception:

-            pass

-        

-    def test_get_to_root(self):

-        '''Just do a get on the base url'''

-        request = self.factory.get('/pygments')

-        view = views.PygmentsRoot.as_view()

-        response = view(request)

-        self.assertEqual(response.status_code, 200)

-

-    def test_snippets_datetime_sorted(self):

-        '''Pygments examples should be datetime sorted'''

-        locations = []

-        for snippet in 'abcdefghij': # String length must not exceed views.MAX_FILES, otherwise test fails

-            form_data = {'code': '%s' % snippet, 'style':'friendly', 'lexer':'python'}

-            request = self.factory.post('/pygments', data=form_data)

-            view = views.PygmentsRoot.as_view()

-            response = view(request)

-            locations.append(response.items()[2][1])

-            import time

-            time.sleep(.1)

-        request = self.factory.get('/pygments')

-        view = views.PygmentsRoot.as_view()

-        response = view(request)

-        response_locations = json.loads(response.content)

-        self.assertEquals(locations, response_locations)

-        

-        

-