Merge remote-tracking branch 'upstream/master'

1 files changed, 11 insertions, 11 deletions

diff --git a/djangorestframework/tests/modelviews.py b/djangorestframework/tests/modelviews.py
index 3fbc8ab6..031e65c5 100644
--- a/djangorestframework/tests/modelviews.py
+++ b/djangorestframework/tests/modelviews.py
@@ -18,9 +18,9 @@ class UserForm(ModelForm):
 class UserResource(ModelResource):
     model = User
     form = UserForm
-    
+
 class CustomUserResource(ModelResource):
-    model = CustomUser    
+    model = CustomUser
 
 urlpatterns = patterns('',
     url(r'^users/$', ListOrCreateModelView.as_view(resource=UserResource), name='users'),
@@ -34,7 +34,7 @@ urlpatterns = patterns('',
 
 class ModelViewTests(TestModelsTestCase):
     """Test the model views djangorestframework provides"""
-    urls = 'djangorestframework.tests.modelviews'  
+    urls = 'djangorestframework.tests.modelviews'
 
     def test_creation(self):
         """Ensure that a model object can be created"""
@@ -53,18 +53,18 @@ class ModelViewTests(TestModelsTestCase):
         self.assertEqual(0, User.objects.count())
 
         response = self.client.post('/users/', {'username': 'bar', 'password': 'baz', 'groups': [group.id]})
-        
+
         self.assertEqual(response.status_code, 201)
         self.assertEqual(1, User.objects.count())
-       
+
         user = User.objects.all()[0]
         self.assertEqual('bar', user.username)
         self.assertEqual('baz', user.password)
         self.assertEqual(1, user.groups.count())
-        
+
         group = user.groups.all()[0]
         self.assertEqual('foo', group.name)
-        
+
     def test_creation_with_m2m_relation_through(self):
         """
         Ensure that a model object with a m2m relation can be created where that
@@ -75,13 +75,13 @@ class ModelViewTests(TestModelsTestCase):
         self.assertEqual(0, User.objects.count())
 
         response = self.client.post('/customusers/', {'username': 'bar', 'groups': [group.id]})
-        
+
         self.assertEqual(response.status_code, 201)
         self.assertEqual(1, CustomUser.objects.count())
-       
+
         user = CustomUser.objects.all()[0]
         self.assertEqual('bar', user.username)
         self.assertEqual(1, user.groups.count())
-        
+
         group = user.groups.all()[0]
-        self.assertEqual('foo', group.name)        
+        self.assertEqual('foo', group.name)