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 | 9d80afb43be16931e653a688c5e0f585101ff4f8 (patch) | |
| tree | 1a2c5ffcf89eb53ecd79dbc9bc0a195c27404d0c /contrib/python | |
| parent | 358e631d1a69242d3ae4d6e6b1e4f7581d03133b (diff) | |
| download | ydb-9d80afb43be16931e653a688c5e0f585101ff4f8.tar.gz | |
Restoring authorship annotation for <danila-eremin@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'contrib/python')
| -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 | ||||
| -rw-r--r-- | contrib/python/ya.make | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/contrib/python/pytest/py2/_pytest/python.py b/contrib/python/pytest/py2/_pytest/python.py index 4ceb01a7e4..f7c368b0c4 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 5e8fcb70ae..8d0ae7a5fb 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 +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): - backport py2 + @property + def id(self): +- return "-".join(map(safe_str, filter(None, self._idlist))) ++ return "-".join(map(safe_str, self._idlist)) ---- 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): + def setmulti2(self, valtypes, argnames, valset, id, marks, scopenum, param_index): + for arg, val in zip(argnames, valset): diff --git a/contrib/python/ya.make b/contrib/python/ya.make index 2898a62f37..d01ced9f3a 100644 --- a/contrib/python/ya.make +++ b/contrib/python/ya.make @@ -755,7 +755,7 @@ RECURSE( portalocker portpicker ppdeep - pq + pq pql prance premailer |