From 63d4732e38d93f1cb4980f2d02fd932d86940061 Mon Sep 17 00:00:00 2001 From: "R. van der Vegt" Date: Wed, 27 Jun 2018 11:26:45 +0200 Subject: [PATCH] make django 2.0.6 compatible by adding converters to get_ns_resolver --- arctic/utils.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arctic/utils.py b/arctic/utils.py index 454fe888..6a04b0d4 100755 --- a/arctic/utils.py +++ b/arctic/utils.py @@ -112,6 +112,7 @@ def view_from_url(named_url): # noqa current_path = None resolved_path = [] ns_pattern = '' + ns_converters = {} while path: ns = path.pop() @@ -140,6 +141,10 @@ def view_from_url(named_url): # noqa extra, resolver = resolver.namespace_dict[ns] resolved_path.append(ns) ns_pattern = ns_pattern + extra + try: + ns_converters.update(resolver.pattern.converters) + except Exception: + pass except KeyError as key: if resolved_path: raise NoReverseMatch( @@ -149,7 +154,11 @@ def view_from_url(named_url): # noqa raise NoReverseMatch("%s is not a registered namespace" % key) if ns_pattern: - resolver = get_ns_resolver(ns_pattern, resolver) + try: + resolver = get_ns_resolver(ns_pattern, resolver, + tuple(ns_converters.items())) + except Exception: + resolver = get_ns_resolver(ns_pattern, resolver) # custom code, get view from reverse_dict reverse_dict = resolver.reverse_dict.dict()