From 01921f6b3b950fc4f33ceba9082350483cdba8f2 Mon Sep 17 00:00:00 2001 From: Dmitry Selyutin Date: Sat, 2 Sep 2017 20:19:56 +0300 Subject: [PATCH] filesystem: simplify names (it is already clear it's filesystem) --- pygnulib/filesystem.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pygnulib/filesystem.py b/pygnulib/filesystem.py index d6d41bdeaa..0381d67c6a 100644 --- a/pygnulib/filesystem.py +++ b/pygnulib/filesystem.py @@ -11,7 +11,7 @@ from .module import FileModule -class FileSystem: +class Directory: """gnulib generic virtual file system""" _SUBST_ = { "build-aux" : "aux-dir", @@ -23,6 +23,7 @@ class FileSystem: "po" : "po-base", } + def __init__(self, root, config): if not isinstance(root, str): raise TypeError("root must be of 'str' type") @@ -50,7 +51,7 @@ class FileSystem: parts += [part] continue if not replaced: - for old, new in FileSystem._SUBST_.items(): + for old, new in Directory._SUBST_.items(): if part == old: part = self._config_[new] replaced = True @@ -62,7 +63,7 @@ class FileSystem: -class GitFileSystem(FileSystem): +class Git(Directory): """gnulib Git-based virtual file system""" _EXCLUDE_ = { "." : str.startswith, @@ -88,7 +89,7 @@ class GitFileSystem(FileSystem): def module(self, name, full=True): """instantiate gnulib module by its name""" - if name in GitFileSystem._EXCLUDE_: + if name in Git._EXCLUDE_: raise ValueError("illegal module name") path = os.path.join(self["modules"], name) return FileModule(path, name=name) if full else Module(name) @@ -101,7 +102,7 @@ class GitFileSystem(FileSystem): names = [] for name in files: exclude = False - for key, method in GitFileSystem._EXCLUDE_.items(): + for key, method in Git._EXCLUDE_.items(): if method(name, key): exclude = True break -- 2.39.5