Restoring authorship annotation for <deshevoy@yandex-team.ru>. Commit 2 of 2.

1 files changed, 174 insertions, 174 deletions

diff --git a/contrib/python/pytest/py2/_pytest/warnings.py b/contrib/python/pytest/py2/_pytest/warnings.py
index 4e93441205a..a3debae462f 100644
--- a/contrib/python/pytest/py2/_pytest/warnings.py
+++ b/contrib/python/pytest/py2/_pytest/warnings.py
@@ -1,180 +1,180 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import 
-from __future__ import division 
-from __future__ import print_function 
- 
-import sys 
-import warnings 
-from contextlib import contextmanager 
- 
-import pytest 
-from _pytest import compat 
- 
-SHOW_PYTEST_WARNINGS_ARG = "-Walways::pytest.RemovedInPytest4Warning" 
- 
- 
-def _setoption(wmod, arg): 
-    """ 
-    Copy of the warning._setoption function but does not escape arguments. 
-    """ 
-    parts = arg.split(":") 
-    if len(parts) > 5: 
-        raise wmod._OptionError("too many fields (max 5): %r" % (arg,)) 
-    while len(parts) < 5: 
-        parts.append("") 
-    action, message, category, module, lineno = [s.strip() for s in parts] 
-    action = wmod._getaction(action) 
-    category = wmod._getcategory(category) 
-    if lineno: 
-        try: 
-            lineno = int(lineno) 
-            if lineno < 0: 
-                raise ValueError 
-        except (ValueError, OverflowError): 
-            raise wmod._OptionError("invalid lineno %r" % (lineno,)) 
-    else: 
-        lineno = 0 
-    wmod.filterwarnings(action, message, category, module, lineno) 
- 
- 
-def pytest_addoption(parser): 
-    group = parser.getgroup("pytest-warnings") 
-    group.addoption( 
-        "-W", 
-        "--pythonwarnings", 
-        action="append", 
-        help="set which warnings to report, see -W option of python itself.", 
-    ) 
-    parser.addini( 
-        "filterwarnings", 
-        type="linelist", 
-        help="Each line specifies a pattern for " 
-        "warnings.filterwarnings. " 
-        "Processed after -W and --pythonwarnings.", 
-    ) 
- 
- 
-def pytest_configure(config): 
-    config.addinivalue_line( 
-        "markers", 
-        "filterwarnings(warning): add a warning filter to the given test. " 
-        "see https://docs.pytest.org/en/latest/warnings.html#pytest-mark-filterwarnings ", 
-    ) 
- 
- 
-@contextmanager 
-def catch_warnings_for_item(config, ihook, when, item): 
-    """ 
-    Context manager that catches warnings generated in the contained execution block. 
- 
-    ``item`` can be None if we are not in the context of an item execution. 
- 
-    Each warning captured triggers the ``pytest_warning_captured`` hook. 
-    """ 
-    cmdline_filters = config.getoption("pythonwarnings") or [] 
-    inifilters = config.getini("filterwarnings") 
-    with warnings.catch_warnings(record=True) as log: 
- 
-        if not sys.warnoptions: 
-            # if user is not explicitly configuring warning filters, show deprecation warnings by default (#2908) 
-            warnings.filterwarnings("always", category=DeprecationWarning) 
-            warnings.filterwarnings("always", category=PendingDeprecationWarning) 
- 
-        warnings.filterwarnings("error", category=pytest.RemovedInPytest4Warning) 
- 
-        # filters should have this precedence: mark, cmdline options, ini 
-        # filters should be applied in the inverse order of precedence 
-        for arg in inifilters: 
-            _setoption(warnings, arg) 
- 
-        for arg in cmdline_filters: 
-            warnings._setoption(arg) 
- 
-        if item is not None: 
-            for mark in item.iter_markers(name="filterwarnings"): 
-                for arg in mark.args: 
-                    _setoption(warnings, arg) 
- 
-        yield 
- 
-        for warning_message in log: 
-            ihook.pytest_warning_captured.call_historic( 
-                kwargs=dict(warning_message=warning_message, when=when, item=item) 
-            ) 
- 
- 
-def warning_record_to_str(warning_message): 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import sys
+import warnings
+from contextlib import contextmanager
+
+import pytest
+from _pytest import compat
+
+SHOW_PYTEST_WARNINGS_ARG = "-Walways::pytest.RemovedInPytest4Warning"
+
+
+def _setoption(wmod, arg):
+    """
+    Copy of the warning._setoption function but does not escape arguments.
+    """
+    parts = arg.split(":")
+    if len(parts) > 5:
+        raise wmod._OptionError("too many fields (max 5): %r" % (arg,))
+    while len(parts) < 5:
+        parts.append("")
+    action, message, category, module, lineno = [s.strip() for s in parts]
+    action = wmod._getaction(action)
+    category = wmod._getcategory(category)
+    if lineno:
+        try:
+            lineno = int(lineno)
+            if lineno < 0:
+                raise ValueError
+        except (ValueError, OverflowError):
+            raise wmod._OptionError("invalid lineno %r" % (lineno,))
+    else:
+        lineno = 0
+    wmod.filterwarnings(action, message, category, module, lineno)
+
+
+def pytest_addoption(parser):
+    group = parser.getgroup("pytest-warnings")
+    group.addoption(
+        "-W",
+        "--pythonwarnings",
+        action="append",
+        help="set which warnings to report, see -W option of python itself.",
+    )
+    parser.addini(
+        "filterwarnings",
+        type="linelist",
+        help="Each line specifies a pattern for "
+        "warnings.filterwarnings. "
+        "Processed after -W and --pythonwarnings.",
+    )
+
+
+def pytest_configure(config):
+    config.addinivalue_line(
+        "markers",
+        "filterwarnings(warning): add a warning filter to the given test. "
+        "see https://docs.pytest.org/en/latest/warnings.html#pytest-mark-filterwarnings ",
+    )
+
+
+@contextmanager
+def catch_warnings_for_item(config, ihook, when, item):
+    """
+    Context manager that catches warnings generated in the contained execution block.
+
+    ``item`` can be None if we are not in the context of an item execution.
+
+    Each warning captured triggers the ``pytest_warning_captured`` hook.
+    """
+    cmdline_filters = config.getoption("pythonwarnings") or []
+    inifilters = config.getini("filterwarnings")
+    with warnings.catch_warnings(record=True) as log:
+
+        if not sys.warnoptions:
+            # if user is not explicitly configuring warning filters, show deprecation warnings by default (#2908)
+            warnings.filterwarnings("always", category=DeprecationWarning)
+            warnings.filterwarnings("always", category=PendingDeprecationWarning)
+
+        warnings.filterwarnings("error", category=pytest.RemovedInPytest4Warning)
+
+        # filters should have this precedence: mark, cmdline options, ini
+        # filters should be applied in the inverse order of precedence
+        for arg in inifilters:
+            _setoption(warnings, arg)
+
+        for arg in cmdline_filters:
+            warnings._setoption(arg)
+
+        if item is not None:
+            for mark in item.iter_markers(name="filterwarnings"):
+                for arg in mark.args:
+                    _setoption(warnings, arg)
+
+        yield
+
+        for warning_message in log:
+            ihook.pytest_warning_captured.call_historic(
+                kwargs=dict(warning_message=warning_message, when=when, item=item)
+            )
+
+
+def warning_record_to_str(warning_message):
     """Convert a warnings.WarningMessage to a string.
- 
+
     This takes lot of unicode shenaningans into account for Python 2.
-    When Python 2 support is dropped this function can be greatly simplified. 
-    """ 
-    warn_msg = warning_message.message 
-    unicode_warning = False 
-    if compat._PY2 and any(isinstance(m, compat.UNICODE_TYPES) for m in warn_msg.args): 
-        new_args = [] 
-        for m in warn_msg.args: 
-            new_args.append( 
-                compat.ascii_escaped(m) if isinstance(m, compat.UNICODE_TYPES) else m 
-            ) 
-        unicode_warning = list(warn_msg.args) != new_args 
-        warn_msg.args = new_args 
- 
-    msg = warnings.formatwarning( 
-        warn_msg, 
-        warning_message.category, 
-        warning_message.filename, 
-        warning_message.lineno, 
-        warning_message.line, 
-    ) 
-    if unicode_warning: 
-        warnings.warn( 
-            "Warning is using unicode non convertible to ascii, " 
-            "converting to a safe representation:\n  {!r}".format(compat.safe_str(msg)), 
-            UnicodeWarning, 
-        ) 
-    return msg 
- 
- 
-@pytest.hookimpl(hookwrapper=True, tryfirst=True) 
-def pytest_runtest_protocol(item): 
-    with catch_warnings_for_item( 
-        config=item.config, ihook=item.ihook, when="runtest", item=item 
-    ): 
-        yield 
- 
- 
-@pytest.hookimpl(hookwrapper=True, tryfirst=True) 
-def pytest_collection(session): 
-    config = session.config 
-    with catch_warnings_for_item( 
-        config=config, ihook=config.hook, when="collect", item=None 
-    ): 
-        yield 
- 
- 
-@pytest.hookimpl(hookwrapper=True) 
-def pytest_terminal_summary(terminalreporter): 
-    config = terminalreporter.config 
-    with catch_warnings_for_item( 
-        config=config, ihook=config.hook, when="config", item=None 
-    ): 
-        yield 
- 
- 
+    When Python 2 support is dropped this function can be greatly simplified.
+    """
+    warn_msg = warning_message.message
+    unicode_warning = False
+    if compat._PY2 and any(isinstance(m, compat.UNICODE_TYPES) for m in warn_msg.args):
+        new_args = []
+        for m in warn_msg.args:
+            new_args.append(
+                compat.ascii_escaped(m) if isinstance(m, compat.UNICODE_TYPES) else m
+            )
+        unicode_warning = list(warn_msg.args) != new_args
+        warn_msg.args = new_args
+
+    msg = warnings.formatwarning(
+        warn_msg,
+        warning_message.category,
+        warning_message.filename,
+        warning_message.lineno,
+        warning_message.line,
+    )
+    if unicode_warning:
+        warnings.warn(
+            "Warning is using unicode non convertible to ascii, "
+            "converting to a safe representation:\n  {!r}".format(compat.safe_str(msg)),
+            UnicodeWarning,
+        )
+    return msg
+
+
+@pytest.hookimpl(hookwrapper=True, tryfirst=True)
+def pytest_runtest_protocol(item):
+    with catch_warnings_for_item(
+        config=item.config, ihook=item.ihook, when="runtest", item=item
+    ):
+        yield
+
+
+@pytest.hookimpl(hookwrapper=True, tryfirst=True)
+def pytest_collection(session):
+    config = session.config
+    with catch_warnings_for_item(
+        config=config, ihook=config.hook, when="collect", item=None
+    ):
+        yield
+
+
+@pytest.hookimpl(hookwrapper=True)
+def pytest_terminal_summary(terminalreporter):
+    config = terminalreporter.config
+    with catch_warnings_for_item(
+        config=config, ihook=config.hook, when="config", item=None
+    ):
+        yield
+
+
 def _issue_warning_captured(warning, hook, stacklevel):
-    """ 
-    This function should be used instead of calling ``warnings.warn`` directly when we are in the "configure" stage: 
-    at this point the actual options might not have been set, so we manually trigger the pytest_warning_captured 
-    hook so we can display this warnings in the terminal. This is a hack until we can sort out #2891. 
- 
-    :param warning: the warning instance. 
+    """
+    This function should be used instead of calling ``warnings.warn`` directly when we are in the "configure" stage:
+    at this point the actual options might not have been set, so we manually trigger the pytest_warning_captured
+    hook so we can display this warnings in the terminal. This is a hack until we can sort out #2891.
+
+    :param warning: the warning instance.
     :param hook: the hook caller
-    :param stacklevel: stacklevel forwarded to warnings.warn 
-    """ 
-    with warnings.catch_warnings(record=True) as records: 
-        warnings.simplefilter("always", type(warning)) 
-        warnings.warn(warning, stacklevel=stacklevel) 
+    :param stacklevel: stacklevel forwarded to warnings.warn
+    """
+    with warnings.catch_warnings(record=True) as records:
+        warnings.simplefilter("always", type(warning))
+        warnings.warn(warning, stacklevel=stacklevel)
     hook.pytest_warning_captured.call_historic(
-        kwargs=dict(warning_message=records[0], when="config", item=None) 
-    ) 
+        kwargs=dict(warning_message=records[0], when="config", item=None)
+    )