python3: Update to 3.5.2
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
--- Python-3.5.0-orig/PC/getpathp.c 2015-09-21 13:41:19.698879500 +0300
|
||||
+++ Python-3.5.0/PC/getpathp.c 2015-09-21 13:41:30.111838100 +0300
|
||||
diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c
|
||||
--- Python-3.5.2-orig/PC/getpathp.c 2016-07-12 14:20:55.989800700 +0300
|
||||
+++ Python-3.5.2/PC/getpathp.c 2016-07-12 14:21:11.286800700 +0300
|
||||
@@ -104,10 +104,17 @@
|
||||
|
||||
# define USE_POSIX_PREFIX
|
||||
@@ -102,7 +102,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
|
||||
/* Load a PYTHONPATH value from the registry.
|
||||
Load from either HKEY_LOCAL_MACHINE or HKEY_CURRENT_USER.
|
||||
@@ -570,6 +653,9 @@
|
||||
@@ -573,6 +656,9 @@
|
||||
#ifdef USE_POSIX_PREFIX
|
||||
int pfound;
|
||||
#endif
|
||||
@@ -112,7 +112,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
|
||||
#ifdef MS_WINDOWS
|
||||
int skiphome, skipdefault;
|
||||
@@ -665,6 +751,16 @@
|
||||
@@ -668,6 +754,16 @@
|
||||
if (envpath && *envpath == '\0')
|
||||
envpath = NULL;
|
||||
|
||||
@@ -129,7 +129,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
#ifdef MS_WINDOWS
|
||||
/* Calculate zip archive path from DLL or exe path */
|
||||
if (wcscpy_s(zip_path, MAXPATHLEN+1, dllpath[0] ? dllpath : progpath))
|
||||
@@ -719,6 +815,9 @@
|
||||
@@ -722,6 +818,9 @@
|
||||
#ifdef USE_POSIX_PREFIX
|
||||
bufsz += wcslen(prefix) + 1;
|
||||
#endif
|
||||
@@ -139,7 +139,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
bufsz += wcslen(PYTHONPATH) + 1;
|
||||
bufsz += wcslen(argv0_path) + 1;
|
||||
#ifdef MS_WINDOWS
|
||||
@@ -768,6 +867,11 @@
|
||||
@@ -771,6 +870,11 @@
|
||||
buf = wcschr(buf, L'\0');
|
||||
*buf++ = DELIM;
|
||||
#endif
|
||||
@@ -151,7 +151,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
if (userpath) {
|
||||
if (wcscpy_s(buf, bufsz - (buf - module_search_path), userpath))
|
||||
Py_FatalError("buffer overflow in getpathp.c's calculate_path()");
|
||||
@@ -841,6 +945,17 @@
|
||||
@@ -844,6 +948,17 @@
|
||||
reduce(prefix);
|
||||
reduce(prefix);
|
||||
}
|
||||
@@ -169,7 +169,7 @@ diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c
|
||||
#endif
|
||||
if (*prefix==L'\0') {
|
||||
wchar_t lookBuf[MAXPATHLEN+1];
|
||||
@@ -910,7 +1025,13 @@
|
||||
@@ -913,7 +1028,13 @@
|
||||
wchar_t *
|
||||
Py_GetExecPrefix(void)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user