diff options
author | spreis <spreis@yandex-team.ru> | 2022-02-10 16:47:13 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:13 +0300 |
commit | b49848d6e361b76904f094b7d5e10d6edea75afe (patch) | |
tree | 9814fbd1c3effac9b8377c5d604b367b14e2db55 /contrib/python | |
parent | bcd1126cbd5d445cd0665d295198aa39c6ab8cbe (diff) | |
download | ydb-b49848d6e361b76904f094b7d5e10d6edea75afe.tar.gz |
Restoring authorship annotation for <spreis@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'contrib/python')
-rw-r--r-- | contrib/python/certifi/ya.make | 2 | ||||
-rw-r--r-- | contrib/python/future/ya.make | 52 | ||||
-rw-r--r-- | contrib/python/packaging/ya.make | 2 | ||||
-rw-r--r-- | contrib/python/protobuf/py2/google/protobuf/pyext/message.cc | 34 | ||||
-rw-r--r-- | contrib/python/protobuf/py3/google/protobuf/pyext/message.cc | 34 | ||||
-rw-r--r-- | contrib/python/py/ya.make | 2 | ||||
-rw-r--r-- | contrib/python/pyparsing/py2/ya.make | 2 | ||||
-rw-r--r-- | contrib/python/pyparsing/ya.make | 2 | ||||
-rw-r--r-- | contrib/python/setuptools/ya.make | 2 | ||||
-rw-r--r-- | contrib/python/six/ya.make | 2 | ||||
-rw-r--r-- | contrib/python/tornado/tornado-4/ya.make | 4 | ||||
-rw-r--r-- | contrib/python/ya.make | 2 |
12 files changed, 70 insertions, 70 deletions
diff --git a/contrib/python/certifi/ya.make b/contrib/python/certifi/ya.make index 0ee37b78291..d13fe73acc4 100644 --- a/contrib/python/certifi/ya.make +++ b/contrib/python/certifi/ya.make @@ -1,4 +1,4 @@ -PY23_LIBRARY() +PY23_LIBRARY() LICENSE(Service-Py23-Proxy) diff --git a/contrib/python/future/ya.make b/contrib/python/future/ya.make index 084db12084e..ba24f13341b 100644 --- a/contrib/python/future/ya.make +++ b/contrib/python/future/ya.make @@ -1,4 +1,4 @@ -PY23_LIBRARY() +PY23_LIBRARY() LICENSE(MIT) @@ -138,32 +138,32 @@ PY_SRCS( ) IF (MODULE_TAG == "PY2") - PY_SRCS( - TOP_LEVEL - _dummy_thread/__init__.py - _markupbase/__init__.py - _thread/__init__.py - builtins/__init__.py - copyreg/__init__.py - future/__init__.py - html/__init__.py - html/entities.py - html/parser.py - http/__init__.py - http/client.py - http/cookiejar.py - http/cookies.py - http/server.py + PY_SRCS( + TOP_LEVEL + _dummy_thread/__init__.py + _markupbase/__init__.py + _thread/__init__.py + builtins/__init__.py + copyreg/__init__.py + future/__init__.py + html/__init__.py + html/entities.py + html/parser.py + http/__init__.py + http/client.py + http/cookiejar.py + http/cookies.py + http/server.py past/__init__.py - queue/__init__.py - reprlib/__init__.py - socketserver/__init__.py - xmlrpc/__init__.py - xmlrpc/client.py - xmlrpc/server.py - ) -ENDIF() - + queue/__init__.py + reprlib/__init__.py + socketserver/__init__.py + xmlrpc/__init__.py + xmlrpc/client.py + xmlrpc/server.py + ) +ENDIF() + IF (OS_WINDOWS) PY_SRCS( TOP_LEVEL diff --git a/contrib/python/packaging/ya.make b/contrib/python/packaging/ya.make index 011e164c083..45549cf1377 100644 --- a/contrib/python/packaging/ya.make +++ b/contrib/python/packaging/ya.make @@ -1,4 +1,4 @@ -PY23_LIBRARY() +PY23_LIBRARY() LICENSE(Service-Py23-Proxy) diff --git a/contrib/python/protobuf/py2/google/protobuf/pyext/message.cc b/contrib/python/protobuf/py2/google/protobuf/pyext/message.cc index 3ee9b2664a2..8b41ca47dd0 100644 --- a/contrib/python/protobuf/py2/google/protobuf/pyext/message.cc +++ b/contrib/python/protobuf/py2/google/protobuf/pyext/message.cc @@ -806,24 +806,24 @@ bool CheckAndSetString( PyObject* ToStringObject(const FieldDescriptor* descriptor, const TProtoStringType& value) { -#if PY_MAJOR_VERSION >= 3 - if (descriptor->type() != FieldDescriptor::TYPE_STRING) { - return PyBytes_FromStringAndSize(value.c_str(), value.length()); - } - - PyObject* result = PyUnicode_DecodeUTF8(value.c_str(), value.length(), NULL); - // If the string can't be decoded in UTF-8, just return a string object that - // contains the raw bytes. This can't happen if the value was assigned using - // the members of the Python message object, but can happen if the values were - // parsed from the wire (binary). - if (result == NULL) { - PyErr_Clear(); - result = PyBytes_FromStringAndSize(value.c_str(), value.length()); - } - return result; -#else +#if PY_MAJOR_VERSION >= 3 + if (descriptor->type() != FieldDescriptor::TYPE_STRING) { + return PyBytes_FromStringAndSize(value.c_str(), value.length()); + } + + PyObject* result = PyUnicode_DecodeUTF8(value.c_str(), value.length(), NULL); + // If the string can't be decoded in UTF-8, just return a string object that + // contains the raw bytes. This can't happen if the value was assigned using + // the members of the Python message object, but can happen if the values were + // parsed from the wire (binary). + if (result == NULL) { + PyErr_Clear(); + result = PyBytes_FromStringAndSize(value.c_str(), value.length()); + } + return result; +#else return PyBytes_FromStringAndSize(value.c_str(), value.length()); -#endif +#endif } bool CheckFieldBelongsToMessage(const FieldDescriptor* field_descriptor, diff --git a/contrib/python/protobuf/py3/google/protobuf/pyext/message.cc b/contrib/python/protobuf/py3/google/protobuf/pyext/message.cc index 3ee9b2664a2..8b41ca47dd0 100644 --- a/contrib/python/protobuf/py3/google/protobuf/pyext/message.cc +++ b/contrib/python/protobuf/py3/google/protobuf/pyext/message.cc @@ -806,24 +806,24 @@ bool CheckAndSetString( PyObject* ToStringObject(const FieldDescriptor* descriptor, const TProtoStringType& value) { -#if PY_MAJOR_VERSION >= 3 - if (descriptor->type() != FieldDescriptor::TYPE_STRING) { - return PyBytes_FromStringAndSize(value.c_str(), value.length()); - } - - PyObject* result = PyUnicode_DecodeUTF8(value.c_str(), value.length(), NULL); - // If the string can't be decoded in UTF-8, just return a string object that - // contains the raw bytes. This can't happen if the value was assigned using - // the members of the Python message object, but can happen if the values were - // parsed from the wire (binary). - if (result == NULL) { - PyErr_Clear(); - result = PyBytes_FromStringAndSize(value.c_str(), value.length()); - } - return result; -#else +#if PY_MAJOR_VERSION >= 3 + if (descriptor->type() != FieldDescriptor::TYPE_STRING) { + return PyBytes_FromStringAndSize(value.c_str(), value.length()); + } + + PyObject* result = PyUnicode_DecodeUTF8(value.c_str(), value.length(), NULL); + // If the string can't be decoded in UTF-8, just return a string object that + // contains the raw bytes. This can't happen if the value was assigned using + // the members of the Python message object, but can happen if the values were + // parsed from the wire (binary). + if (result == NULL) { + PyErr_Clear(); + result = PyBytes_FromStringAndSize(value.c_str(), value.length()); + } + return result; +#else return PyBytes_FromStringAndSize(value.c_str(), value.length()); -#endif +#endif } bool CheckFieldBelongsToMessage(const FieldDescriptor* field_descriptor, diff --git a/contrib/python/py/ya.make b/contrib/python/py/ya.make index 1e01a205423..cc86cb7fa9b 100644 --- a/contrib/python/py/ya.make +++ b/contrib/python/py/ya.make @@ -1,6 +1,6 @@ # Generated by devtools/yamaker (pypi). -PY23_LIBRARY() +PY23_LIBRARY() OWNER(g:python-contrib) diff --git a/contrib/python/pyparsing/py2/ya.make b/contrib/python/pyparsing/py2/ya.make index 83f08183ed4..e4812f97b57 100644 --- a/contrib/python/pyparsing/py2/ya.make +++ b/contrib/python/pyparsing/py2/ya.make @@ -1,6 +1,6 @@ # Generated by devtools/yamaker (pypi). -PY23_LIBRARY() +PY23_LIBRARY() PROVIDES(pyparsing) diff --git a/contrib/python/pyparsing/ya.make b/contrib/python/pyparsing/ya.make index 663b5c04fd3..66da70626d8 100644 --- a/contrib/python/pyparsing/ya.make +++ b/contrib/python/pyparsing/ya.make @@ -1,4 +1,4 @@ -PY23_LIBRARY() +PY23_LIBRARY() LICENSE(Service-Py23-Proxy) diff --git a/contrib/python/setuptools/ya.make b/contrib/python/setuptools/ya.make index 58f50081bf2..535a2d61fad 100644 --- a/contrib/python/setuptools/ya.make +++ b/contrib/python/setuptools/ya.make @@ -1,4 +1,4 @@ -PY23_LIBRARY() +PY23_LIBRARY() LICENSE(Service-Py23-Proxy) diff --git a/contrib/python/six/ya.make b/contrib/python/six/ya.make index 25406c95091..e0c78492146 100644 --- a/contrib/python/six/ya.make +++ b/contrib/python/six/ya.make @@ -1,6 +1,6 @@ OWNER(g:python-contrib) -PY23_LIBRARY() +PY23_LIBRARY() LICENSE(MIT) diff --git a/contrib/python/tornado/tornado-4/ya.make b/contrib/python/tornado/tornado-4/ya.make index 88b9d3b5924..0ea2ed6040a 100644 --- a/contrib/python/tornado/tornado-4/ya.make +++ b/contrib/python/tornado/tornado-4/ya.make @@ -6,8 +6,8 @@ LICENSE(Apache-2.0) VERSION(4.5.3) -PROVIDES(tornado) - +PROVIDES(tornado) + PEERDIR( # because of ca bundle contrib/python/certifi diff --git a/contrib/python/ya.make b/contrib/python/ya.make index 922c4b216db..d01ced9f3aa 100644 --- a/contrib/python/ya.make +++ b/contrib/python/ya.make @@ -509,7 +509,7 @@ RECURSE( imagesize IMAPClient imgkit - implicit + implicit importlib-metadata importlib-resources incremental |