summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-05 04:19:07 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-05 04:19:07 +0000
commite11de525528b181242e54ef0a6af6a6670759c6f (patch)
tree8a042f95d840af91e3fe5ad18957db58a1525a19
parent679fdc9faad7db4ed39b826e83b6aed33f03e574 (diff)
downloadportage-e11de525528b181242e54ef0a6af6a6670759c6f.tar.gz
portage-e11de525528b181242e54ef0a6af6a6670759c6f.tar.bz2
portage-e11de525528b181242e54ef0a6af6a6670759c6f.zip
Make the first argument of update() methods be an optional positional argument
instead of a keyword argument. svn path=/main/trunk/; revision=12755
-rw-r--r--pym/portage/cache/mappings.py18
1 files changed, 16 insertions, 2 deletions
diff --git a/pym/portage/cache/mappings.py b/pym/portage/cache/mappings.py
index 1117b855b..77923b462 100644
--- a/pym/portage/cache/mappings.py
+++ b/pym/portage/cache/mappings.py
@@ -111,7 +111,14 @@ class MutableMapping(Mapping):
del self[k]
return (k, v)
- def update(self, other=None, **kwargs):
+ def update(self, *args, **kwargs):
+ if len(args) > 1:
+ raise TypeError(
+ "expected at most 1 positional argument, got " + \
+ repr(len(args)))
+ other = None
+ if args:
+ other = args[0]
if other is None:
pass
elif hasattr(other, 'iteritems'):
@@ -369,7 +376,14 @@ def slot_dict_class(keys, prefix="_val_"):
self[key] = default
return default
- def update(self, other=None, **kwargs):
+ def update(self, *args, **kwargs):
+ if len(args) > 1:
+ raise TypeError(
+ "expected at most 1 positional argument, got " + \
+ repr(len(args)))
+ other = None
+ if args:
+ other = args[0]
if other is None:
pass
elif hasattr(other, 'iteritems'):