diff options
| author | robot-piglet <robot-piglet@yandex-team.com> | 2024-04-03 16:40:15 +0300 |
|---|---|---|
| committer | robot-piglet <robot-piglet@yandex-team.com> | 2024-04-03 16:53:23 +0300 |
| commit | bd6fa12b5d3bc14249eb09846c0c4e65fc12368c (patch) | |
| tree | 4a37805d8b2d776ec6e735cd18e01c6726e244ed | |
| parent | c54a70807c9984ac7ea3eeca993a1202b5e9c71b (diff) | |
| download | ydb-bd6fa12b5d3bc14249eb09846c0c4e65fc12368c.tar.gz | |
Intermediate changes
4 files changed, 7 insertions, 11 deletions
diff --git a/contrib/python/future/py2/future/backports/http/cookies.py b/contrib/python/future/py2/future/backports/http/cookies.py index 934fa56a41..8bb61e22c4 100644 --- a/contrib/python/future/py2/future/backports/http/cookies.py +++ b/contrib/python/future/py2/future/backports/http/cookies.py @@ -461,7 +461,7 @@ _CookiePattern = re.compile(r""" )? # End of optional value group \s* # Any number of spaces. (\s+|;|$) # Ending either at space, semicolon, or EOS. - """, re.ASCII | re.VERBOSE) # May be removed if safe. + """, re.ASCII) # May be removed if safe. # At long last, here is the cookie class. Using this class is almost just like diff --git a/contrib/python/future/py2/future/backports/xmlrpc/client.py b/contrib/python/future/py2/future/backports/xmlrpc/client.py index 3f0cae9b00..b0b8f5e19e 100644 --- a/contrib/python/future/py2/future/backports/xmlrpc/client.py +++ b/contrib/python/future/py2/future/backports/xmlrpc/client.py @@ -133,12 +133,11 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) from future.builtins import bytes, dict, int, range, str -import sys import base64 -if sys.version_info[0] < 3: - # Py2.7 compatibility hack - base64.encodebytes = base64.encodestring - base64.decodebytes = base64.decodestring +# Py2.7 compatibility hack +base64.encodebytes = base64.encodestring +base64.decodebytes = base64.decodestring +import sys import time from datetime import datetime from future.backports.http import client as http_client diff --git a/contrib/python/future/py2/future/moves/_dummy_thread.py b/contrib/python/future/py2/future/moves/_dummy_thread.py index e5dca348fb..688d249bbe 100644 --- a/contrib/python/future/py2/future/moves/_dummy_thread.py +++ b/contrib/python/future/py2/future/moves/_dummy_thread.py @@ -2,10 +2,7 @@ from __future__ import absolute_import from future.utils import PY3 if PY3: - try: - from _dummy_thread import * - except ImportError: - from _thread import * + from _dummy_thread import * else: __future_module__ = True from dummy_thread import * diff --git a/contrib/python/future/py2/future/standard_library/__init__.py b/contrib/python/future/py2/future/standard_library/__init__.py index 41c4f36df2..cff02f9594 100644 --- a/contrib/python/future/py2/future/standard_library/__init__.py +++ b/contrib/python/future/py2/future/standard_library/__init__.py @@ -125,7 +125,7 @@ RENAMES = { # 'Tkinter': 'tkinter', '_winreg': 'winreg', 'thread': '_thread', - 'dummy_thread': '_dummy_thread' if sys.version_info < (3, 9) else '_thread', + 'dummy_thread': '_dummy_thread', # 'anydbm': 'dbm', # causes infinite import loop # 'whichdb': 'dbm', # causes infinite import loop # anydbm and whichdb are handled by fix_imports2 |