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

1 files changed, 173 insertions, 173 deletions

diff --git a/contrib/python/pytest/py2/_pytest/tmpdir.py b/contrib/python/pytest/py2/_pytest/tmpdir.py
index d146cefa2be..a8a7037713c 100644
--- a/contrib/python/pytest/py2/_pytest/tmpdir.py
+++ b/contrib/python/pytest/py2/_pytest/tmpdir.py
@@ -1,68 +1,68 @@
 # -*- coding: utf-8 -*-
-""" support for providing temporary directories to test functions.  """ 
-from __future__ import absolute_import 
-from __future__ import division 
-from __future__ import print_function 
- 
-import os 
-import re 
-import tempfile 
-import warnings 
- 
-import attr 
-import py 
-import six 
- 
-import pytest 
-from .pathlib import ensure_reset_dir 
-from .pathlib import LOCK_TIMEOUT 
-from .pathlib import make_numbered_dir 
-from .pathlib import make_numbered_dir_with_cleanup 
-from .pathlib import Path 
-from _pytest.monkeypatch import MonkeyPatch 
- 
- 
-@attr.s 
-class TempPathFactory(object): 
-    """Factory for temporary directories under the common base temp directory. 
- 
-    The base directory can be configured using the ``--basetemp`` option.""" 
- 
-    _given_basetemp = attr.ib( 
-        # using os.path.abspath() to get absolute path instead of resolve() as it 
-        # does not work the same in all platforms (see #4427) 
-        # Path.absolute() exists, but it is not public (see https://bugs.python.org/issue25012) 
+""" support for providing temporary directories to test functions.  """
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import os
+import re
+import tempfile
+import warnings
+
+import attr
+import py
+import six
+
+import pytest
+from .pathlib import ensure_reset_dir
+from .pathlib import LOCK_TIMEOUT
+from .pathlib import make_numbered_dir
+from .pathlib import make_numbered_dir_with_cleanup
+from .pathlib import Path
+from _pytest.monkeypatch import MonkeyPatch
+
+
+@attr.s
+class TempPathFactory(object):
+    """Factory for temporary directories under the common base temp directory.
+
+    The base directory can be configured using the ``--basetemp`` option."""
+
+    _given_basetemp = attr.ib(
+        # using os.path.abspath() to get absolute path instead of resolve() as it
+        # does not work the same in all platforms (see #4427)
+        # Path.absolute() exists, but it is not public (see https://bugs.python.org/issue25012)
         converter=attr.converters.optional(
-            lambda p: Path(os.path.abspath(six.text_type(p))) 
-        ) 
-    ) 
-    _trace = attr.ib() 
-    _basetemp = attr.ib(default=None) 
- 
-    @classmethod 
-    def from_config(cls, config): 
-        """ 
-        :param config: a pytest configuration 
-        """ 
-        return cls( 
-            given_basetemp=config.option.basetemp, trace=config.trace.get("tmpdir") 
-        ) 
- 
-    def mktemp(self, basename, numbered=True): 
-        """makes a temporary directory managed by the factory""" 
-        if not numbered: 
-            p = self.getbasetemp().joinpath(basename) 
-            p.mkdir() 
-        else: 
-            p = make_numbered_dir(root=self.getbasetemp(), prefix=basename) 
-            self._trace("mktemp", p) 
-        return p 
- 
-    def getbasetemp(self): 
-        """ return base temporary directory. """ 
+            lambda p: Path(os.path.abspath(six.text_type(p)))
+        )
+    )
+    _trace = attr.ib()
+    _basetemp = attr.ib(default=None)
+
+    @classmethod
+    def from_config(cls, config):
+        """
+        :param config: a pytest configuration
+        """
+        return cls(
+            given_basetemp=config.option.basetemp, trace=config.trace.get("tmpdir")
+        )
+
+    def mktemp(self, basename, numbered=True):
+        """makes a temporary directory managed by the factory"""
+        if not numbered:
+            p = self.getbasetemp().joinpath(basename)
+            p.mkdir()
+        else:
+            p = make_numbered_dir(root=self.getbasetemp(), prefix=basename)
+            self._trace("mktemp", p)
+        return p
+
+    def getbasetemp(self):
+        """ return base temporary directory. """
         if self._basetemp is not None:
