Mercurial > cpython-lru_cache-weakref

comparison Python/pythonrun.c @ 40626:4aee3f672f77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged the int/long unification branch, by very crude means (sorry Thomas!). I banged on the code (beyond what's in that branch) to make fewer tests fail; the only tests that fail now are: test_descr -- can't pickle ints?! test_pickletools -- ??? test_socket -- See python.org/sf/1619659 test_sqlite -- ??? I'll deal with those later.
author Guido van Rossum <guido@python.org>
date Sun, 14 Jan 2007 03:31:43 +0000
parents cc992d75d5b3
children 6ebad2a6b990
comparison
equal deleted inserted replaced
40624:426f1d373cdd 40626:4aee3f672f77
58 static void initsigs(void); 58 static void initsigs(void);
59 static void call_sys_exitfunc(void); 59 static void call_sys_exitfunc(void);
60 static void call_ll_exitfuncs(void); 60 static void call_ll_exitfuncs(void);
61 extern void _PyUnicode_Init(void); 61 extern void _PyUnicode_Init(void);
62 extern void _PyUnicode_Fini(void); 62 extern void _PyUnicode_Fini(void);
63 extern int _PyLong_Init(void);
64 extern void PyLong_Fini(void);
63 65
64 #ifdef WITH_THREAD 66 #ifdef WITH_THREAD
65 extern void _PyGILState_Init(PyInterpreterState *, PyThreadState *); 67 extern void _PyGILState_Init(PyInterpreterState *, PyThreadState *);
66 extern void _PyGILState_Fini(void); 68 extern void _PyGILState_Fini(void);
67 #endif /* WITH_THREAD */ 69 #endif /* WITH_THREAD */
179 _Py_ReadyTypes(); 181 _Py_ReadyTypes();
180 182
181 if (!_PyFrame_Init()) 183 if (!_PyFrame_Init())
182 Py_FatalError("Py_Initialize: can't init frames"); 184 Py_FatalError("Py_Initialize: can't init frames");
183 185
184 if (!_PyInt_Init()) 186 if (!_PyLong_Init())
185 Py_FatalError("Py_Initialize: can't init ints"); 187 Py_FatalError("Py_Initialize: can't init longs");
186 188
187 _PyFloat_Init(); 189 _PyFloat_Init();
188 190
189 interp->modules = PyDict_New(); 191 interp->modules = PyDict_New();
190 if (interp->modules == NULL) 192 if (interp->modules == NULL)
451 PyCFunction_Fini(); 453 PyCFunction_Fini();
452 PyTuple_Fini(); 454 PyTuple_Fini();
453 PyList_Fini(); 455 PyList_Fini();
454 PySet_Fini(); 456 PySet_Fini();
455 PyString_Fini(); 457 PyString_Fini();
456 PyInt_Fini(); 458 PyLong_Fini();
457 PyFloat_Fini(); 459 PyFloat_Fini();
458 460
459 #ifdef Py_USING_UNICODE 461 #ifdef Py_USING_UNICODE
460 /* Cleanup Unicode implementation */ 462 /* Cleanup Unicode implementation */
461 _PyUnicode_Fini(); 463 _PyUnicode_Fini();