From d22480684878f707b0193943d8ed8e441729cbea Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Fri, 7 Apr 2017 14:07:44 +0200 Subject: Fixed deprecation warnings in python 3.6.1 --- uritemplate/template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'uritemplate/template.py') diff --git a/uritemplate/template.py b/uritemplate/template.py index c9d7c7e..ceca8eb 100644 --- a/uritemplate/template.py +++ b/uritemplate/template.py @@ -18,7 +18,7 @@ What do you do? import re from uritemplate.variable import URIVariable -template_re = re.compile('{([^\}]+)}') +template_re = re.compile('{([^}]+)}') def _merge(var_dict, overrides): -- cgit v1.2.3 From 12c9fdf6cc413d2b227302181d20456361d94e3b Mon Sep 17 00:00:00 2001 From: Lee Skillen Date: Wed, 31 Jan 2018 16:21:43 +0000 Subject: Make variable ordering deterministic --- uritemplate/template.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'uritemplate/template.py') diff --git a/uritemplate/template.py b/uritemplate/template.py index ceca8eb..0df0da6 100644 --- a/uritemplate/template.py +++ b/uritemplate/template.py @@ -16,6 +16,7 @@ What do you do? """ import re +from uritemplate.orderedset import OrderedSet from uritemplate.variable import URIVariable template_re = re.compile('{([^}]+)}') @@ -71,9 +72,10 @@ class URITemplate(object): URIVariable(m.groups()[0]) for m in template_re.finditer(self.uri) ] #: A set of variable names in the URI. - self.variable_names = set() + self.variable_names = OrderedSet() for variable in self.variables: - self.variable_names.update(variable.variable_names) + for name in variable.variable_names: + self.variable_names.add(name) def __repr__(self): return 'URITemplate("%s")' % self -- cgit v1.2.3