-            return self._basetemp 
- 
+            return self._basetemp
+
         if self._given_basetemp is not None:
             basetemp = self._given_basetemp
             ensure_reset_dir(basetemp)
@@ -82,116 +82,116 @@ class TempPathFactory(object):
         self._basetemp = t = basetemp
         self._trace("new basetemp", t)
         return t
- 
-
-@attr.s 
-class TempdirFactory(object): 
-    """ 
-    backward comptibility wrapper that implements 
-    :class:``py.path.local`` for :class:``TempPathFactory`` 
-    """ 
- 
-    _tmppath_factory = attr.ib() 
- 
-    def ensuretemp(self, string, dir=1): 
-        """ (deprecated) return temporary directory path with 
-            the given string as the trailing part.  It is usually 
-            better to use the 'tmpdir' function argument which 
-            provides an empty unique-per-test-invocation directory 
-            and is guaranteed to be empty. 
-        """ 
-        # py.log._apiwarn(">1.1", "use tmpdir function argument") 
-        from .deprecated import PYTEST_ENSURETEMP 
- 
-        warnings.warn(PYTEST_ENSURETEMP, stacklevel=2) 
-        return self.getbasetemp().ensure(string, dir=dir) 
- 
-    def mktemp(self, basename, numbered=True): 
-        """Create a subdirectory of the base temporary directory and return it. 
-        If ``numbered``, ensure the directory is unique by adding a number 
-        prefix greater than any existing one. 
-        """ 
-        return py.path.local(self._tmppath_factory.mktemp(basename, numbered).resolve()) 
- 
-    def getbasetemp(self): 
-        """backward compat wrapper for ``_tmppath_factory.getbasetemp``""" 
-        return py.path.local(self._tmppath_factory.getbasetemp().resolve()) 
- 
- 
-def get_user(): 
-    """Return the current user name, or None if getuser() does not work 
-    in the current environment (see #1010). 
-    """ 
-    import getpass 
- 
-    try: 
-        return getpass.getuser() 
-    except (ImportError, KeyError): 
-        return None 
- 
- 
-def pytest_configure(config): 
-    """Create a TempdirFactory and attach it to the config object. 
- 
-    This is to comply with existing plugins which expect the handler to be 
-    available at pytest_configure time, but ideally should be moved entirely 
-    to the tmpdir_factory session fixture. 
-    """ 
-    mp = MonkeyPatch() 
-    tmppath_handler = TempPathFactory.from_config(config) 
-    t = TempdirFactory(tmppath_handler) 
-    config._cleanup.append(mp.undo) 
-    mp.setattr(config, "_tmp_path_factory", tmppath_handler, raising=False) 
-    mp.setattr(config, "_tmpdirhandler", t, raising=False) 
-    mp.setattr(pytest, "ensuretemp", t.ensuretemp, raising=False) 
- 
- 
-@pytest.fixture(scope="session") 
-def tmpdir_factory(request): 
-    """Return a :class:`_pytest.tmpdir.TempdirFactory` instance for the test session. 
-    """ 
-    return request.config._tmpdirhandler 
- 
- 
-@pytest.fixture(scope="session") 
-def tmp_path_factory(request): 
-    """Return a :class:`_pytest.tmpdir.TempPathFactory` instance for the test session. 
-    """ 
-    return request.config._tmp_path_factory 
- 
- 
-def _mk_tmp(request, factory): 
-    name = request.node.name 
-    name = re.sub(r"[\W]", "_", name) 
-    MAXVAL = 30 
-    name = name[:MAXVAL] 
-    return factory.mktemp(name, numbered=True) 
- 
- 
-@pytest.fixture 
+
+
+@attr.s
+class TempdirFactory(object):
+    """
+    backward comptibility wrapper that implements
+    :class:``py.path.local`` for :class:``TempPathFactory``
+    """
+
+    _tmppath_factory = attr.ib()
+
+    def ensuretemp(self, string, dir=1):
+        """ (deprecated) return temporary directory path with
+            the given string as the trailing part.  It is usually
+            better to use the 'tmpdir' function argument which
+            provides an empty unique-per-test-invocation directory
+            and is guaranteed to be empty.
+        """
+        # py.log._apiwarn(">1.1", "use tmpdir function argument")
+        from .deprecated import PYTEST_ENSURETEMP
+
+        warnings.warn(PYTEST_ENSURETEMP, stacklevel=2)
+        return self.getbasetemp().ensure(string, dir=dir)
+
+    def mktemp(self, basename, numbered=True):
+        """Create a subdirectory of the base temporary directory and return it.
+        If ``numbered``, ensure the directory is unique by adding a number
+        prefix greater than any existing one.
+        """
+        return py.path.local(self._tmppath_factory.mktemp(basename, numbered).resolve())
+
+    def getbasetemp(self):
+        """backward compat wrapper for ``_tmppath_factory.getbasetemp``"""
+        return py.path.local(self._tmppath_factory.getbasetemp().resolve())
+
+
+def get_user():
+    """Return the current user name, or None if getuser() does not work
+    in the current environment (see #1010).
+    """
+    import getpass
+
+    try:
+        return getpass.getuser()
+    except (ImportError, KeyError):
+        return None
+
+
+def pytest_configure(config):
+    """Create a TempdirFactory and attach it to the config object.
+
+    This is to comply with existing plugins which expect the handler to be
+    available at pytest_configure time, but ideally should be moved entirely
+    to the tmpdir_factory session fixture.
+    """
+    mp = MonkeyPatch()
+    tmppath_handler = TempPathFactory.from_config(config)
+    t = TempdirFactory(tmppath_handler)
+    config._cleanup.append(mp.undo)
+    mp.setattr(config, "_tmp_path_factory", tmppath_handler, raising=False)
+    mp.setattr(config, "_tmpdirhandler", t, raising=False)
+    mp.setattr(pytest, "ensuretemp", t.ensuretemp, raising=False)
+
+
+@pytest.fixture(scope="session")
+def tmpdir_factory(request):
+    """Return a :class:`_pytest.tmpdir.TempdirFactory` instance for the test session.
+    """
+    return request.config._tmpdirhandler
+
+
+@pytest.fixture(scope="session")
+def tmp_path_factory(request):
+    """Return a :class:`_pytest.tmpdir.TempPathFactory` instance for the test session.
+    """
+    return request.config._tmp_path_factory
+
+
+def _mk_tmp(request, factory):
+    name = request.node.name
+    name = re.sub(r"[\W]", "_", name)
+    MAXVAL = 30
+    name = name[:MAXVAL]
+    return factory.mktemp(name, numbered=True)
+
+
+@pytest.fixture
 def tmpdir(tmp_path):
