PEP8 clean-up

This commit is contained in:
Florent Lebreton
2013-11-20 15:52:21 +01:00
parent 7666e781e5
commit 5c7f1d7037
12 changed files with 57 additions and 47 deletions

View File

@@ -1,9 +1,7 @@
import json
import django
from django.test import SimpleTestCase
from django.core.exceptions import ValidationError
from ..widgets import JSignatureWidget
from ..fields import JSignatureField
from ..forms import JSignatureField as JSignatureFormField
@@ -16,7 +14,7 @@ class JSignatureFieldTest(SimpleTestCase):
for val in ['', [], '[]']:
self.assertIsNone(f.to_python(val))
# Correct values
val = [{"x":[1,2], "y":[3,4]}]
val = [{"x": [1, 2], "y": [3, 4]}]
self.assertEquals(val, f.to_python(val))
val_str = '[{"x":[1,2], "y":[3,4]}]'
self.assertEquals(val, f.to_python(val_str))
@@ -30,7 +28,7 @@ class JSignatureFieldTest(SimpleTestCase):
for val in ['', [], '[]']:
self.assertIsNone(f.get_prep_value(val))
# Correct values
val = [{"x":[1,2], "y":[3,4]}]
val = [{"x": [1, 2], "y": [3, 4]}]
val_prep = f.get_prep_value(val)
self.assertIsInstance(val_prep, basestring)
self.assertEquals(val, json.loads(val_prep))
@@ -44,4 +42,5 @@ class JSignatureFieldTest(SimpleTestCase):
def test_formfield(self):
f = JSignatureField()
self.assertTrue(issubclass(f.formfield().__class__, JSignatureFormField))
cls = f.formfield().__class__
self.assertTrue(issubclass(cls, JSignatureFormField))

View File

@@ -1,5 +1,3 @@
import json
import django
from django.test import SimpleTestCase
from django.core.exceptions import ValidationError
@@ -20,7 +18,7 @@ class JSignatureFormFieldTest(SimpleTestCase):
self.assertIsNone(f.to_python(val))
# Correct values
val = '[{"x":[1,2], "y":[3,4]}]'
self.assertEquals([{'x':[1,2], 'y':[3,4]}], f.to_python(val))
self.assertEquals([{'x': [1, 2], 'y': [3, 4]}], f.to_python(val))
# Incorrect values
val = 'foo'
self.assertRaises(ValidationError, f.to_python, val)

View File

@@ -1,11 +1,8 @@
import json
import django
from datetime import datetime, date
from datetime import date
from django.conf import settings
from django.db.models import loading
from django.test import SimpleTestCase
from django.core.management import call_command
from django.core.exceptions import ValidationError
from .models import JSignatureTestModel
@@ -24,7 +21,7 @@ class JSignatureFieldsMixinTest(SimpleTestCase):
def test_save(self):
# If an object is created signed, signature date must be set
signature_value = [{"x":[1,2], "y":[3,4]}]
signature_value = [{"x": [1, 2], "y": [3, 4]}]
i = JSignatureTestModel(signature=signature_value)
i.save()
i = JSignatureTestModel.objects.get(pk=i.pk)
@@ -40,8 +37,9 @@ class JSignatureFieldsMixinTest(SimpleTestCase):
self.assertEqual(date(2013, 1, 1), i.signature_date.date())
# If signature changes, signature date must be updated too
new_signature_value = [{"x":[5,6], "y":[7,8]}]
i = JSignatureTestModel(signature=signature_value, signature_date=date(2013, 1, 1))
new_signature_value = [{"x": [5, 6], "y": [7, 8]}]
i = JSignatureTestModel(signature=signature_value,
signature_date=date(2013, 1, 1))
i.save()
i.signature_date = date(2013, 1, 1)
i.signature = new_signature_value

View File

@@ -1,5 +1,6 @@
""" Provides a dummy model implementing JSignatureFieldsMixin """
from ..mixins import JSignatureFieldsMixin
class JSignatureTestModel(JSignatureFieldsMixin):
pass

View File

@@ -6,9 +6,11 @@ from django.test import SimpleTestCase
from ..utils import draw_signature
DUMMY_VALUE = [{"x":[205,210],"y":[59,63]},{"x":[205,207],"y":[67,64]}]
DUMMY_VALUE = [{"x": [205, 210], "y": [59, 63]},
{"x": [205, 207], "y": [67, 64]}]
DUMMY_STR_VALUE = json.dumps(DUMMY_VALUE)
class UtilsTest(SimpleTestCase):
def test_inputs(self):

View File

@@ -1,5 +1,4 @@
import json
import django
from django.test import SimpleTestCase
from django.core.exceptions import ValidationError
@@ -44,7 +43,7 @@ class JSignatureWidgetTest(SimpleTestCase):
for val in ['', [], '[]']:
self.assertEqual('[]', w.prep_value(val))
# Correct values
val = [{"x":[1,2], "y":[3,4]}]
val = [{"x": [1, 2], "y": [3, 4]}]
val_prep = w.prep_value(val)
self.assertIsInstance(val_prep, basestring)
self.assertEquals(val, json.loads(val_prep))