From 5c7f1d7037dc53550141ab1e1de98b94e98d7118 Mon Sep 17 00:00:00 2001 From: Florent Lebreton Date: Wed, 20 Nov 2013 15:52:21 +0100 Subject: [PATCH] PEP8 clean-up --- jsignature/fields.py | 7 ++++--- jsignature/forms.py | 5 +++-- jsignature/mixins.py | 3 ++- jsignature/settings.py | 35 +++++++++++++++++++++-------------- jsignature/tests/fields.py | 9 ++++----- jsignature/tests/forms.py | 4 +--- jsignature/tests/mixins.py | 12 +++++------- jsignature/tests/models.py | 1 + jsignature/tests/utils.py | 4 +++- jsignature/tests/widgets.py | 3 +-- jsignature/utils.py | 9 ++++----- jsignature/widgets.py | 12 ++++++++---- 12 files changed, 57 insertions(+), 47 deletions(-) diff --git a/jsignature/fields.py b/jsignature/fields.py index af31674..4f1eb0e 100644 --- a/jsignature/fields.py +++ b/jsignature/fields.py @@ -4,10 +4,11 @@ """ import json from django.db import models -from django.core import validators from django.core.exceptions import ValidationError -from .forms import (JSignatureField as JSignatureFormField, -JSIGNATURE_EMPTY_VALUES) +from .forms import ( + JSignatureField as JSignatureFormField, + JSIGNATURE_EMPTY_VALUES) + class JSignatureField(models.Field): """ diff --git a/jsignature/forms.py b/jsignature/forms.py index 644db8a..5b488d2 100644 --- a/jsignature/forms.py +++ b/jsignature/forms.py @@ -10,6 +10,7 @@ from .widgets import JSignatureWidget JSIGNATURE_EMPTY_VALUES = validators.EMPTY_VALUES + ('[]', ) + class JSignatureField(Field): """ A field handling a signature capture field with with jSignature @@ -18,8 +19,8 @@ class JSignatureField(Field): def to_python(self, value): """ - Validates that the input can be red as a JSON object. Returns a Python - datetime.date object. + Validates that the input can be red as a JSON object. + Returns a Python list (JSON object unserialized). """ if value in JSIGNATURE_EMPTY_VALUES: return None diff --git a/jsignature/mixins.py b/jsignature/mixins.py index 7047d82..d8d9b4a 100644 --- a/jsignature/mixins.py +++ b/jsignature/mixins.py @@ -7,6 +7,7 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ from .fields import JSignatureField + class JSignatureFieldsMixin(models.Model): """ Mixin class providing fields to store a signature with jSignature """ signature = JSignatureField( @@ -24,7 +25,7 @@ class JSignatureFieldsMixin(models.Model): def save(self, *args, **kwargs): is_new = self.pk is None - original = not is_new and self.__class__.objects.get(pk=self.pk) or None + original = not is_new and self.__class__.objects.get(pk=self.pk) if self.signature: if is_new or self.signature != original.signature: diff --git a/jsignature/settings.py b/jsignature/settings.py index a7fd226..e9e9983 100644 --- a/jsignature/settings.py +++ b/jsignature/settings.py @@ -1,19 +1,26 @@ from django.conf import settings -JSIGNATURE_WIDTH = getattr(settings, 'JSIGNATURE_WIDTH', 'ratio') -JSIGNATURE_HEIGHT = getattr(settings, 'JSIGNATURE_HEIGHT', 'ratio') -JSIGNATURE_COLOR = getattr(settings, 'JSIGNATURE_COLOR', '#000') -JSIGNATURE_BACKGROUND_COLOR = getattr(settings, 'JSIGNATURE_BACKGROUND_COLOR', '#FFF') -JSIGNATURE_DECOR_COLOR = getattr(settings, 'JSIGNATURE_DECOR_COLOR', '#DDD') -JSIGNATURE_LINE_WIDTH = getattr(settings, 'JSIGNATURE_LINE_WIDTH', 0) -JSIGNATURE_UNDO_BUTTON = getattr(settings, 'JSIGNATURE_UNDO_BUTTON', False) +JSIGNATURE_WIDTH = getattr( + settings, 'JSIGNATURE_WIDTH', 'ratio') +JSIGNATURE_HEIGHT = getattr( + settings, 'JSIGNATURE_HEIGHT', 'ratio') +JSIGNATURE_COLOR = getattr( + settings, 'JSIGNATURE_COLOR', '#000') +JSIGNATURE_BACKGROUND_COLOR = getattr( + settings, 'JSIGNATURE_BACKGROUND_COLOR', '#FFF') +JSIGNATURE_DECOR_COLOR = getattr( + settings, 'JSIGNATURE_DECOR_COLOR', '#DDD') +JSIGNATURE_LINE_WIDTH = getattr( + settings, 'JSIGNATURE_LINE_WIDTH', 0) +JSIGNATURE_UNDO_BUTTON = getattr( + settings, 'JSIGNATURE_UNDO_BUTTON', False) JSIGNATURE_DEFAULT_CONFIG = { - 'width': JSIGNATURE_WIDTH, - 'height': JSIGNATURE_HEIGHT, - 'color': JSIGNATURE_COLOR, - 'background-color': JSIGNATURE_BACKGROUND_COLOR, - 'decor-color': JSIGNATURE_DECOR_COLOR, - 'lineWidth': JSIGNATURE_LINE_WIDTH, - 'UndoButton': JSIGNATURE_UNDO_BUTTON, + 'width': JSIGNATURE_WIDTH, + 'height': JSIGNATURE_HEIGHT, + 'color': JSIGNATURE_COLOR, + 'background-color': JSIGNATURE_BACKGROUND_COLOR, + 'decor-color': JSIGNATURE_DECOR_COLOR, + 'lineWidth': JSIGNATURE_LINE_WIDTH, + 'UndoButton': JSIGNATURE_UNDO_BUTTON, } diff --git a/jsignature/tests/fields.py b/jsignature/tests/fields.py index 3054caa..38ce27d 100644 --- a/jsignature/tests/fields.py +++ b/jsignature/tests/fields.py @@ -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)) diff --git a/jsignature/tests/forms.py b/jsignature/tests/forms.py index 1d0a203..1e01a3a 100644 --- a/jsignature/tests/forms.py +++ b/jsignature/tests/forms.py @@ -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) diff --git a/jsignature/tests/mixins.py b/jsignature/tests/mixins.py index 92a349e..5d52a7a 100644 --- a/jsignature/tests/mixins.py +++ b/jsignature/tests/mixins.py @@ -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 diff --git a/jsignature/tests/models.py b/jsignature/tests/models.py index b40780d..c7b631a 100644 --- a/jsignature/tests/models.py +++ b/jsignature/tests/models.py @@ -1,5 +1,6 @@ """ Provides a dummy model implementing JSignatureFieldsMixin """ from ..mixins import JSignatureFieldsMixin + class JSignatureTestModel(JSignatureFieldsMixin): pass diff --git a/jsignature/tests/utils.py b/jsignature/tests/utils.py index bf3c827..a20bd29 100644 --- a/jsignature/tests/utils.py +++ b/jsignature/tests/utils.py @@ -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): diff --git a/jsignature/tests/widgets.py b/jsignature/tests/widgets.py index b42c148..77b6071 100644 --- a/jsignature/tests/widgets.py +++ b/jsignature/tests/widgets.py @@ -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)) diff --git a/jsignature/utils.py b/jsignature/utils.py index 320df90..1a58182 100644 --- a/jsignature/utils.py +++ b/jsignature/utils.py @@ -3,12 +3,11 @@ https://github.com/zivezab/django-autograph/blob/master/autograph/utils.py """ import json -import cStringIO from itertools import chain -from tempfile import NamedTemporaryFile from PIL import Image, ImageDraw, ImageOps -AA = 5 # super sampling gor antialiasing +AA = 5 # super sampling gor antialiasing + def draw_signature(data, as_file=False): """ Draw signature based on lines stored in json_string. @@ -32,7 +31,8 @@ def draw_signature(data, as_file=False): draw = ImageDraw.Draw(im) for line in drawing: len_line = len(line['x']) - points = [(line['x'][i]*AA, line['y'][i]*AA) for i in range(0, len_line)] + points = [(line['x'][i]*AA, line['y'][i]*AA) + for i in range(0, len_line)] draw.line(points, fill="#000", width=2*AA) im = ImageOps.expand(im) # Smart crop @@ -48,4 +48,3 @@ def draw_signature(data, as_file=False): ret = im return ret - diff --git a/jsignature/widgets.py b/jsignature/widgets.py index 1042a6f..6244e34 100644 --- a/jsignature/widgets.py +++ b/jsignature/widgets.py @@ -12,6 +12,7 @@ from jsignature.settings import JSIGNATURE_DEFAULT_CONFIG JSIGNATURE_EMPTY_VALUES = validators.EMPTY_VALUES + ('[]', ) + class JSignatureWidget(HiddenInput): """ A widget handling a signature capture field with with jSignature @@ -67,9 +68,12 @@ class JSignatureWidget(HiddenInput): hidden_input = super(JSignatureWidget, self).render(name, value, attrs) div = u'
' % jsign_id clr = u'' % _('Reset') - js = u'$("#%s").jSignature(%s);' % (jsign_id, json.dumps(jsignature_config)) - js += u'$("#%s").jSignature("setData", %s,"native");' % (jsign_id, value) - js = u'' % js - out = u'
%s%s%s%s
' % (hidden_input, div, clr, js) + js = u'$("#%s").jSignature(%s);' % ( + jsign_id, json.dumps(jsignature_config)) + js += u'$("#%s").jSignature("setData", %s,"native");' % ( + jsign_id, value) + js = u'' % js + out = u'
%s%s%s%s
' % ( + hidden_input, div, clr, js) return mark_safe(out)