mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge Python 3.4.0rc1 release branch.

Browse source
This commit is contained in:
Larry Hastings 2014-02-11 00:15:46 -08:00
commit 3f99504c08
22 changed files with 198 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Include/moduleobject.h
View file

@ -25,6 +25,7 @@ PyAPI_FUNC(const char *) PyModule_GetFilename(PyObject *);
PyAPI_FUNC(PyObject *) PyModule_GetFilenameObject(PyObject *);
#ifndef Py_LIMITED_API
PyAPI_FUNC(void) _PyModule_Clear(PyObject *);
PyAPI_FUNC(void) _PyModule_ClearDict(PyObject *);
#endif
PyAPI_FUNC(struct PyModuleDef*) PyModule_GetDef(PyObject*);
PyAPI_FUNC(void*) PyModule_GetState(PyObject*);

2
Include/pystate.h
View file

@ -33,7 +33,6 @@ typedef struct _is {
int codecs_initialized;
int fscodec_initialized;
#ifdef HAVE_DLOPEN
int dlopenflags;
#endif
@ -41,6 +40,7 @@ typedef struct _is {
int tscdump;
#endif
PyObject *builtins_copy;
} PyInterpreterState;
#endif