1a3cef77d4
This version includes fixes for: * CVE-2020-14422: Hash collisions in IPv4Interface and IPv6Interface * CVE-2020-15523: Python uses invalid DLL path after calling Py_SetPath on Windows This version also includes support for OpenSSL 1.1.x builds that use 'no-deprecated' and '--api=1.1.0'[1], and so this removes the previous OpenSSL-related patches. This also backports fixes for security issues, including: * CVE-2019-20907: Infinite loop in the tarfile module This also updates the setuptools and pip packages to 47.1.0 and 20.1.1, respectively. [1]: https://github.com/python/cpython/pull/20566 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
14 lines
573 B
Diff
14 lines
573 B
Diff
--- a/setuptools/command/easy_install.py
|
|
+++ b/setuptools/command/easy_install.py
|
|
@@ -1324,7 +1324,10 @@ class easy_install(Command):
|
|
return # already did it, or don't need to
|
|
|
|
sitepy = os.path.join(self.install_dir, "site.py")
|
|
- source = resource_string("setuptools", "site-patch.py")
|
|
+ try:
|
|
+ source = resource_string("setuptools", "site-patch.py")
|
|
+ except FileNotFoundError:
|
|
+ source = resource_string("setuptools", "site-patch.py.txt")
|
|
source = source.decode('utf-8')
|
|
current = ""
|
|
|