From 835e9b5d276cd7cf6fdc399a820ef210d805b0bd Mon Sep 17 00:00:00 2001 From: Eugene Eeo Date: Sat, 13 Dec 2014 15:21:21 +0800 Subject: minor refactor of code --- uritemplate/template.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'uritemplate/template.py') diff --git a/uritemplate/template.py b/uritemplate/template.py index 239c1b6..0d45214 100644 --- a/uritemplate/template.py +++ b/uritemplate/template.py @@ -121,10 +121,9 @@ class URITemplate(object): ``val2`` will be used instead of ``val1``. """ - var_dict = var_dict or {} - var_dict.update(kwargs) + kwargs.update(var_dict or {}) - return self._expand(var_dict, False) + return self._expand(kwargs, False) def partial(self, var_dict=None, **kwargs): """Partially expand the template with the given parameters. @@ -142,7 +141,6 @@ class URITemplate(object): t.partial() # => URITemplate('https://api.github.com{/end}') """ - var_dict = var_dict or {} - var_dict.update(kwargs) + kwargs.update(var_dict or {}) - return URITemplate(self._expand(var_dict, True)) + return URITemplate(self._expand(kwargs, True)) -- cgit v1.2.3