1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
|
--- a/Modules/posixmodule.c (index)
+++ b/Modules/posixmodule.c (working tree)
@@ -288,6 +288,7 @@ corresponding Unix manual entries for more information on calls.");
#endif
#ifdef HAVE_GETRANDOM_SYSCALL
# include <sys/syscall.h>
+# include <sys/random.h>
#endif
#if defined(MS_WINDOWS)
--- a/Lib/doctest.py (index)
+++ b/Lib/doctest.py (working tree)
@@ -957,7 +957,7 @@ class DocTestFinder:
return module.__dict__ is object.__globals__
elif (inspect.ismethoddescriptor(object) or
inspect.ismethodwrapper(object)):
- if hasattr(object, '__objclass__'):
+ if hasattr(object, '__objclass__') and hasattr(object.__objclass__, '__module__'):
obj_mod = object.__objclass__.__module__
elif hasattr(object, '__module__'):
obj_mod = object.__module__
@@ -965,7 +965,10 @@ class DocTestFinder:
return True # [XX] no easy way to tell otherwise
return module.__name__ == obj_mod
elif inspect.isclass(object):
- return module.__name__ == object.__module__
+ try:
+ return module.__name__ == object.__module__
+ except:
+ return True
elif hasattr(object, '__module__'):
return module.__name__ == object.__module__
elif isinstance(object, property):
--- a/Lib/multiprocessing/popen_spawn_win32.py (index)
+++ b/Lib/multiprocessing/popen_spawn_win32.py (working tree)
@@ -65,5 +65,6 @@ class Popen(object):
env["__PYVENV_LAUNCHER__"] = sys.executable
else:
- env = None
+ env = os.environ.copy()
+ env['Y_PYTHON_ENTRY_POINT'] = ':main'
cmd = ' '.join('"%s"' % x for x in cmd)
--- a/Lib/multiprocessing/spawn.py (index)
+++ b/Lib/multiprocessing/spawn.py (working tree)
@@ -82,7 +82,7 @@ def get_command_line(**kwds):
'''
Returns prefix of command line used for spawning a child process
'''
- if getattr(sys, 'frozen', False):
+ if False and getattr(sys, 'frozen', False):
return ([sys.executable, '--multiprocessing-fork'] +
['%s=%r' % item for item in kwds.items()])
else:
--- a/Lib/multiprocessing/util.py (index)
+++ b/Lib/multiprocessing/util.py (working tree)
@@ -383,8 +383,11 @@ class ForkAwareThreadLock(object):
class ForkAwareLocal(threading.local):
- def __init__(self):
- register_after_fork(self, lambda obj : obj.__dict__.clear())
+ def __new__(cls):
+ self = threading.local.__new__(cls)
+ register_after_fork(self, lambda obj: obj.__dict__.clear())
+ return self
+
def __reduce__(self):
return type(self), ()
@@ -444,14 +447,26 @@ def _flush_std_streams():
# Start a program with only specified fds kept open
#
+
+def _env_list():
+ # Based on fork_exec in subprocess.py.
+ env = os.environ.copy()
+ env['Y_PYTHON_ENTRY_POINT'] = ':main'
+ env_list = []
+ for k, v in env.items():
+ if '=' not in k:
+ env_list.append(os.fsencode(k) + b'=' + os.fsencode(v))
+ return env_list
+
+
def spawnv_passfds(path, args, passfds):
import _posixsubprocess
import subprocess
passfds = tuple(sorted(map(int, passfds)))
errpipe_read, errpipe_write = os.pipe()
try:
return _posixsubprocess.fork_exec(
- args, [path], True, passfds, None, None,
+ args, [path], True, passfds, None, _env_list(),
-1, -1, -1, -1, -1, -1, errpipe_read, errpipe_write,
False, False, -1, None, None, None, -1, None,
subprocess._USE_VFORK)
--- a/Modules/_decimal/libmpdec/io.c (index)
+++ b/Modules/_decimal/libmpdec/io.c (working tree)
@@ -37,7 +37,7 @@
#include <stdlib.h>
#include <string.h>
-#include "io.h"
+#include "mpd_io.h"
#include "typearith.h"
--- a/Modules/_decimal/libmpdec/mpdecimal.h (index)
+++ b/Modules/_decimal/libmpdec/mpdecimal.h (working tree)
@@ -96,17 +96,17 @@ const char *mpd_version(void);
/* Configuration */
/******************************************************************************/
-#if defined(UNIVERSAL)
+#if 1
#if defined(CONFIG_64) || defined(CONFIG_32)
#error "cannot use CONFIG_64 or CONFIG_32 with UNIVERSAL."
#endif
- #if defined(__ppc__)
- #define CONFIG_32
- #define ANSI
- #elif defined(__ppc64__)
+ #if defined(__powerpc64__) || defined(_M_AMD64) || defined(__aarch64__)
#define CONFIG_64
#define ANSI
- #elif defined(__i386__)
+ #elif defined(__powerpc__)
+ #define CONFIG_32
+ #define ANSI
+ #elif defined(__i386__) || defined(_M_IX86)
#define CONFIG_32
#define ANSI
#elif defined(__x86_64__)
--- a/Modules/getpath.c (index)
+++ b/Modules/getpath.c (working tree)
@@ -1,3 +1,4 @@
+#define PYTHONPATH ":"
/* Return the initial module search path. */
#include "Python.h"
--- a/Modules/main.c (index)
+++ b/Modules/main.c (working tree)
@@ -51,6 +51,7 @@ pymain_init(const _PyArgv *args)
PyConfig config;
PyConfig_InitPythonConfig(&config);
+ config.pathconfig_warnings = 0; /* Suppress errors from getpath.c */
/* pass NULL as the config: config is read from command line arguments,
environment variables, configuration files */
--- a/Python/initconfig.c (index)
+++ b/Python/initconfig.c (working tree)
@@ -163,7 +163,7 @@ int Py_InspectFlag = 0; /* Needed to determine whether to exit at SystemExit */
int Py_OptimizeFlag = 0; /* Needed by compile.c */
int Py_NoSiteFlag = 0; /* Suppress 'import site' */
int Py_BytesWarningFlag = 0; /* Warn on str(bytes) and str(buffer) */
-int Py_FrozenFlag = 0; /* Needed by getpath.c */
+int Py_FrozenFlag = 1; /* Needed by getpath.c */
int Py_IgnoreEnvironmentFlag = 0; /* e.g. PYTHONPATH, PYTHONHOME */
int Py_DontWriteBytecodeFlag = 0; /* Suppress writing bytecode files (*.pyc) */
int Py_NoUserSiteDirectory = 0; /* for -s and site.py */
--- a/Python/import.c (index)
+++ b/Python/import.c (working tree)
@@ -2101,6 +2101,13 @@ init_importlib_external(PyInterpreterState *interp)
return -1;
}
Py_DECREF(value);
+
+ value = PyImport_ImportModule("__res");
+ if (value == NULL) {
+ return -1;
+ }
+ Py_DECREF(value);
+
return 0;
}
|
