From 2a8bc90521dde9b239c2c4b09825bfe0a0d3686d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 21 Sep 2009 14:34:13 +0000 Subject: Deprecate key_expand and portage.dbapi.porttree.portagetree.resolve_specific which calls it. svn path=/main/trunk/; revision=14322 --- pym/portage/__init__.py | 3 +++ pym/portage/dbapi/porttree.py | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'pym') diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index c8dff4c5c..e3fee8084 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -8057,6 +8057,9 @@ def cpv_getkey(mycpv): getCPFromCPV = cpv_getkey def key_expand(mykey, mydb=None, use_cache=1, settings=None): + """This is deprecated because it just returns the first match instead of + raising AmbiguousPackageName like cpv_expand does.""" + warnings.warn("portage.key_expand() is deprecated", DeprecationWarning) mysplit=mykey.split("/") if settings is None: settings = globals()["settings"] diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index ea22abd11..98af60d7f 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -35,6 +35,7 @@ from portage import _unicode_encode import codecs import logging import stat +import warnings def _src_uri_validate(cpv, eapi, src_uri): """ @@ -1196,6 +1197,9 @@ class portagetree(object): return "/".join([self.portroot, mysplit[0], psplit[0], mysplit[1]])+".ebuild" def resolve_specific(self, myspec): + warnings.warn( + "portage.dbapi.porttree.portagetree.resolve_specific() is deprecated", + DeprecationWarning) cps = catpkgsplit(myspec) if not cps: return None -- cgit v1.2.3-1-g7c22