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

1 files changed, 96 insertions, 96 deletions

diff --git a/contrib/python/pytest/py2/_pytest/resultlog.py b/contrib/python/pytest/py2/_pytest/resultlog.py
index bd30b5071e..aa7e9c9025 100644
--- a/contrib/python/pytest/py2/_pytest/resultlog.py
+++ b/contrib/python/pytest/py2/_pytest/resultlog.py
@@ -1,102 +1,102 @@
 # -*- coding: utf-8 -*-
-""" log machine-parseable test session result information in a plain
-text file.
-"""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import os
-
-import py
-
-
-def pytest_addoption(parser):
-    group = parser.getgroup("terminal reporting", "resultlog plugin options")
-    group.addoption(
-        "--resultlog",
-        "--result-log",
-        action="store",
-        metavar="path",
-        default=None,
-        help="DEPRECATED path for machine-readable result log.",
-    )
-
-
-def pytest_configure(config):
-    resultlog = config.option.resultlog
-    # prevent opening resultlog on slave nodes (xdist)
-    if resultlog and not hasattr(config, "slaveinput"):
-        dirname = os.path.dirname(os.path.abspath(resultlog))
-        if not os.path.isdir(dirname):
-            os.makedirs(dirname)
-        logfile = open(resultlog, "w", 1)  # line buffered
-        config._resultlog = ResultLog(config, logfile)
-        config.pluginmanager.register(config._resultlog)
-
-        from _pytest.deprecated import RESULT_LOG
+""" log machine-parseable test session result information in a plain 
+text file. 
+""" 
+from __future__ import absolute_import 
+from __future__ import division 
+from __future__ import print_function 
+ 
+import os 
+ 
+import py 
+ 
+ 
+def pytest_addoption(parser): 
+    group = parser.getgroup("terminal reporting", "resultlog plugin options") 
+    group.addoption( 
+        "--resultlog", 
+        "--result-log", 
+        action="store", 
+        metavar="path", 
+        default=None, 
+        help="DEPRECATED path for machine-readable result log.", 
+    ) 
+ 
+ 
+def pytest_configure(config): 
+    resultlog = config.option.resultlog 
+    # prevent opening resultlog on slave nodes (xdist) 
+    if resultlog and not hasattr(config, "slaveinput"): 
+        dirname = os.path.dirname(os.path.abspath(resultlog)) 
+        if not os.path.isdir(dirname): 
+            os.makedirs(dirname) 
+        logfile = open(resultlog, "w", 1)  # line buffered 
+        config._resultlog = ResultLog(config, logfile) 
+        config.pluginmanager.register(config._resultlog) 
+ 
+        from _pytest.deprecated import RESULT_LOG 
         from _pytest.warnings import _issue_warning_captured
-
+ 
         _issue_warning_captured(RESULT_LOG, config.hook, stacklevel=2)
-
-
-def pytest_unconfigure(config):
-    resultlog = getattr(config, "_resultlog", None)
-    if resultlog:
-        resultlog.logfile.close()
-        del config._resultlog
-        config.pluginmanager.unregister(resultlog)
-
-
-class ResultLog(object):
-    def __init__(self, config, logfile):
-        self.config = config
-        self.logfile = logfile  # preferably line buffered
-
-    def write_log_entry(self, testpath, lettercode, longrepr):
-        print("%s %s" % (lettercode, testpath), file=self.logfile)
-        for line in longrepr.splitlines():
-            print(" %s" % line, file=self.logfile)
-
-    def log_outcome(self, report, lettercode, longrepr):
-        testpath = getattr(report, "nodeid", None)
-        if testpath is None:
-            testpath = report.fspath
-        self.write_log_entry(testpath, lettercode, longrepr)
-
-    def pytest_runtest_logreport(self, report):
-        if report.when != "call" and report.passed:
-            return
+ 
+ 
+def pytest_unconfigure(config): 
+    resultlog = getattr(config, "_resultlog", None) 
+    if resultlog: 
+        resultlog.logfile.close() 
+        del config._resultlog 
+        config.pluginmanager.unregister(resultlog) 
+ 
+ 
+class ResultLog(object): 
+    def __init__(self, config, logfile): 
+        self.config = config 
+        self.logfile = logfile  # preferably line buffered 
+ 
+    def write_log_entry(self, testpath, lettercode, longrepr): 
+        print("%s %s" % (lettercode, testpath), file=self.logfile) 
+        for line in longrepr.splitlines(): 
+            print(" %s" % line, file=self.logfile) 
+ 
+    def log_outcome(self, report, lettercode, longrepr): 
+        testpath = getattr(report, "nodeid", None) 
+        if testpath is None: 
+            testpath = report.fspath 
+        self.write_log_entry(testpath, lettercode, longrepr) 
+ 
+    def pytest_runtest_logreport(self, report): 
+        if report.when != "call" and report.passed: 
+            return 
         res = self.config.hook.pytest_report_teststatus(
             report=report, config=self.config
         )
-        code = res[1]
-        if code == "x":
-            longrepr = str(report.longrepr)
-        elif code == "X":
-            longrepr = ""
-        elif report.passed:
-            longrepr = ""
-        elif report.failed:
-            longrepr = str(report.longrepr)
-        elif report.skipped:
-            longrepr = str(report.longrepr[2])
-        self.log_outcome(report, code, longrepr)
-
-    def pytest_collectreport(self, report):
-        if not report.passed:
-            if report.failed:
-                code = "F"
-                longrepr = str(report.longrepr)
-            else:
-                assert report.skipped
-                code = "S"
-                longrepr = "%s:%d: %s" % report.longrepr
-            self.log_outcome(report, code, longrepr)
-
-    def pytest_internalerror(self, excrepr):
-        reprcrash = getattr(excrepr, "reprcrash", None)
-        path = getattr(reprcrash, "path", None)
-        if path is None:
-            path = "cwd:%s" % py.path.local()
-        self.write_log_entry(path, "!", str(excrepr))
+        code = res[1] 
+        if code == "x": 
+            longrepr = str(report.longrepr) 
+        elif code == "X": 
+            longrepr = "" 
+        elif report.passed: 
+            longrepr = "" 
+        elif report.failed: 
+            longrepr = str(report.longrepr) 
+        elif report.skipped: 
+            longrepr = str(report.longrepr[2]) 
+        self.log_outcome(report, code, longrepr) 
+ 
+    def pytest_collectreport(self, report): 
+        if not report.passed: 
+            if report.failed: 
+                code = "F" 
+                longrepr = str(report.longrepr) 
+            else: 
+                assert report.skipped 
+                code = "S" 
+                longrepr = "%s:%d: %s" % report.longrepr 
+            self.log_outcome(report, code, longrepr) 
+ 
+    def pytest_internalerror(self, excrepr): 
+        reprcrash = getattr(excrepr, "reprcrash", None) 
+        path = getattr(reprcrash, "path", None) 
+        if path is None: 
+            path = "cwd:%s" % py.path.local() 
+        self.write_log_entry(path, "!", str(excrepr))