From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9EA9F138200 for ; Wed, 17 Jul 2013 23:20:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1186FE0932; Wed, 17 Jul 2013 23:20:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 81448E0932 for ; Wed, 17 Jul 2013 23:20:01 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52DD233E711 for ; Wed, 17 Jul 2013 23:20:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9AF75E468F for ; Wed, 17 Jul 2013 23:19:58 +0000 (UTC) From: "Jauhien Piatlicki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jauhien Piatlicki" Message-ID: <1374096972.e7273fca9aff187166735f202afc6199c9e21fcb.jauhien@gentoo> Subject: [gentoo-commits] proj/g-sorcery:master commit in: g_sorcery/, gs_ctan/, g_elpa/ X-VCS-Repository: proj/g-sorcery X-VCS-Files: g_elpa/elpa_db.py g_sorcery/fileutils.py g_sorcery/package_db.py gs_ctan/ctan_db.py X-VCS-Directories: g_sorcery/ gs_ctan/ g_elpa/ X-VCS-Committer: jauhien X-VCS-Committer-Name: Jauhien Piatlicki X-VCS-Revision: e7273fca9aff187166735f202afc6199c9e21fcb X-VCS-Branch: master Date: Wed, 17 Jul 2013 23:19:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ad4acf01-1057-4da6-8b0c-5a47d7f16189 X-Archives-Hash: 24723ca2bb9b9d450330686eba5f9e1d commit: e7273fca9aff187166735f202afc6199c9e21fcb Author: Jauhien Piatlicki (jauhien) gmail com> AuthorDate: Wed Jul 17 21:36:12 2013 +0000 Commit: Jauhien Piatlicki gmail com> CommitDate: Wed Jul 17 21:36:12 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=e7273fca fileutils and package database: more appropriate function names --- g_elpa/elpa_db.py | 4 ++-- g_sorcery/fileutils.py | 12 ++++++------ g_sorcery/package_db.py | 12 ++++++------ gs_ctan/ctan_db.py | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/g_elpa/elpa_db.py b/g_elpa/elpa_db.py index 6f3931c..149cbe5 100644 --- a/g_elpa/elpa_db.py +++ b/g_elpa/elpa_db.py @@ -33,9 +33,9 @@ class ElpaDB(PackageDB): def get_download_uries(self): ac_uri = urljoin(self.repo_uri, 'archive-contents') - return [{"uri" : ac_uri, "loader" : sexpdata.load}] + return [{"uri" : ac_uri, "parser" : sexpdata.load}] - def parse_data(self, data): + def process_data(self, data): archive_contents = data['archive-contents'] 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 diff --git a/g_sorcery/package_db.py b/g_sorcery/package_db.py index 2d8ee42..1f12015 100644 --- a/g_sorcery/package_db.py +++ b/g_sorcery/package_db.py @@ -177,12 +177,12 @@ class PackageDB(object): Generate tree """ data = self.download_data() - self.parse_data(data) + self.process_data(data) - def load_data(self, data_f): + def parse_data(self, data_f): pass - def parse_data(data): + def process_data(data): pass def get_download_uries(self): @@ -194,13 +194,13 @@ class PackageDB(object): decuri = {} if isinstance(uri, basestring): decuri["uri"] = uri - decuri["loader"] = self.load_data + decuri["parser"] = self.parse_data decuri["open_file"] = True decuri["open_mode"] = "r" else: decuri = uri - if not "loader" in decuri: - decuri["loader"] = self.load_data + if not "parser" in decuri: + decuri["parser"] = self.parse_data if not "open_file" in decuri: decuri["open_file"] = True if not "open_mode" in decuri: diff --git a/gs_ctan/ctan_db.py b/gs_ctan/ctan_db.py index f055823..65ff4ba 100644 --- a/gs_ctan/ctan_db.py +++ b/gs_ctan/ctan_db.py @@ -27,9 +27,9 @@ class CtanDB(PackageDB): tlpdb_uri = self.repo_uri + "/tlpkg/texlive.tlpdb.xz" return [tlpdb_uri] - def load_data(self, data_f): + def parse_data(self, data_f): data = data_f.read() return data - def parse_data(self, data): + def process_data(self, data): print(data)