8000 Override urlconf_module so that Django system checks don't crash. by lddubeau · Pull Request #6719 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

Override urlconf_module so that Django system checks don't crash. #6719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 27, 2019
Merged

Override urlconf_module so that Django system checks don't crash. #6719

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0143b44
Add a test case for #6717.
lddubeau Aug 20, 2019
b1a17b1
Override urlconf_module so that Django system checks don't crash.
lddubeau Aug 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Override urlconf_module so that Django system checks don't crash. 
Without this fix, Django system checks in Django 2.2 will try to resolve the
"app_resolver" module, which does not exist. Overriding ``urlconf_module``
prevents the issue.

Fixes #6717
  • Loading branch information
@lddubeau
lddubeau committed Aug 21, 2019
commit b1a17b199bedb15b69f4154a08f5490f9a64eebb
20 changes: 14 additions & 6 deletions cms/appresolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,28 @@ def applications_page_check(request, current_page=None, path=None):
pass
return None


class AppRegexURLResolver(URLResolver):

def __init__(self, *args, **kwargs):
self.page_id = None
self.url_patterns_dict = {}
super(AppRegexURLResolver, self).__init__(*args, **kwargs)

@property
def urlconf_module(self):
# It is valid for urlconf_module to be a list of patterns. So we just
# return the list here.
#
# See https://github.com/django/django/blob/2.2.4/django/urls/resolvers.py#L578
#
return self.url_patterns_dict.get(get_language(), [])

# On URLResolver the url_patterns property is cached and thus calls made after
# language changes (different return values for get_language()) would not return the
# right value. Overriding here prevents caching.
@property
def url_patterns(self):
language = get_language()
if language in self.url_patterns_dict:
return self.url_patterns_dict[language]
else:
return []
return self.urlconf_module

def resolve_page_id(self, path):
"""Resolves requested path similar way how resolve does, but instead
Expand Down
0