summaryrefslogtreecommitdiffstats
path: root/chromium/tools/json_schema_compiler/memoize.py
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-03-18 13:16:26 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-20 15:55:39 +0100
commit3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch)
tree92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/tools/json_schema_compiler/memoize.py
parente90d7c4b152c56919d963987e2503f9909a666d2 (diff)
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/tools/json_schema_compiler/memoize.py')
-rw-r--r--chromium/tools/json_schema_compiler/memoize.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/chromium/tools/json_schema_compiler/memoize.py b/chromium/tools/json_schema_compiler/memoize.py
index 1402a6ecd80..228e7e3f82d 100644
--- a/chromium/tools/json_schema_compiler/memoize.py
+++ b/chromium/tools/json_schema_compiler/memoize.py
@@ -6,8 +6,9 @@ def memoize(fn):
'''Decorates |fn| to memoize.
'''
memory = {}
- def impl(*args):
- if args not in memory:
- memory[args] = fn(*args)
- return memory[args]
+ def impl(*args, **optargs):
+ full_args = args + tuple(optargs.iteritems())
+ if full_args not in memory:
+ memory[full_args] = fn(*args, **optargs)
+ return memory[full_args]
return impl