diff options
| author |   Jauhien Piatlicki (jauhien) <piatlicki@gmail.com> | 2013-07-17 23:36:12 +0200 |
|---|---|---|
| committer | Jauhien Piatlicki (jauhien) <piatlicki@gmail.com> | 2013-07-17 23:36:12 +0200 |
| commit | e7273fca9aff187166735f202afc6199c9e21fcb (patch) | |
| tree | d1fc1363080bf4dc6c4fcadedbd7a3b7ca2e98af /g_sorcery/fileutils.py | |
| parent | gs_ctan/ctan_db: fetch and load data (diff) | |
| download | g-sorcery-e7273fca9aff187166735f202afc6199c9e21fcb.tar.gz g-sorcery-e7273fca9aff187166735f202afc6199c9e21fcb.tar.bz2 g-sorcery-e7273fca9aff187166735f202afc6199c9e21fcb.zip | |
fileutils and package database: more appropriate function names
Diffstat (limited to 'g_sorcery/fileutils.py')
| -rw-r--r-- | g_sorcery/fileutils.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/g_sorcery/fileutils.py b/g_sorcery/fileutils.py index cdec458..f77da4a 100644 --- a/g_sorcery/fileutils.py +++ b/g_sorcery/fileutils.py @@ -202,17 +202,17 @@ def fast_manifest(directory): f.write('\n'.join(manifest) + '\n') -def _call_loader(f_name, loader, open_file = True, open_mode = 'r'): +def _call_parser(f_name, parser, open_file = True, open_mode = 'r'): data = None if open_file: with open(f_name, open_mode) as f: - data = loader(f) + data = parser(f) else: - data = loader(f_name) + data = parser(f_name) return {os.path.basename(f_name): data} -def load_remote_file(uri, loader, open_file = True, open_mode='r'): +def load_remote_file(uri, parser, open_file = True, open_mode='r'): download_dir = TemporaryDirectory() loaded_data = {} if wget(uri, download_dir.name): @@ -223,7 +223,7 @@ def load_remote_file(uri, loader, open_file = True, open_mode='r'): with tarfile.open(f_name) as f: f.extractall(unpack_dir.name) for uf_name in glob.glob(os.path.join(unpack_dir, "*")): - loaded_data.update(_call_loader(uf_name, loader, + loaded_data.update(_call_parser(uf_name, parser, open_file=open_file, open_mode=open_mode)) del unpack_dir else: @@ -232,7 +232,7 @@ def load_remote_file(uri, loader, open_file = True, open_mode='r'): if (os.system("xz -d " + f_name)): raise DownloadingError("xz failed: " + f_name + " from " + uri) f_name = name - loaded_data.update(_call_loader(f_name, loader, + loaded_data.update(_call_parser(f_name, parser, open_file=open_file, open_mode=open_mode)) del download_dir return loaded_data |