From f24b08316d7a3a710dc165af9e7201c7abb80a62 Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Thu, 13 Jun 2019 13:58:01 -0400 Subject: [PATCH] Django's url resolver and pattern classes have been renamed in 2.0+ They are now URLResolver and URLPattern, respectively. The API has changed as well, but fortunately it looks like what we are doing here doesn't depend on anything that was changed. --- awx/main/tests/unit/conftest.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/awx/main/tests/unit/conftest.py b/awx/main/tests/unit/conftest.py index 729f14ecaf..26b7049477 100644 --- a/awx/main/tests/unit/conftest.py +++ b/awx/main/tests/unit/conftest.py @@ -6,7 +6,7 @@ from unittest.mock import PropertyMock from awx.api.urls import urlpatterns as api_patterns # Django -from django.urls import RegexURLResolver, RegexURLPattern +from django.urls import URLResolver, URLPattern @pytest.fixture(autouse=True) @@ -20,24 +20,24 @@ def all_views(): ''' returns a set of all views in the app ''' - patterns = set([]) - url_views = set([]) + patterns = set() + url_views = set() # Add recursive URL patterns unprocessed = set(api_patterns) while unprocessed: to_process = unprocessed.copy() - unprocessed = set([]) + unprocessed = set() for pattern in to_process: if hasattr(pattern, 'lookup_str') and not pattern.lookup_str.startswith('awx.api'): continue patterns.add(pattern) - if isinstance(pattern, RegexURLResolver): + if isinstance(pattern, URLResolver): for sub_pattern in pattern.url_patterns: if sub_pattern not in patterns: unprocessed.add(sub_pattern) # Get view classes for pattern in patterns: - if isinstance(pattern, RegexURLPattern) and hasattr(pattern.callback, 'view_class'): + if isinstance(pattern, URLPattern) and hasattr(pattern.callback, 'view_class'): url_views.add(pattern.callback.view_class) return url_views