PEP8 clean-up

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,
+from .forms import (
-JSIGNATURE_EMPTY_VALUES)
+    JSignatureField as JSignatureFormField,
+    JSIGNATURE_EMPTY_VALUES)
+
 
 class JSignatureField(models.Field):
     """

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
+            Validates that the input can be red as a JSON object.
-            datetime.date object.
+            Returns a Python list (JSON object unserialized).
             """
             if value in JSIGNATURE_EMPTY_VALUES:
                 return None

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:

jsignature/settings.py

@@ -1,12 +1,19 @@
 from django.conf import settings
 
-JSIGNATURE_WIDTH = getattr(settings, 'JSIGNATURE_WIDTH', 'ratio')
+JSIGNATURE_WIDTH = getattr(
-JSIGNATURE_HEIGHT = getattr(settings, 'JSIGNATURE_HEIGHT', 'ratio')
+    settings, 'JSIGNATURE_WIDTH', 'ratio')
-JSIGNATURE_COLOR = getattr(settings, 'JSIGNATURE_COLOR', '#000')
+JSIGNATURE_HEIGHT = getattr(
-JSIGNATURE_BACKGROUND_COLOR = getattr(settings, 'JSIGNATURE_BACKGROUND_COLOR', '#FFF')
+    settings, 'JSIGNATURE_HEIGHT', 'ratio')
-JSIGNATURE_DECOR_COLOR = getattr(settings, 'JSIGNATURE_DECOR_COLOR', '#DDD')
+JSIGNATURE_COLOR = getattr(
-JSIGNATURE_LINE_WIDTH = getattr(settings, 'JSIGNATURE_LINE_WIDTH', 0)
+    settings, 'JSIGNATURE_COLOR', '#000')
-JSIGNATURE_UNDO_BUTTON =  getattr(settings, 'JSIGNATURE_UNDO_BUTTON', False)
+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,

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))

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)

jsignature/tests/mixins.py

@@ -1,11 +1,8 @@
-import json
+from datetime import date
-import django
-from datetime import datetime, 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]}]
+        new_signature_value = [{"x": [5, 6], "y": [7, 8]}]
-        i = JSignatureTestModel(signature=signature_value, signature_date=date(2013, 1, 1))
+        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

jsignature/tests/models.py

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

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):

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))

jsignature/utils.py

@@ -3,13 +3,12 @@
     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
 
+
 def draw_signature(data, as_file=False):
     """ Draw signature based on lines stored in json_string.
         `data` can be a json object (list in fact) or a 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
-

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'<div id="%s" class="jsign-container"></div>' % jsign_id
         clr = u'<input type="button" value="%s" class="btn">' % _('Reset')
-        js  = u'$("#%s").jSignature(%s);' % (jsign_id, json.dumps(jsignature_config))
+        js = u'$("#%s").jSignature(%s);' % (
-        js += u'$("#%s").jSignature("setData", %s,"native");' % (jsign_id, value)
+            jsign_id, json.dumps(jsignature_config))
+        js += u'$("#%s").jSignature("setData", %s,"native");' % (
+            jsign_id, value)
         js = u'<script type="text/javascript">%s</script>' % js
-        out = u'<div class="jsign-wrapper">%s%s%s%s</div>' % (hidden_input, div, clr, js)
+        out = u'<div class="jsign-wrapper">%s%s%s%s</div>' % (
+            hidden_input, div, clr, js)
 
         return mark_safe(out)