From ad761abcdd2f1b5e4fcba549676b2ea52bd325cd Mon Sep 17 00:00:00 2001 From: mayank Date: Tue, 31 Oct 2023 00:50:10 +0530 Subject: [PATCH 1/4] every chardet package maps to requests.packages.chardet.* package respectively --- src/requests/packages.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/requests/packages.py b/src/requests/packages.py index 77c45c9e90..9962bcd269 100644 --- a/src/requests/packages.py +++ b/src/requests/packages.py @@ -23,6 +23,5 @@ target = chardet.__name__ for mod in list(sys.modules): if mod == target or mod.startswith(f"{target}."): - target = target.replace(target, "chardet") - sys.modules[f"requests.packages.{target}"] = sys.modules[mod] -# Kinda cool, though, right? + sys.modules[f"requests.packages.{mod}"] = sys.modules[mod] +# Kinda cool, though, right? \ No newline at end of file From e9b1217cff710307e5de9fb8ce2fc21eb79acec3 Mon Sep 17 00:00:00 2001 From: mayank Date: Tue, 31 Oct 2023 20:37:59 +0530 Subject: [PATCH 2/4] added handling for chardet and charset_normalizer imports --- src/requests/packages.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/requests/packages.py b/src/requests/packages.py index 9962bcd269..34fccdb71d 100644 --- a/src/requests/packages.py +++ b/src/requests/packages.py @@ -24,4 +24,6 @@ for mod in list(sys.modules): if mod == target or mod.startswith(f"{target}."): sys.modules[f"requests.packages.{mod}"] = sys.modules[mod] + target = target.replace(target, "chardet") + sys.modules[f"requests.packages.{target}"] = sys.modules[mod] # Kinda cool, though, right? \ No newline at end of file From d7490c9d2dc967f68c6ca38b73aa099bc888a04e Mon Sep 17 00:00:00 2001 From: amkarn258 <55189266+amkarn258@users.noreply.github.com> Date: Tue, 31 Oct 2023 22:36:39 +0530 Subject: [PATCH 3/4] Update src/requests/packages.py Co-authored-by: Ian Stapleton Cordasco --- src/requests/packages.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/requests/packages.py b/src/requests/packages.py index 34fccdb71d..0a90f54d99 100644 --- a/src/requests/packages.py +++ b/src/requests/packages.py @@ -23,7 +23,8 @@ target = chardet.__name__ for mod in list(sys.modules): if mod == target or mod.startswith(f"{target}."): - sys.modules[f"requests.packages.{mod}"] = sys.modules[mod] - target = target.replace(target, "chardet") - sys.modules[f"requests.packages.{target}"] = sys.modules[mod] + imported_mod = sys.modules[mod] + sys.modules[f"requests.packages.{mod}"] = imported_mod + mod = mod.replace(target, "chardet") + sys.modules[f"requests.packages.{mod}"] = imported_mod # Kinda cool, though, right? \ No newline at end of file From 89cde235bec9374273281c1b4c9277c409246a6c Mon Sep 17 00:00:00 2001 From: mayank Date: Sat, 4 Nov 2023 23:20:21 +0530 Subject: [PATCH 4/4] checkstyle --- src/requests/packages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/requests/packages.py b/src/requests/packages.py index 0a90f54d99..a9e5ae087d 100644 --- a/src/requests/packages.py +++ b/src/requests/packages.py @@ -27,4 +27,4 @@ sys.modules[f"requests.packages.{mod}"] = imported_mod mod = mod.replace(target, "chardet") sys.modules[f"requests.packages.{mod}"] = imported_mod -# Kinda cool, though, right? \ No newline at end of file +# Kinda cool, though, right?