summaryrefslogtreecommitdiffstats
path: root/pym/portage
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-12-24 13:12:03 -0800
committerZac Medico <zmedico@gentoo.org>2012-12-24 13:12:03 -0800
commit074becc02bf28e3783d672967cae08aa35116809 (patch)
treeccaa4498c2945b082ecd4f73cb70ce98c6ece729 /pym/portage
parent8d27739e6b395ad36f349752a02f55b58e731204 (diff)
downloadportage-074becc02bf28e3783d672967cae08aa35116809.tar.gz
portage-074becc02bf28e3783d672967cae08aa35116809.tar.bz2
portage-074becc02bf28e3783d672967cae08aa35116809.zip
vardbapi: tweak deprecated constructor param
Diffstat (limited to 'pym/portage')
-rw-r--r--pym/portage/dbapi/vartree.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 344a4f9b4..25128bf32 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -112,7 +112,8 @@ class vardbapi(dbapi):
_aux_cache_keys_re = re.compile(r'^NEEDED\..*$')
_aux_multi_line_re = re.compile(r'^(CONTENTS|NEEDED\..*)$')
- def __init__(self, _unused_param=None, categories=None, settings=None, vartree=None):
+ def __init__(self, _unused_param=DeprecationWarning,
+ categories=None, settings=None, vartree=None):
"""
The categories parameter is unused since the dbapi class
now has a categories property that is generated from the
@@ -142,11 +143,11 @@ class vardbapi(dbapi):
settings = portage.settings
self.settings = settings
- if _unused_param is not None and _unused_param != settings['ROOT']:
+ if _unused_param is not DeprecationWarning:
warnings.warn("The first parameter of the "
"portage.dbapi.vartree.vardbapi"
- " constructor is now unused. Use "
- "settings['ROOT'] instead.",
+ " constructor is now unused. Instead "
+ "settings['ROOT'] is used.",
DeprecationWarning, stacklevel=2)
self._eroot = settings['EROOT']