-    """Return a temporary directory path object 
-    which is unique to each test function invocation, 
-    created as a sub directory of the base temporary 
-    directory.  The returned object is a `py.path.local`_ 
-    path object. 
- 
-    .. _`py.path.local`: https://py.readthedocs.io/en/latest/path.html 
-    """ 
+    """Return a temporary directory path object
+    which is unique to each test function invocation,
+    created as a sub directory of the base temporary
+    directory.  The returned object is a `py.path.local`_
+    path object.
+
+    .. _`py.path.local`: https://py.readthedocs.io/en/latest/path.html
+    """
     return py.path.local(tmp_path)
- 
- 
-@pytest.fixture 
-def tmp_path(request, tmp_path_factory): 
-    """Return a temporary directory path object 
-    which is unique to each test function invocation, 
-    created as a sub directory of the base temporary 
-    directory.  The returned object is a :class:`pathlib.Path` 
-    object. 
- 
-    .. note:: 
- 
-        in python < 3.6 this is a pathlib2.Path 
-    """ 
- 
-    return _mk_tmp(request, tmp_path_factory) 
+
+
+@pytest.fixture
+def tmp_path(request, tmp_path_factory):
+    """Return a temporary directory path object
+    which is unique to each test function invocation,
+    created as a sub directory of the base temporary
+    directory.  The returned object is a :class:`pathlib.Path`
+    object.
+
+    .. note::
+
+        in python < 3.6 this is a pathlib2.Path
+    """
+
+    return _mk_tmp(request, tmp_path_factory)