diff options
| author | danila-eremin <danila-eremin@yandex-team.ru> | 2022-02-10 16:46:21 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:21 +0300 |
| commit | 358e631d1a69242d3ae4d6e6b1e4f7581d03133b (patch) | |
| tree | db997f29fd5f1b32ede8ce681a7c73ec0a0714d0 /contrib/python/pytest | |
| parent | bf23f1e45d4627b54a70900ef362c1be748cc787 (diff) | |
| download | ydb-358e631d1a69242d3ae4d6e6b1e4f7581d03133b.tar.gz | |
Restoring authorship annotation for <danila-eremin@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'contrib/python/pytest')
| -rw-r--r-- | contrib/python/pytest/py2/_pytest/python.py | 2 | ||||
| -rw-r--r-- | contrib/python/pytest/py2/patches/08-backport-pr-6607.patch | 30 |
2 files changed, 16 insertions, 16 deletions
diff --git a/contrib/python/pytest/py2/_pytest/python.py b/contrib/python/pytest/py2/_pytest/python.py index f7c368b0c4..4ceb01a7e4 100644 --- a/contrib/python/pytest/py2/_pytest/python.py +++ b/contrib/python/pytest/py2/_pytest/python.py @@ -896,7 +896,7 @@ class CallSpec2(object): @property def id(self): - return "-".join(map(safe_str, self._idlist)) + return "-".join(map(safe_str, self._idlist)) def setmulti2(self, valtypes, argnames, valset, id, marks, scopenum, param_index): for arg, val in zip(argnames, valset): diff --git a/contrib/python/pytest/py2/patches/08-backport-pr-6607.patch b/contrib/python/pytest/py2/patches/08-backport-pr-6607.patch index 8d0ae7a5fb..5e8fcb70ae 100644 --- a/contrib/python/pytest/py2/patches/08-backport-pr-6607.patch +++ b/contrib/python/pytest/py2/patches/08-backport-pr-6607.patch @@ -1,17 +1,17 @@ -commit 46b46cea857997531a7b9b4de32556be50bd5aea (HEAD -> pytest-backport-pr-6607) -author: danila-eremin -date: 2022-01-22T16:55:07+03:00 - - backport py2 - ---- contrib/python/pytest/py2/_pytest/python.py (b87553999455f0084413c5b59139aa9ccb5e3f52) -+++ contrib/python/pytest/py2/_pytest/python.py (46b46cea857997531a7b9b4de32556be50bd5aea) -@@ -896,7 +896,7 @@ class CallSpec2(object): +commit 46b46cea857997531a7b9b4de32556be50bd5aea (HEAD -> pytest-backport-pr-6607) +author: danila-eremin +date: 2022-01-22T16:55:07+03:00 - @property - def id(self): -- return "-".join(map(safe_str, filter(None, self._idlist))) -+ return "-".join(map(safe_str, self._idlist)) + backport py2 - def setmulti2(self, valtypes, argnames, valset, id, marks, scopenum, param_index): - for arg, val in zip(argnames, valset): +--- contrib/python/pytest/py2/_pytest/python.py (b87553999455f0084413c5b59139aa9ccb5e3f52) ++++ contrib/python/pytest/py2/_pytest/python.py (46b46cea857997531a7b9b4de32556be50bd5aea) +@@ -896,7 +896,7 @@ class CallSpec2(object): + + @property + def id(self): +- return "-".join(map(safe_str, filter(None, self._idlist))) ++ return "-".join(map(safe_str, self._idlist)) + + def setmulti2(self, valtypes, argnames, valset, id, marks, scopenum, param_index): + for arg, val in zip(argnames, valset): |