aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Eeo <xe0jun@hotmail.com>2014-12-14 11:46:59 +0800
committerEugene Eeo <xe0jun@hotmail.com>2014-12-14 11:46:59 +0800
commit146d83e31ad219ed1f90ab8f405613965ee9f817 (patch)
tree83d4f8f57cd3eb16254895d13b7d0a66cb2ac7c0
parent765d3ba096741672577c85af5f5455fd17b02b3a (diff)
downloaduritemplates-146d83e31ad219ed1f90ab8f405613965ee9f817.tar.gz
avoid premature optimisations
-rw-r--r--uritemplate/template.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/uritemplate/template.py b/uritemplate/template.py
index ee1fab5..c9d7c7e 100644
--- a/uritemplate/template.py
+++ b/uritemplate/template.py
@@ -23,10 +23,9 @@ template_re = re.compile('{([^\}]+)}')
def _merge(var_dict, overrides):
if var_dict:
- for k, v in var_dict.items():
- if k in overrides:
- continue
- overrides[k] = v
+ opts = var_dict.copy()
+ opts.update(overrides)
+ return opts
return overrides