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

Merge pull request #2088 from nmundar/issue-2034 

Issue 2034
This commit is contained in:
Bruno Oliveira 2016-11-27 16:12:31 -02:00 committed by GitHub
parent f25ba4dd0b 2d7197926a
commit 0735d4549d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -104,6 +104,7 @@ Michael Droettboom
Michael Seifert Michael Seifert
Mike Lundy Mike Lundy
Ned Batchelder Ned Batchelder
Neven Mundar
Nicolas Delaby Nicolas Delaby
Oleg Pidsadnyi Oleg Pidsadnyi
Oliver Bestwalter Oliver Bestwalter

8
CHANGELOG.rst
View File

@ -1,11 +1,15 @@
3.0.5.dev0 3.0.5.dev0
========== ==========
* Add hint to error message hinting possible missing __init__.py (`#478`_). Thanks `@DuncanBetts`_. * Add hint to error message hinting possible missing ``__init__.py`` (`#478`_). Thanks `@DuncanBetts`_.
* Provide ``:ref:`` targets for ``recwarn.rst`` so we can use intersphinx referencing. * Provide ``:ref:`` targets for ``recwarn.rst`` so we can use intersphinx referencing.
Thanks to `@dupuy`_ for the report and `@lwm`_ for the PR. Thanks to `@dupuy`_ for the report and `@lwm`_ for the PR.
* Using ``item.Function``, ``item.Module``, etc., is now issuing deprecation warnings, prefer
``pytest.Function``, ``pytest.Module``, etc., instead (`#2034`_).
Thanks `@nmundar`_ for the PR.
* An error message is now displayed if ``--confcutdir`` is not a valid directory, avoiding * An error message is now displayed if ``--confcutdir`` is not a valid directory, avoiding
subtle bugs (`#2078`_). subtle bugs (`#2078`_).
Thanks `@nicoddemus`_ for the PR. Thanks `@nicoddemus`_ for the PR.
@ -27,8 +31,10 @@
.. _@adler-j: https://github.com/adler-j .. _@adler-j: https://github.com/adler-j
.. _@DuncanBetts: https://github.com/DuncanBetts .. _@DuncanBetts: https://github.com/DuncanBetts
.. _@nedbat: https://github.com/nedbat .. _@nedbat: https://github.com/nedbat
.. _@nmundar: https://github.com/nmundar
.. _#478: https://github.com/pytest-dev/pytest/issues/478 .. _#478: https://github.com/pytest-dev/pytest/issues/478
.. _#2034: https://github.com/pytest-dev/pytest/issues/2034
.. _#2038: https://github.com/pytest-dev/pytest/issues/2038 .. _#2038: https://github.com/pytest-dev/pytest/issues/2038
.. _#2078: https://github.com/pytest-dev/pytest/issues/2078 .. _#2078: https://github.com/pytest-dev/pytest/issues/2078
.. _#2082: https://github.com/pytest-dev/pytest/issues/2082 .. _#2082: https://github.com/pytest-dev/pytest/issues/2082

4
_pytest/main.py
View File

@ -190,7 +190,9 @@ class FSHookProxy:
def compatproperty(name): def compatproperty(name):
def fget(self): def fget(self):
# deprecated - use pytest.name import warnings
warnings.warn("This usage is deprecated, please use pytest.{0} instead".format(name),
PendingDeprecationWarning, stacklevel=2)
return getattr(pytest, name) return getattr(pytest, name)
return property(fget) return property(fget)