diff --git a/jsignature/widgets.py b/jsignature/widgets.py index bdbf148..dc1d65f 100644 --- a/jsignature/widgets.py +++ b/jsignature/widgets.py @@ -11,7 +11,7 @@ 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 + ('[]', ) diff --git a/setup.py b/setup.py index 07def41..fb16461 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ 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, diff --git a/tests/test_fields.py b/tests/test_fields.py index fb438c3..e36f9de 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -24,13 +24,13 @@ def test_to_python_empty(self): 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 @@ def test_get_prep_value_correct_values_python(self): 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 @@ def test_get_prep_value_correct_values_json(self): 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() diff --git a/tests/test_forms.py b/tests/test_forms.py index 56c9b26..96a1c93 100644 --- a/tests/test_forms.py +++ b/tests/test_forms.py @@ -19,7 +19,7 @@ def test_to_python_empty_values(self): 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() diff --git a/tests/test_widgets.py b/tests/test_widgets.py index a59ed68..8da5be7 100644 --- a/tests/test_widgets.py +++ b/tests/test_widgets.py @@ -25,7 +25,7 @@ def test_default_media(self): 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 @@ def test_media_custom_jquery(self): 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 @@ def test_prep_value_correct_values_python(self): 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 @@ def test_prep_value_correct_values_json(self): 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()