Skip to content

Commit

Permalink
comment out compatproperty deprecations
Browse files Browse the repository at this point in the history
todo: reenable in the features branch
  • Loading branch information
RonnyPfannschmidt committed Jan 20, 2017
1 parent 9c285df commit 4082f40
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions _pytest/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,11 @@ def __get__(self, obj, owner):
if obj is None:
return self

warnings.warn(
"usage of {owner!r}.{name} is deprecated, please use pytest.{name} instead".format(
name=self.name, owner=type(owner).__name__),
PendingDeprecationWarning, stacklevel=2)
# TODO: reenable in the features branch
# warnings.warn(
# "usage of {owner!r}.{name} is deprecated, please use pytest.{name} instead".format(
# name=self.name, owner=type(owner).__name__),
# PendingDeprecationWarning, stacklevel=2)
return getattr(pytest, self.name)


Expand Down Expand Up @@ -291,10 +292,10 @@ def _getcustomclass(self, name):
return getattr(pytest, name)
else:
cls = getattr(self, name)

warnings.warn("use of node.%s is deprecated, "
"use pytest_pycollect_makeitem(...) to create custom "
"collection nodes" % name, category=DeprecationWarning)
# TODO: reenable in the features branch
# warnings.warn("use of node.%s is deprecated, "
# "use pytest_pycollect_makeitem(...) to create custom "
# "collection nodes" % name, category=DeprecationWarning)
return cls

def __repr__(self):
Expand Down

0 comments on commit 4082f40

Please sign in to comment.