diff --git a/tests/test_models.py b/tests/test_models.py index af9538b..75e42f3 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -4,6 +4,7 @@ from django.contrib.contenttypes.models import ContentType from django.test import TestCase from django.utils.timezone import now + from time_wizard.models import ( AbsolutePeriodModel, HolidayRangePeriodModel, TimeWizardModel, ) diff --git a/tests/test_views.py b/tests/test_views.py index 00883c3..7812be8 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -15,8 +15,7 @@ def test_load_holidays(self): response = load_holidays(request) holiday_cls = getattr(holidays, 'US') holidays_list = holiday_cls(years=now().year, prov='AL') - content = str(response.content) - content = content.replace(''', "'") + content = response.content.decode("utf-8").replace(''', "'") self.assertIn('', content) for date, name in holidays_list.items(): html = '', content) for province in TIME_WIZARD_COUNTRY_PROVINCES['US']: html = ''.format(province) diff --git a/time_wizard/workarounds.py b/time_wizard/workarounds.py index 8d2975e..86d5f5d 100644 --- a/time_wizard/workarounds.py +++ b/time_wizard/workarounds.py @@ -1,6 +1,4 @@ # workarounds.py contains workarounds and monkey-patches for external issues. - - # TODO: Remove on release with bugfix # Problem: problems with polymorphic and on_delete=CASCADE # Issue: https://github.com/django-polymorphic/django-polymorphic/issues/ diff --git a/tox.ini b/tox.ini index a31d118..d5910a2 100644 --- a/tox.ini +++ b/tox.ini @@ -19,9 +19,7 @@ default_section = THIRDPARTY include_trailing_comma = true known_first_party = time_wizard line_length = 79 -lines_after_import = 2 multi_line_output = 5 -not_skip = __init__.py skip = migrations [testenv]