Maxi/django-jsignature
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Remove depreciations

Browse Source
This commit is contained in:
Sebastien Corbin
2022-01-17 13:53:52 +01:00
committed by Sébastien Corbin
parent 382c824cca
commit cf9a37a009
7 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsignature/mixins.py
View File

@@ -5,7 +5,7 @@
import json
from datetime import datetime
from django.db import models
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from .fields import JSignatureField

2
jsignature/widgets.py
View File

@@ -11,7 +11,7 @@ from django.core import validators
from django.core.exceptions import ValidationError
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from jsignature.settings import JSIGNATURE_DEFAULT_CONFIG
JSIGNATURE_EMPTY_VALUES = validators.EMPTY_VALUES + ('[]', )

2
setup.py
View File

@@ -14,7 +14,7 @@ setup(
long_description=open(os.path.join(here, 'README.rst')).read() + '\n\n' +
open(os.path.join(here, 'CHANGES')).read(),
license='LPGL, see LICENSE file.',
install_requires=['Django>=1.11', 'pillow'],
install_requires=['Django>=1.11', 'pillow', 'pyquery>=1.4.2'],
packages=find_packages(exclude=['example_project*', 'tests']),
include_package_data=True,
zip_safe=False,

2
tests/settings.py
View File

@@ -2,6 +2,8 @@ import os
DEBUG = True
USE_TZ = True
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
SECRET_KEY = 'thisisntactuallysecretatall'

8
tests/test_fields.py
View File

@@ -24,13 +24,13 @@ class JSignatureFieldTest(SimpleTestCase):
def test_to_python_correct_value_python(self):
f = JSignatureField()
val = [{"x": [1, 2], "y": [3, 4]}]
self.assertEquals(val, f.to_python(val))
self.assertEqual(val, f.to_python(val))
def test_to_python_correct_value_json(self):
f = JSignatureField()
val = [{"x": [1, 2], "y": [3, 4]}]
val_str = '[{"x":[1,2], "y":[3,4]}]'
self.assertEquals(val, f.to_python(val_str))
self.assertEqual(val, f.to_python(val_str))
def test_to_python_incorrect_value(self):
f = JSignatureField()
@@ -47,7 +47,7 @@ class JSignatureFieldTest(SimpleTestCase):
val = [{"x": [1, 2], "y": [3, 4]}]
val_prep = f.get_prep_value(val)
self.assertIsInstance(val_prep, string_types)
self.assertEquals(val, json.loads(val_prep))
self.assertEqual(val, json.loads(val_prep))
def test_get_prep_value_correct_values_json(self):
f = JSignatureField()
@@ -55,7 +55,7 @@ class JSignatureFieldTest(SimpleTestCase):
val_str = '[{"x":[1,2], "y":[3,4]}]'
val_prep = f.get_prep_value(val_str)
self.assertIsInstance(val_prep, string_types)
self.assertEquals(val, json.loads(val_prep))
self.assertEqual(val, json.loads(val_prep))
def test_get_prep_value_incorrect_values(self):
f = JSignatureField()

2
tests/test_forms.py
View File

@@ -19,7 +19,7 @@ class JSignatureFormFieldTest(SimpleTestCase):
def test_to_python_correct_values(self):
f = JSignatureField()
val = '[{"x":[1,2], "y":[3,4]}]'
self.assertEquals([{'x': [1, 2], 'y': [3, 4]}], f.to_python(val))
self.assertEqual([{'x': [1, 2], 'y': [3, 4]}], f.to_python(val))
def test_to_python_incorrect_values(self):
f = JSignatureField()

10
tests/test_widgets.py
View File

@@ -25,7 +25,7 @@ class JSignatureWidgetTest(SimpleTestCase):
self.assertIn('jSignature.min.js', media_js_str)
self.assertIn('django_jsignature.js', media_js_str)
media_css = list(media.render_css())
self.assertEquals([], media_css)
self.assertEqual([], media_css)
@override_settings(JSIGNATURE_JQUERY='admin')
def test_media_in_admin(self):
@@ -43,10 +43,10 @@ class JSignatureWidgetTest(SimpleTestCase):
def test_init(self):
w = JSignatureWidget()
self.assertEquals({}, w.jsignature_attrs)
self.assertEqual({}, w.jsignature_attrs)
given_attrs = {'width': 300, 'height': 100}
w = JSignatureWidget(jsignature_attrs=given_attrs)
self.assertEquals(given_attrs, w.jsignature_attrs)
self.assertEqual(given_attrs, w.jsignature_attrs)
def test_build_jsignature_id(self):
w = JSignatureWidget()
@@ -69,7 +69,7 @@ class JSignatureWidgetTest(SimpleTestCase):
val = [{"x": [1, 2], "y": [3, 4]}]
val_prep = w.prep_value(val)
self.assertIsInstance(val_prep, string_types)
self.assertEquals(val, json.loads(val_prep))
self.assertEqual(val, json.loads(val_prep))
def test_prep_value_correct_values_json(self):
w = JSignatureWidget()
@@ -77,7 +77,7 @@ class JSignatureWidgetTest(SimpleTestCase):
val_str = '[{"x":[1,2], "y":[3,4]}]'
val_prep = w.prep_value(val_str)
self.assertIsInstance(val_prep, string_types)
self.assertEquals(val, json.loads(val_prep))
self.assertEqual(val, json.loads(val_prep))
def test_prep_value_incorrect_values(self):
w = JSignatureWidget()