aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTom Christie2014-08-19 13:54:52 +0100
committerTom Christie2014-08-19 13:54:52 +0100
commitd2795dd26d7483ea0de119ae135eab0a94cf23d8 (patch)
tree218df2d9c5fc3db3626974b8f7424e80b92641c8 /tests
parent19f31340627c949ca07a9e7b59299734fd991f75 (diff)
downloaddjango-rest-framework-d2795dd26d7483ea0de119ae135eab0a94cf23d8.tar.bz2
Resolve linting issues
Diffstat (limited to 'tests')
-rw-r--r--tests/conftest.py10
-rw-r--r--tests/test_pagination.py8
-rw-r--r--tests/test_serializer.py12
-rw-r--r--tests/test_templatetags.py2
4 files changed, 16 insertions, 16 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index fa5184dd..f3723aea 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -47,8 +47,8 @@ def pytest_configure():
)
try:
- import oauth_provider
- import oauth2
+ import oauth_provider # NOQA
+ import oauth2 # NOQA
except ImportError:
pass
else:
@@ -57,7 +57,7 @@ def pytest_configure():
)
try:
- import provider
+ import provider # NOQA
except ImportError:
pass
else:
@@ -68,13 +68,13 @@ def pytest_configure():
# guardian is optional
try:
- import guardian
+ import guardian # NOQA
except ImportError:
pass
else:
settings.ANONYMOUS_USER_ID = -1
settings.AUTHENTICATION_BACKENDS = (
- 'django.contrib.auth.backends.ModelBackend', # default
+ 'django.contrib.auth.backends.ModelBackend',
'guardian.backends.ObjectPermissionBackend',
)
settings.INSTALLED_APPS += (
diff --git a/tests/test_pagination.py b/tests/test_pagination.py
index d5b9244d..80c33e2e 100644
--- a/tests/test_pagination.py
+++ b/tests/test_pagination.py
@@ -363,11 +363,11 @@ class TestMaxPaginateByParam(TestCase):
self.assertEqual(response.data['results'], self.data[:3])
-### Tests for context in pagination serializers
+# Tests for context in pagination serializers
class CustomField(serializers.Field):
def to_native(self, value):
- if not 'view' in self.context:
+ if 'view' not in self.context:
raise RuntimeError("context isn't getting passed into custom field")
return "value"
@@ -377,7 +377,7 @@ class BasicModelSerializer(serializers.Serializer):
def __init__(self, *args, **kwargs):
super(BasicModelSerializer, self).__init__(*args, **kwargs)
- if not 'view' in self.context:
+ if 'view' not in self.context:
raise RuntimeError("context isn't getting passed into serializer init")
@@ -398,7 +398,7 @@ class TestContextPassedToCustomField(TestCase):
self.assertEqual(response.status_code, status.HTTP_200_OK)
-### Tests for custom pagination serializers
+# Tests for custom pagination serializers
class LinksSerializer(serializers.Serializer):
next = pagination.NextPageField(source='*')
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
index d27bdcf1..90f37cf2 100644
--- a/tests/test_serializer.py
+++ b/tests/test_serializer.py
@@ -415,7 +415,7 @@ class ValidationTests(TestCase):
mistaken for not having a default."""
data = {
'title': 'Some action item',
- #No 'done' value.
+ # No 'done' value.
}
serializer = ActionItemSerializer(self.actionitem, data=data)
self.assertEqual(serializer.is_valid(), True)
@@ -1282,7 +1282,7 @@ class BlankFieldTests(TestCase):
self.fail('Exception raised on save() after validation passes')
-#test for issue #460
+# Test for issue #460
class SerializerPickleTests(TestCase):
"""
Test pickleability of the output of Serializers
@@ -1506,7 +1506,7 @@ class NestedSerializerContextTests(TestCase):
callable = serializers.SerializerMethodField('_callable')
def _callable(self, instance):
- if not 'context_item' in self.context:
+ if 'context_item' not in self.context:
raise RuntimeError("context isn't getting passed into 2nd level nested serializer")
return "success"
@@ -1519,7 +1519,7 @@ class NestedSerializerContextTests(TestCase):
callable = serializers.SerializerMethodField("_callable")
def _callable(self, instance):
- if not 'context_item' in self.context:
+ if 'context_item' not in self.context:
raise RuntimeError("context isn't getting passed into 1st level nested serializer")
return "success"
@@ -1822,7 +1822,7 @@ class MetadataSerializerTestCase(TestCase):
self.assertEqual(expected, metadata)
-### Regression test for #840
+# Regression test for #840
class SimpleModel(models.Model):
text = models.CharField(max_length=100)
@@ -1856,7 +1856,7 @@ class FieldValidationRemovingAttr(TestCase):
self.assertEqual(serializer.object.text, 'foo')
-### Regression test for #878
+# Regression test for #878
class SimpleTargetModel(models.Model):
text = models.CharField(max_length=100)
diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py
index b96bc0ca..75ee0eaa 100644
--- a/tests/test_templatetags.py
+++ b/tests/test_templatetags.py
@@ -11,7 +11,7 @@ class TemplateTagTests(TestCase):
def test_add_query_param_with_non_latin_charactor(self):
# Ensure we don't double-escape non-latin characters
- # that are present in the querystring.
+ # that are present in the querystring.
# See #1314.
request = factory.get("/", {'q': '查询'})
json_url = add_query_param(request, "format", "json")