python/django-deploy
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Drop Python2 and Django1 support

Browse Source
This commit is contained in:
heinzel
2020-09-25 12:43:40 +02:00
parent 45d8b7cf21
commit 0d7cd64218
12 changed files with 29 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/django_deploy/tests/generic.py
View File

@@ -18,10 +18,7 @@ class DjangoDeployTestCase(unittest.TestCase):
def _import_from_dir(module_name, directory):
sys.path.insert(0, directory)
module = importlib.import_module(module_name)
if sys.version_info.major == 2: # pragma: no cover
reload(module) # pylint: disable=undefined-variable
else: # pragma: no cover
importlib.reload(module) # pylint: disable=no-member
importlib.reload(module)
sys.path.pop(0)
return module
@@ -136,15 +133,9 @@ class DjangoDeployTestCase(unittest.TestCase):
def assert_urlpatterns(self, project_dir, patterns):
root_urlconf = self.get_django_root_urlconf(project_dir)
# Django 2 vs Django 1
if hasattr(root_urlconf, 'path'): # pragma: no cover
expected_urlpatterns = [
('URLPattern', 'admin/', 'django.contrib.admin.site.urls'),
]
else: # pragma: no cover
expected_urlpatterns = [
('URLPattern', '^admin/', 'django.contrib.admin.site.urls'),
]
expected_urlpatterns = [
('URLPattern', 'admin/', 'django.contrib.admin.site.urls'),
]
expected_urlpatterns += patterns
real_urlpatterns = root_urlconf.urlpatterns
@@ -154,19 +145,12 @@ class DjangoDeployTestCase(unittest.TestCase):
real = real_urlpatterns[i]
real_class_name = real.__class__.__name__
self.assertTrue(real_class_name.endswith(expected[0]))
# Django 2 vs. Django 1
if real_class_name == 'URLPattern': # pragma: no cover
if real_class_name == 'URLPattern':
self.assertEqual(expected[1], str(real.pattern))
self.assertTrue(real.callback.startswith("<Mock name='{}' id=".format(expected[2])))
elif real_class_name == 'RegexURLPattern': # pragma: no cover
self.assertEqual(expected[1], real.regex.pattern)
self.assertTrue(real.callback.startswith("<Mock name='{}' id=".format(expected[2])))
elif real_class_name == 'URLResolver': # pragma: no cover
elif real_class_name == 'URLResolver':
self.assertEqual(expected[1], str(real.pattern))
self.assertEqual(expected[2], real.urlconf_name.__name__)
elif real_class_name == 'RegexURLResolver': # pragma: no cover
self.assertEqual(expected[1], real.regex.pattern)
self.assertEqual(expected[2], real.urlconf_name.__name__)
else: # pragma: no cover
self.fail('Unknown urlpattern class: {}'.format(real_class_name))