Mercurial > gnulib
changeset 19351:cbfd71cbef3d
vfs: use "root" argument instead of "gnulib"
author | Dmitry Selyutin <ghostmansd@gmail.com> |
---|---|
date | Wed, 04 Oct 2017 23:26:22 +0300 |
parents | ad96aea93eb2 |
children | ded47616c5bc |
files | pygnulib/vfs.py |
diffstat | 1 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/pygnulib/vfs.py Wed Oct 04 23:10:29 2017 +0300 +++ b/pygnulib/vfs.py Wed Oct 04 23:26:22 2017 +0300 @@ -162,24 +162,22 @@ -def lookup(name, root, gnulib, local, patch="patch"): +def lookup(name, root, local, patch="patch"): """ Look up a file inside base VFS or local VFS, or combine it using patch. If file is available or can be generated via patching, return a readable stream. Note that this file may not be the original """ - _type_assert_("root", root, str) - _type_assert_("gnulib", gnulib, Base) + _type_assert_("root", root, Base) _type_assert_("local", local, Base) _type_assert_("patch", patch, str) if name in local: return _codecs_.open(local[name], "rb") diff = "{}.diff".format(name) if diff not in local: - return _codecs_.open(gnulib[name], "rb") - + return _codecs_.open(root[name], "rb") tmp = _tempfile_.NamedTemporaryFile(mode="w+b", delete=False) - with _codecs_.open(gnulib[name], "rb") as stream: + with _codecs_.open(root[name], "rb") as stream: _shutil_.copyfileobj(stream, tmp) tmp.close() stdin = _codecs_.open(local[diff], "rb")