jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

comment out compatproperty deprecations 

todo: reenable in the features branch
This commit is contained in:
Ronny Pfannschmidt 2017-01-20 11:25:48 +01:00
parent 9c285dfc1d
commit 4082f4024a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
_pytest/main.py
View File

@ -200,10 +200,11 @@ class _CompatProperty(object):
if obj is None: if obj is None:
return self return self
warnings.warn( # TODO: reenable in the features branch
"usage of {owner!r}.{name} is deprecated, please use pytest.{name} instead".format( # warnings.warn(
name=self.name, owner=type(owner).__name__), # "usage of {owner!r}.{name} is deprecated, please use pytest.{name} instead".format(
PendingDeprecationWarning, stacklevel=2) # name=self.name, owner=type(owner).__name__),
# PendingDeprecationWarning, stacklevel=2)
return getattr(pytest, self.name) return getattr(pytest, self.name)
@ -291,10 +292,10 @@ class Node(object):
return getattr(pytest, name) return getattr(pytest, name)
else: else:
cls = getattr(self, name) cls = getattr(self, name)
# TODO: reenable in the features branch
warnings.warn("use of node.%s is deprecated, " # warnings.warn("use of node.%s is deprecated, "
"use pytest_pycollect_makeitem(...) to create custom " # "use pytest_pycollect_makeitem(...) to create custom "
"collection nodes" % name, category=DeprecationWarning) # "collection nodes" % name, category=DeprecationWarning)
return cls return cls
def __repr__(self): def __repr__(self):