From 58cc8c29d34ce3d997bca7cbd656db2f9db4e74c Mon Sep 17 00:00:00 2001 From: hpk Date: Thu, 9 Apr 2009 22:34:28 +0200 Subject: [PATCH] [svn r63914] py.log._apiwarn is fine enough because it's something of an py lib internal api deprecation mechanism atm. --HG-- branch : trunk --- py/__init__.py | 6 +++--- py/execnet/register.py | 2 +- py/log/testing/test_warning.py | 2 +- py/log/warning.py | 2 +- py/path/common.py | 2 +- py/test/collect.py | 6 +++--- py/test/config.py | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/py/__init__.py b/py/__init__.py index ecbdbdf51..79cd222d7 100644 --- a/py/__init__.py +++ b/py/__init__.py @@ -25,8 +25,8 @@ version = "1.0.0b1" initpkg(__name__, description = "pylib and py.test: agile development and test support library", - revision = int('$LastChangedRevision: 63913 $'.split(':')[1][:-1]), - lastchangedate = '$LastChangedDate: 2009-04-09 22:32:04 +0200 (Thu, 09 Apr 2009) $', + revision = int('$LastChangedRevision: 63914 $'.split(':')[1][:-1]), + lastchangedate = '$LastChangedDate: 2009-04-09 22:34:28 +0200 (Thu, 09 Apr 2009) $', version = version, url = "http://pylib.org", download_url = "http://codespeak.net/py/%s/download.html" % version, @@ -179,7 +179,7 @@ initpkg(__name__, # logging API ('producers' and 'consumers' connected via keywords) 'log.__doc__' : ('./log/__init__.py', '__doc__'), - 'log.APIWARN' : ('./log/warning.py', 'APIWARN'), + 'log._apiwarn' : ('./log/warning.py', '_apiwarn'), 'log.Producer' : ('./log/producer.py', 'Producer'), 'log.default' : ('./log/producer.py', 'default'), 'log._getstate' : ('./log/producer.py', '_getstate'), diff --git a/py/execnet/register.py b/py/execnet/register.py index 0bfa0749e..5f4ef56b5 100644 --- a/py/execnet/register.py +++ b/py/execnet/register.py @@ -164,7 +164,7 @@ class SshGateway(PopenCmdGateway): cmdline[i] = "'" + cmdline[i].replace("'", "'\\''") + "'" cmd = 'ssh -C' if identity is not None: - py.log.APIWARN("1.0", "pass in 'ssh_config' file instead of identity") + py.log._apiwarn("1.0", "pass in 'ssh_config' file instead of identity") cmd += ' -i %s' % (identity,) if ssh_config is not None: cmd += ' -F %s' % (ssh_config) diff --git a/py/log/testing/test_warning.py b/py/log/testing/test_warning.py index b89ffd675..e3377663f 100644 --- a/py/log/testing/test_warning.py +++ b/py/log/testing/test_warning.py @@ -45,4 +45,4 @@ class TestWarningPlugin: assert warning.msg == "xxx (since version 3.0)" def test_default(): - assert py._com.comregistry.isregistered(py.log.APIWARN.im_self) + assert py._com.comregistry.isregistered(py.log._apiwarn.im_self) diff --git a/py/log/warning.py b/py/log/warning.py index 0431a54bf..ab9568c42 100644 --- a/py/log/warning.py +++ b/py/log/warning.py @@ -66,4 +66,4 @@ class WarningPlugin(object): # singleton api warner for py lib apiwarner = WarningPlugin(py._com.comregistry) -APIWARN = apiwarner.apiwarn +_apiwarn = apiwarner.apiwarn diff --git a/py/path/common.py b/py/path/common.py index ca7078930..ec5d45386 100644 --- a/py/path/common.py +++ b/py/path/common.py @@ -21,7 +21,7 @@ class checker: kwargs-specified specification. """ def __init__(self, **kwargs): - py.log.APIWARN("0.9.0", + py.log._apiwarn("0.9.0", "py.path.checker is deprecated, construct " "calls to pathobj.check() instead", ) diff --git a/py/test/collect.py b/py/test/collect.py index f4f0b71f4..8e92422c2 100644 --- a/py/test/collect.py +++ b/py/test/collect.py @@ -441,7 +441,7 @@ class Directory(FSCollector): def consider_dir(self, path, usefilters=None): if usefilters is not None: - py.log.APIWARN("0.99", "usefilters argument not needed") + py.log._apiwarn("0.99", "usefilters argument not needed") res = self.config.api.pytest_collect_recurse(path=path, parent=self) if res is None or res: return self.config.api.pytest_collect_directory( @@ -478,13 +478,13 @@ class Item(Node): """ execute this test item.""" def warnoldcollect(): - py.log.APIWARN("1.0", + py.log._apiwarn("1.0", "implement collector.collect() instead of " "collector.run() and collector.join()", stacklevel=2) def warnoldtestrun(): - py.log.APIWARN("1.0", + py.log._apiwarn("1.0", "implement item.runtest() instead of " "item.run() and item.execute()", stacklevel=2) diff --git a/py/test/config.py b/py/test/config.py index a29569ba8..ef59ef44b 100644 --- a/py/test/config.py +++ b/py/test/config.py @@ -180,7 +180,7 @@ class Config(object): """ add a named group of options to the current testing session. This function gets invoked during testing session initialization. """ - py.log.APIWARN("1.0", "define plugins to add options", stacklevel=2) + py.log._apiwarn("1.0", "define plugins to add options", stacklevel=2) group = self._parser.addgroup(groupname) for opt in specs: group._addoption_instance(opt)