Intermediate changes

commit_hash:79c70b54395117070e5b4b7ae1d0319263d80604

5 files changed, 14 insertions, 19 deletions

diff --git a/contrib/python/six/py2/.dist-info/METADATA b/contrib/python/six/py2/.dist-info/METADATA
index 6d7525c2ebc..cfde03c2631 100644
--- a/contrib/python/six/py2/.dist-info/METADATA
+++ b/contrib/python/six/py2/.dist-info/METADATA
@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: six
-Version: 1.16.0
+Version: 1.17.0
 Summary: Python 2 and 3 compatibility utilities
 Home-page: https://github.com/benjaminp/six
 Author: Benjamin Peterson
 Author-email: [email protected]
 License: MIT
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 3
@@ -15,15 +14,12 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*
+License-File: LICENSE
 
 .. image:: https://img.shields.io/pypi/v/six.svg
    :target: https://pypi.org/project/six/
    :alt: six on PyPI
 
-.. image:: https://travis-ci.org/benjaminp/six.svg?branch=master
-   :target: https://travis-ci.org/benjaminp/six
-   :alt: six on TravisCI
-
 .. image:: https://readthedocs.org/projects/six/badge/?version=latest
    :target: https://six.readthedocs.io/
    :alt: six's documentation on Read the Docs
@@ -45,5 +41,3 @@ Online documentation is at https://six.readthedocs.io/.
 
 Bugs can be reported to https://github.com/benjaminp/six.  The code can also
 be found there.
-
-
diff --git a/contrib/python/six/py2/LICENSE b/contrib/python/six/py2/LICENSE
index de6633112c1..1cc22a5aa76 100644
--- a/contrib/python/six/py2/LICENSE
+++ b/contrib/python/six/py2/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2020 Benjamin Peterson
+Copyright (c) 2010-2024 Benjamin Peterson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/contrib/python/six/py2/README.rst b/contrib/python/six/py2/README.rst
index 6339ba5d932..3674bc956e4 100644
--- a/contrib/python/six/py2/README.rst
+++ b/contrib/python/six/py2/README.rst
@@ -2,10 +2,6 @@
    :target: https://pypi.org/project/six/
    :alt: six on PyPI
 
-.. image:: https://travis-ci.org/benjaminp/six.svg?branch=master
-   :target: https://travis-ci.org/benjaminp/six
-   :alt: six on TravisCI
-
 .. image:: https://readthedocs.org/projects/six/badge/?version=latest
    :target: https://six.readthedocs.io/
    :alt: six's documentation on Read the Docs
diff --git a/contrib/python/six/py2/six.py b/contrib/python/six/py2/six.py
index 4cba03c75f0..29b5da22496 100644
--- a/contrib/python/six/py2/six.py
+++ b/contrib/python/six/py2/six.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2020 Benjamin Peterson
+# Copyright (c) 2010-2024 Benjamin Peterson
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@ import sys
 import types
 
 __author__ = "Benjamin Peterson <[email protected]>"
-__version__ = "1.16.0"
+__version__ = "1.17.0"
 
 
 # Useful for very coarse version differentiation.
@@ -263,7 +263,7 @@ _moved_attributes = [
     MovedAttribute("reduce", "__builtin__", "functools"),
     MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
     MovedAttribute("StringIO", "StringIO", "io"),
-    MovedAttribute("UserDict", "UserDict", "collections"),
+    MovedAttribute("UserDict", "UserDict", "collections", "IterableUserDict", "UserDict"),
     MovedAttribute("UserList", "UserList", "collections"),
     MovedAttribute("UserString", "UserString", "collections"),
     MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
@@ -435,12 +435,17 @@ _urllib_request_moved_attributes = [
     MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
     MovedAttribute("urlretrieve", "urllib", "urllib.request"),
     MovedAttribute("urlcleanup", "urllib", "urllib.request"),
-    MovedAttribute("URLopener", "urllib", "urllib.request"),
-    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
     MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
     MovedAttribute("parse_http_list", "urllib2", "urllib.request"),
     MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"),
 ]
+if sys.version_info[:2] < (3, 14):
+    _urllib_request_moved_attributes.extend(
+        [
+            MovedAttribute("URLopener", "urllib", "urllib.request"),
+            MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
+        ]
+    )
 for attr in _urllib_request_moved_attributes:
     setattr(Module_six_moves_urllib_request, attr.name, attr)
 del attr
diff --git a/contrib/python/six/py2/ya.make b/contrib/python/six/py2/ya.make
index ca16ba19acf..bac6050e1c2 100644
--- a/contrib/python/six/py2/ya.make
+++ b/contrib/python/six/py2/ya.make
@@ -2,7 +2,7 @@
 
 PY2_LIBRARY()
 
-VERSION(1.16.0)
+VERSION(1.17.0)
 
 LICENSE(MIT)