diff options
| author | hut <hut@lavabit.com> | 2010-04-27 01:11:34 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-04-27 01:11:34 +0200 |
| commit | e5112bfe57e7a8176e8d7d3fe27d442d3262cd88 (patch) | |
| tree | b5b07e826d6561580a3f69ebc57655827e4e1fb8 /test/__init__.py | |
| parent | af2c87a88b5fb34cd5d5a385bc79e71643f582e1 (diff) | |
| parent | 2e631f441dc2cc89cbdf8744ee31b98112b2395d (diff) | |
| download | ranger-e5112bfe57e7a8176e8d7d3fe27d442d3262cd88.tar.gz | |
Merge branch 'master' into cp
Conflicts: ranger/ext/shutil_generatorized.py
Diffstat (limited to 'test/__init__.py')
| -rw-r--r-- | test/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/__init__.py b/test/__init__.py index 29796ac1..c2f9bde2 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -28,7 +28,7 @@ class Fake(object): self.__dict__[attrname] = val return val - def __call__(self, *_): + def __call__(self, *_, **__): return Fake() def __clear__(self): |