From 3ec93148198c8af09fa39998d93807af8031c7a3 Mon Sep 17 00:00:00 2001 From: Clinton Hall Date: Tue, 27 Feb 2024 21:30:11 +1300 Subject: [PATCH] Update six.py --- libs/common/six.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/common/six.py b/libs/common/six.py index 4e15675d..84871a9c 100644 --- a/libs/common/six.py +++ b/libs/common/six.py @@ -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"), @@ -363,6 +363,8 @@ _urllib_parse_moved_attributes = [ MovedAttribute("splittag", "urllib", "urllib.parse"), MovedAttribute("splituser", "urllib", "urllib.parse"), MovedAttribute("splitvalue", "urllib", "urllib.parse"), + MovedAttribute("splittype", "urllib", "urllib.parse"), + MovedAttribute("splithost", "urllib", "urllib.parse"), MovedAttribute("uses_fragment", "urlparse", "urllib.parse"), MovedAttribute("uses_netloc", "urlparse", "urllib.parse"), MovedAttribute("uses_params", "urlparse", "urllib.parse"), @@ -531,6 +533,7 @@ if PY3: _func_code = "__code__" _func_defaults = "__defaults__" _func_globals = "__globals__" + _func_name = "__name__" else: _meth_func = "im_func" _meth_self = "im_self" @@ -539,6 +542,7 @@ else: _func_code = "func_code" _func_defaults = "func_defaults" _func_globals = "func_globals" + _func_name = "func_name" try: @@ -592,6 +596,7 @@ get_function_closure = operator.attrgetter(_func_closure) get_function_code = operator.attrgetter(_func_code) get_function_defaults = operator.attrgetter(_func_defaults) get_function_globals = operator.attrgetter(_func_globals) +get_function_name = operator.attrgetter(_func_name) if PY3: