From 08690ab361522480464e3f0912369d70d40655f4 Mon Sep 17 00:00:00 2001 From: Swen Kooij Date: Sat, 15 Jul 2017 14:06:50 +0300 Subject: [PATCH] Fix outstanding PEP8 and Flake8 issues --- localized_fields/fields/field.py | 2 +- tests/test_file_field.py | 13 ++++++------- tests/test_file_field_form.py | 3 +-- tests/test_slug_fields.py | 3 +-- tests/test_value.py | 2 -- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/localized_fields/fields/field.py b/localized_fields/fields/field.py index 804dfcc..9adb446 100644 --- a/localized_fields/fields/field.py +++ b/localized_fields/fields/field.py @@ -207,7 +207,7 @@ class LocalizedField(HStoreField): lang_val = getattr(value, settings.LANGUAGE_CODE) if lang_val is None: - raise IntegrityError('null value in column "%s.%s" violates' \ + raise IntegrityError('null value in column "%s.%s" violates ' 'not-null constraint' % (self.name, lang)) def formfield(self, **kwargs): diff --git a/tests/test_file_field.py b/tests/test_file_field.py index 923ebb8..529564e 100644 --- a/tests/test_file_field.py +++ b/tests/test_file_field.py @@ -72,7 +72,7 @@ class LocalizedFileFieldTestCase(TestCase): @classmethod def test_save_form_data(cls): - """Tests whether the :see:save_form_data function correctly set + """Tests whether the :see:save_form_data function correctly set a valid value.""" instance = cls.FileFieldModel() @@ -87,7 +87,7 @@ class LocalizedFileFieldTestCase(TestCase): instance = cls.FileFieldModel() instance.file = {'en': ContentFile("test", "testfilename")} instance._meta.get_field('file').pre_save(instance, False) - assert instance.file.en._committed == True + assert instance.file.en._committed is True @classmethod def test_file_methods(cls): @@ -135,17 +135,17 @@ class LocalizedFileFieldTestCase(TestCase): @staticmethod def test_get_prep_value(): - """Tests whether the :see:get_prep_value function returns correctly + """Tests whether the :see:get_prep_value function returns correctly value.""" value = LocalizedValue({'en': None}) - assert LocalizedFileField().get_prep_value(None) == None + assert LocalizedFileField().get_prep_value(None) is None assert isinstance(LocalizedFileField().get_prep_value(value), dict) assert LocalizedFileField().get_prep_value(value)['en'] == '' @staticmethod def test_formfield(): - """Tests whether the :see:formfield function correctly returns + """Tests whether the :see:formfield function correctly returns a valid form.""" form_field = LocalizedFileField().formfield() @@ -161,6 +161,5 @@ class LocalizedFileFieldTestCase(TestCase): name, path, args, kwargs = LocalizedFileField().deconstruct() assert 'upload_to' in kwargs assert 'storage' not in kwargs - name, path, \ - args, kwargs = LocalizedFileField(storage='test').deconstruct() + name, path, args, kwargs = LocalizedFileField(storage='test').deconstruct() assert 'storage' in kwargs diff --git a/tests/test_file_field_form.py b/tests/test_file_field_form.py index 3b33ba4..74dcc7c 100644 --- a/tests/test_file_field_form.py +++ b/tests/test_file_field_form.py @@ -28,7 +28,7 @@ class LocalizedFileFieldFormTestCase(TestCase): formfield.clean(['', ''], ['', '']) def test_bound_data(self): - """Tests whether the :see:bound_data function is returns correctly + """Tests whether the :see:bound_data function is returns correctly value""" formfield = LocalizedFileFieldForm() @@ -38,4 +38,3 @@ class LocalizedFileFieldFormTestCase(TestCase): value = [None] * len(settings.LANGUAGES) expected_value = [''] * len(settings.LANGUAGES) assert formfield.bound_data(value, initial) == expected_value - diff --git a/tests/test_slug_fields.py b/tests/test_slug_fields.py index afd45ea..4d2d172 100644 --- a/tests/test_slug_fields.py +++ b/tests/test_slug_fields.py @@ -124,7 +124,7 @@ class LocalizedSlugFieldTestCase(TestCase): def generate_slug(instance): return instance.title - model = get_fake_model({ + get_fake_model({ 'title': LocalizedField(), 'slug': LocalizedUniqueSlugField(populate_from=generate_slug) }) @@ -138,7 +138,6 @@ class LocalizedSlugFieldTestCase(TestCase): for lang_code, lang_name in settings.LANGUAGES: assert obj.slug.get(lang_code) == 'title-%s' % lang_name.lower() - @staticmethod def test_populate_multiple_from_fields(): """Tests whether populating the slug from multiple diff --git a/tests/test_value.py b/tests/test_value.py index 4d0fe61..844bac0 100644 --- a/tests/test_value.py +++ b/tests/test_value.py @@ -149,8 +149,6 @@ class LocalizedValueTestCase(TestCase): __str__'s fallback functionality properly respects the LOCALIZED_FIELDS_FALLBACKS setting.""" - test_value = 'myvalue' - settings.LOCALIZED_FIELDS_FALLBACKS = { 'nl': ['ro'] }