commit:     02ad4339388127d29074d43c701b85e2fa0d0058
Author:     Virgil Dupras <hsoft <AT> hardcoded <DOT> net>
AuthorDate: Tue Aug 14 15:11:47 2018 +0000
Commit:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Tue Aug 14 15:11:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=02ad4339

Remove gentoolkit.deprecated

It is not referenced anywhere and is likely broken according to
pyflakes's undefined references warnings.

 pym/gentoolkit/deprecated/helpers.py | 184 -----------------------------------
 1 file changed, 184 deletions(-)

diff --git a/pym/gentoolkit/deprecated/helpers.py 
b/pym/gentoolkit/deprecated/helpers.py
deleted file mode 100644
index bb0fb7e..0000000
--- a/pym/gentoolkit/deprecated/helpers.py
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/python2
-#
-# Copyright(c) 2004, Karl Trygve Kalleberg <[email protected]>
-# Copyright(c) 2009, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
-# $Header$
-
-from __future__ import print_function
-
-import warnings
-
-import sys
-if sys.hexversion < 0x3000000:
-       from io import open
-
-import portage
-from portage import _encodings, _unicode_decode, _unicode_encode
-from gentoolkit import *
-from package import *
-from pprinter import warn
-try:
-       from portage.util import unique_array
-except ImportError:
-       from portage_util import unique_array
-
-def find_packages(search_key, masked=False):
-       """Returns a list of Package objects that matched the search key."""
-       warnings.warn("Deprecated. Use helpers2.find_packages.", 
DeprecationWarning)
-       try:
-               if masked:
-                       t = 
portage.db[portage.root]["porttree"].dbapi.xmatch("match-all", search_key)
-                       t += 
portage.db[portage.root]["vartree"].dbapi.match(search_key)
-               else:
-                       t = 
portage.db[portage.root]["porttree"].dbapi.match(search_key)
-                       t += 
portage.db[portage.root]["vartree"].dbapi.match(search_key)
-       # catch the "amgigous package" Exception
-       except ValueError as e:
-               if isinstance(e[0],list):
-                       t = []
-                       for cp in e[0]:
-                               if masked:
-                                       t += 
portage.db[portage.root]["porttree"].dbapi.xmatch("match-all", cp)
-                                       t += 
portage.db[portage.root]["vartree"].dbapi.match(cp)
-                               else:
-                                       t += 
portage.db[portage.root]["porttree"].dbapi.match(cp)
-                                       t += 
portage.db[portage.root]["vartree"].dbapi.match(cp)
-               else:
-                       raise ValueError(e)
-       except portage_exception.InvalidAtom as e:
-               print(warn("Invalid Atom: '%s'" % str(e)))
-               return []
-       # Make the list of packages unique
-       t = unique_array(t)
-       t.sort()
-       return [Package(x) for x in t]
-
-def find_installed_packages(search_key, masked=False):
-       """Returns a list of Package objects that matched the search key."""
-       warnings.warn("Deprecated. Use helpers2.find_installed_packages.",
-               DeprecationWarning)
-       try:
-                       t = 
portage.db[portage.root]["vartree"].dbapi.match(search_key)
-       # catch the "amgigous package" Exception
-       except ValueError as e:
-               if isinstance(e[0],list):
-                       t = []
-                       for cp in e[0]:
-                               t += 
portage.db[portage.root]["vartree"].dbapi.match(cp)
-               else:
-                       raise ValueError(e)
-       except portage_exception.InvalidAtom as e:
-               print(warn("Invalid Atom: '%s'" % str(e)))
-               return []
-       return [Package(x) for x in t]
-
-def find_best_match(search_key):
-       """Returns a Package object for the best available candidate that
-       matched the search key."""
-       warnings.warn("Deprecated. Use helpers2.find_best_match.",
-               DeprecationWarning)
-       t = portage.db[portage.root]["porttree"].dep_bestmatch(search_key)
-       if t:
-               return Package(t)
-       return None
-
-def find_system_packages(prefilter=None):
-       """Returns a tuple of lists, first list is resolved system packages,
-       second is a list of unresolved packages."""
-       pkglist = settings.packages
-       resolved = []
-       unresolved = []
-       for x in pkglist:
-               cpv = x.strip()
-               if len(cpv) and cpv[0] == "*":
-                       pkg = find_best_match(cpv)
-                       if pkg:
-                               resolved.append(pkg)
-                       else:
-                               unresolved.append(cpv)
-       return (resolved, unresolved)
-
-def find_world_packages(prefilter=None):
-       """Returns a tuple of lists, first list is resolved world packages,
-       seond is unresolved package names."""
-       f = open(_unicode_encode(portage.root+portage.WORLD_FILE,
-               encoding=_encodings['fs']), encoding=_encodings['content'])
-       pkglist = f.readlines()
-       resolved = []
-       unresolved = []
-       for x in pkglist:
-               cpv = x.strip()
-               if len(cpv) and cpv[0] != "#":
-                       pkg = find_best_match(cpv)
-                       if pkg:
-                               resolved.append(pkg)
-                       else:
-                               unresolved.append(cpv)
-       return (resolved,unresolved)
-
-def find_all_installed_packages(prefilter=None):
-       """Returns a list of all installed packages, after applying the 
prefilter
-       function"""
-       warnings.warn("Deprecated. Use helpers2.get_installed_cpvs.",
-               DeprecationWarning)
-       t = vartree.dbapi.cpv_all()
-       if prefilter:
-               t = list(filter(prefilter,t))
-       return [Package(x) for x in t]
-
-def find_all_uninstalled_packages(prefilter=None):
-       """Returns a list of all uninstalled packages, after applying the 
prefilter
-       function"""
-       warnings.warn("Deprecated. Use helpers2.get_uninstalled_cpvs.",
-               DeprecationWarning)
-       alist = find_all_packages(prefilter)
-       return [x for x in alist if not x.is_installed()]
-
-def find_all_packages(prefilter=None):
-       """Returns a list of all known packages, installed or not, after 
applying
-       the prefilter function"""
-       warnings.warn("Deprecated. Use helpers2.get_cpvs.", DeprecationWarning)
-       t = porttree.dbapi.cp_all()
-       t += vartree.dbapi.cp_all()
-       if prefilter:
-               t = list(filter(prefilter,t))
-       t = unique_array(t)
-       t2 = []
-       for x in t:
-               t2 += porttree.dbapi.cp_list(x)
-               t2 += vartree.dbapi.cp_list(x)
-       t2 = unique_array(t2)
-       return [Package(x) for x in t2]
-
-def split_package_name(name):
-       """Returns a list on the form [category, name, version, revision]. 
Revision will
-       be 'r0' if none can be inferred. Category and version will be empty, if 
none can
-       be inferred."""
-       warnings.warn("Deprecated. Just use portage.catpkgsplit or apply "
-               "gentoolkit.package.Package to access pkg.category, 
pkg.revision, etc.",
-               DeprecationWarning)
-       r = portage.catpkgsplit(name)
-       if not r:
-               r = name.split("/")
-               if len(r) == 1:
-                       return ["", name, "", "r0"]
-               else:
-                       return r + ["", "r0"]
-       else:
-               r = list(r)
-       if r[0] == 'null':
-               r[0] = ''
-       return r
-
-# XXX: Defunct: use helpers2.compare_package_strings
-#def sort_package_list(pkglist):
-#      """Returns the list ordered in the same way portage would do with 
lowest version
-#      at the head of the list."""
-#      pkglist.sort(Package.compare_version)
-#      return pkglist
-
-if __name__ == "__main__":
-       print("This module is for import only")

Reply via email to