From f2a5c4b7fc9f899de140ff6faa7e538fdccff677 Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Wed, 11 Aug 2010 07:54:25 +0200 Subject: Remove deprecated portage.digestParseFile --- pym/portage/__init__.py | 2 +- pym/portage/_deprecated.py | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) (limited to 'pym') diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index e7cec02cf..f9c9eb718 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -132,7 +132,7 @@ try: 'suffix_value@endversion,pkgcmp,pkgsplit,vercmp,ververify', 'portage.xpak', 'portage._deprecated:dep_virtual,' + \ - 'digestParseFile,getvirtuals,pkgmerge', + 'getvirtuals,pkgmerge', ) import portage.const diff --git a/pym/portage/_deprecated.py b/pym/portage/_deprecated.py index 7b9abec4e..ea40c2dde 100644 --- a/pym/portage/_deprecated.py +++ b/pym/portage/_deprecated.py @@ -15,26 +15,6 @@ from portage.localization import _ from portage.manifest import Manifest from portage.util import writemsg, writemsg_stdout -def digestParseFile(myfilename, mysettings=None): - """(filename) -- Parses a given file for entries matching: - - Ignores lines that don't start with a valid checksum identifier - and returns a dict with the filenames as keys and {checksumkey:checksum} - as the values. - DEPRECATED: this function is now only a compability wrapper for - portage.manifest.Manifest().""" - - warnings.warn("portage.digestParseFile() is deprecated", - DeprecationWarning, stacklevel=2) - - mysplit = myfilename.split(os.sep) - if mysplit[-2] == "files" and mysplit[-1].startswith("digest-"): - pkgdir = os.sep + os.sep.join(mysplit[:-2]).strip(os.sep) - elif mysplit[-1] == "Manifest": - pkgdir = os.sep + os.sep.join(mysplit[:-1]).strip(os.sep) - - return Manifest(pkgdir, None).getDigests() - def dep_virtual(mysplit, mysettings): "Does virtual dependency conversion" warnings.warn("portage.dep_virtual() is deprecated", -- cgit v1.2.3-1-g7c22