Sat Oct 30 15:23:21 CEST 2010

Author: martin.v.loewis
Date: Sat Oct 30 15:23:21 2010
New Revision: 85976

Log:
Remove _Py APIs. Provide explicit list of available
functions.


Modified:
   python/branches/pep-0384/Include/Python.h
   python/branches/pep-0384/Include/abstract.h
   python/branches/pep-0384/Include/bytearrayobject.h
   python/branches/pep-0384/Include/bytes_methods.h
   python/branches/pep-0384/Include/bytesobject.h
   python/branches/pep-0384/Include/ceval.h
   python/branches/pep-0384/Include/code.h
   python/branches/pep-0384/Include/codecs.h
   python/branches/pep-0384/Include/datetime.h
   python/branches/pep-0384/Include/dictobject.h
   python/branches/pep-0384/Include/dtoa.h
   python/branches/pep-0384/Include/eval.h
   python/branches/pep-0384/Include/fileobject.h
   python/branches/pep-0384/Include/floatobject.h
   python/branches/pep-0384/Include/import.h
   python/branches/pep-0384/Include/longobject.h
   python/branches/pep-0384/Include/modsupport.h
   python/branches/pep-0384/Include/moduleobject.h
   python/branches/pep-0384/Include/object.h
   python/branches/pep-0384/Include/pyctype.h
   python/branches/pep-0384/Include/pygetopt.h
   python/branches/pep-0384/Include/pymath.h
   python/branches/pep-0384/Include/pystate.h
   python/branches/pep-0384/Include/pystrtod.h
   python/branches/pep-0384/Include/pythonrun.h
   python/branches/pep-0384/Include/pytime.h
   python/branches/pep-0384/Include/setobject.h
   python/branches/pep-0384/Include/sliceobject.h
   python/branches/pep-0384/Include/sysmodule.h
   python/branches/pep-0384/Include/timefuncs.h
   python/branches/pep-0384/Include/traceback.h
   python/branches/pep-0384/Include/tupleobject.h
   python/branches/pep-0384/Include/ucnhash.h
   python/branches/pep-0384/Include/unicodeobject.h
   python/branches/pep-0384/Include/warnings.h
   python/branches/pep-0384/PC/python3.def

Modified: python/branches/pep-0384/Include/Python.h
==============================================================================

--- python/branches/pep-0384/Include/Python.h	(original)
+++ python/branches/pep-0384/Include/Python.h	Sat Oct 30 15:23:21 2010
@@ -130,18 +130,24 @@
 #endif
 
 /* _Py_Mangle is defined in compile.c */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name);
+#endif
 
 /* These functions live in main.c */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(wchar_t *) _Py_char2wchar(char *);
 PyAPI_FUNC(char*) _Py_wchar2char(const wchar_t *text);
 PyAPI_FUNC(FILE *) _Py_wfopen(const wchar_t *path, const wchar_t *mode);
+#endif
 
 /* These functions live in import.c */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(FILE*) _Py_fopen(PyObject *unicode, const char *mode);
 #ifdef HAVE_STAT
 int _Py_stat(PyObject *unicode, struct stat *statbuf);
 #endif
+#endif
 
 #ifdef __cplusplus
 }

Modified: python/branches/pep-0384/Include/abstract.h
==============================================================================
--- python/branches/pep-0384/Include/abstract.h	(original)
+++ python/branches/pep-0384/Include/abstract.h	Sat Oct 30 15:23:21 2010
@@ -387,7 +387,9 @@
      PyAPI_FUNC(Py_ssize_t) PyObject_Length(PyObject *o);
 #define PyObject_Length PyObject_Size
 
+#ifndef Py_LIMITED_API
      PyAPI_FUNC(Py_ssize_t) _PyObject_LengthHint(PyObject *o, Py_ssize_t);
+#endif
 
        /*
      Guess the size of object o using len(o) or o.__length_hint__().
@@ -765,9 +767,11 @@
      that can accept a char* naming integral's type.
        */
 
+#ifndef Py_LIMITED_API
      PyAPI_FUNC(PyObject *) _PyNumber_ConvertIntegralToInt(
          PyObject *integral,
          const char* error_format);
+#endif
 
        /*
     Returns the object converted to Py_ssize_t by going through
@@ -1057,11 +1061,13 @@
      Use __contains__ if possible, else _PySequence_IterSearch().
        */
 
+#ifndef Py_LIMITED_API
 #define PY_ITERSEARCH_COUNT    1
 #define PY_ITERSEARCH_INDEX    2
 #define PY_ITERSEARCH_CONTAINS 3
      PyAPI_FUNC(Py_ssize_t) _PySequence_IterSearch(PyObject *seq,
                                         PyObject *obj, int operation);
+#endif
     /*
       Iterate over seq.  Result depends on the operation:
       PY_ITERSEARCH_COUNT:  return # of times obj appears in seq; -1 if
@@ -1228,6 +1234,7 @@
       /* issubclass(object, typeorclass) */
 
 
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _PyObject_RealIsInstance(PyObject *inst, PyObject *cls);
 
 PyAPI_FUNC(int) _PyObject_RealIsSubclass(PyObject *derived, PyObject *cls);
@@ -1235,6 +1242,7 @@
 PyAPI_FUNC(char *const *) _PySequence_BytesToCharpArray(PyObject* self);
 
 PyAPI_FUNC(void) _Py_FreeCharPArray(char *const array[]);
+#endif
 
 #ifdef __cplusplus
 }

Modified: python/branches/pep-0384/Include/bytearrayobject.h
==============================================================================
--- python/branches/pep-0384/Include/bytearrayobject.h	(original)
+++ python/branches/pep-0384/Include/bytearrayobject.h	Sat Oct 30 15:23:21 2010
@@ -46,12 +46,14 @@
 PyAPI_FUNC(int) PyByteArray_Resize(PyObject *, Py_ssize_t);
 
 /* Macros, trading safety for speed */
+#ifndef Py_LIMITED_API
 #define PyByteArray_AS_STRING(self) \
     (assert(PyByteArray_Check(self)), \
      Py_SIZE(self) ? ((PyByteArrayObject *)(self))->ob_bytes : _PyByteArray_empty_string)
 #define PyByteArray_GET_SIZE(self)  (assert(PyByteArray_Check(self)),Py_SIZE(self))
 
 PyAPI_DATA(char) _PyByteArray_empty_string[];
+#endif
 
 #ifdef __cplusplus
 }

Modified: python/branches/pep-0384/Include/bytes_methods.h
==============================================================================
--- python/branches/pep-0384/Include/bytes_methods.h	(original)
+++ python/branches/pep-0384/Include/bytes_methods.h	Sat Oct 30 15:23:21 2010
@@ -1,3 +1,4 @@
+#ifndef Py_LIMITED_API
 #ifndef Py_BYTES_CTYPE_H
 #define Py_BYTES_CTYPE_H
 
@@ -77,3 +78,4 @@
 #define PyDoc_STRVAR_shared(name,str) const char name[] = PyDoc_STR(str)
 
 #endif /* !Py_BYTES_CTYPE_H */
+#endif /* !Py_LIMITED_API */

Modified: python/branches/pep-0384/Include/bytesobject.h
==============================================================================
--- python/branches/pep-0384/Include/bytesobject.h	(original)
+++ python/branches/pep-0384/Include/bytesobject.h	Sat Oct 30 15:23:21 2010
@@ -60,9 +60,11 @@
 PyAPI_FUNC(PyObject *) PyBytes_Repr(PyObject *, int);
 PyAPI_FUNC(void) PyBytes_Concat(PyObject **, PyObject *);
 PyAPI_FUNC(void) PyBytes_ConcatAndDel(PyObject **, PyObject *);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _PyBytes_Resize(PyObject **, Py_ssize_t);
 PyAPI_FUNC(PyObject *) _PyBytes_FormatLong(PyObject*, int, int,
 						  int, char**, int*);
+#endif
 PyAPI_FUNC(PyObject *) PyBytes_DecodeEscape(const char *, Py_ssize_t,
 						   const char *, Py_ssize_t,
 						   const char *);
@@ -76,7 +78,9 @@
 
 /* _PyBytes_Join(sep, x) is like sep.join(x).  sep must be PyBytesObject*,
    x must be an iterable object. */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) _PyBytes_Join(PyObject *sep, PyObject *x);
+#endif
 
 /* Provides access to the internal data buffer and size of a string
    object or the default encoded version of an Unicode object. Passing
@@ -94,7 +98,7 @@
 /* Using the current locale, insert the thousands grouping
    into the string pointed to by buffer.  For the argument descriptions,
    see Objects/stringlib/localeutil.h */
-
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(Py_ssize_t) _PyBytes_InsertThousandsGroupingLocale(char *buffer,
                                                    Py_ssize_t n_buffer,
                                                    char *digits,
@@ -111,6 +115,7 @@
                                                    Py_ssize_t min_width,
                                                    const char *grouping,
                                                    const char *thousands_sep);
+#endif
 
 /* Flags used by string formatting */
 #define F_LJUST (1<<0)

Modified: python/branches/pep-0384/Include/ceval.h
==============================================================================
--- python/branches/pep-0384/Include/ceval.h	(original)
+++ python/branches/pep-0384/Include/ceval.h	Sat Oct 30 15:23:21 2010
@@ -170,8 +170,10 @@
 PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate);
 PyAPI_FUNC(void) PyEval_ReInitThreads(void);
 
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(void) _PyEval_SetSwitchInterval(unsigned long microseconds);
 PyAPI_FUNC(unsigned long) _PyEval_GetSwitchInterval(void);
+#endif
 
 #define Py_BEGIN_ALLOW_THREADS { \
                         PyThreadState *_save; \
@@ -190,8 +192,10 @@
 
 #endif /* !WITH_THREAD */
 
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *);
 PyAPI_FUNC(void) _PyEval_SignalAsyncExc(void);
+#endif
 
 
 #ifdef __cplusplus

Modified: python/branches/pep-0384/Include/code.h
==============================================================================
--- python/branches/pep-0384/Include/code.h	(original)
+++ python/branches/pep-0384/Include/code.h	Sat Oct 30 15:23:21 2010
@@ -94,8 +94,10 @@
 /* Update *bounds to describe the first and one-past-the-last instructions in the
    same line as lasti.  Return the number of that line.
 */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _PyCode_CheckLineNumber(PyCodeObject* co,
                                         int lasti, PyAddrPair *bounds);
+#endif
 
 PyAPI_FUNC(PyObject*) PyCode_Optimize(PyObject *code, PyObject* consts,
                                       PyObject *names, PyObject *lineno_obj);

Modified: python/branches/pep-0384/Include/codecs.h
==============================================================================
--- python/branches/pep-0384/Include/codecs.h	(original)
+++ python/branches/pep-0384/Include/codecs.h	Sat Oct 30 15:23:21 2010
@@ -45,9 +45,11 @@
 
  */
 
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) _PyCodec_Lookup(
        const char *encoding
        );
+#endif
 
 /* Codec registry encoding check API.
 

Modified: python/branches/pep-0384/Include/datetime.h
==============================================================================
--- python/branches/pep-0384/Include/datetime.h	(original)
+++ python/branches/pep-0384/Include/datetime.h	Sat Oct 30 15:23:21 2010
@@ -1,6 +1,6 @@
 /*  datetime.h
  */
-
+#ifndef Py_LIMITED_API
 #ifndef DATETIME_H
 #define DATETIME_H
 #ifdef __cplusplus
@@ -234,3 +234,4 @@
 }
 #endif
 #endif
+#endif /* !Py_LIMITED_API */

Modified: python/branches/pep-0384/Include/dictobject.h
==============================================================================
--- python/branches/pep-0384/Include/dictobject.h	(original)
+++ python/branches/pep-0384/Include/dictobject.h	Sat Oct 30 15:23:21 2010
@@ -117,18 +117,22 @@
 PyAPI_FUNC(void) PyDict_Clear(PyObject *mp);
 PyAPI_FUNC(int) PyDict_Next(
     PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _PyDict_Next(
     PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value, long *hash);
+#endif
 PyAPI_FUNC(PyObject *) PyDict_Keys(PyObject *mp);
 PyAPI_FUNC(PyObject *) PyDict_Values(PyObject *mp);
 PyAPI_FUNC(PyObject *) PyDict_Items(PyObject *mp);
 PyAPI_FUNC(Py_ssize_t) PyDict_Size(PyObject *mp);
 PyAPI_FUNC(PyObject *) PyDict_Copy(PyObject *mp);
 PyAPI_FUNC(int) PyDict_Contains(PyObject *mp, PyObject *key);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _PyDict_Contains(PyObject *mp, PyObject *key, long hash);
 PyAPI_FUNC(PyObject *) _PyDict_NewPresized(Py_ssize_t minused);
 PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp);
 PyAPI_FUNC(int) _PyDict_HasOnlyStringKeys(PyObject *mp);
+#endif
 
 /* PyDict_Update(mp, other) is equivalent to PyDict_Merge(mp, other, 1). */
 PyAPI_FUNC(int) PyDict_Update(PyObject *mp, PyObject *other);

Modified: python/branches/pep-0384/Include/dtoa.h
==============================================================================
--- python/branches/pep-0384/Include/dtoa.h	(original)
+++ python/branches/pep-0384/Include/dtoa.h	Sat Oct 30 15:23:21 2010
@@ -1,3 +1,4 @@
+#ifndef Py_LIMITED_API
 #ifndef PY_NO_SHORT_FLOAT_REPR
 #ifdef __cplusplus
 extern "C" {
@@ -13,3 +14,4 @@
 }
 #endif
 #endif
+#endif

Modified: python/branches/pep-0384/Include/eval.h
==============================================================================
--- python/branches/pep-0384/Include/eval.h	(original)
+++ python/branches/pep-0384/Include/eval.h	Sat Oct 30 15:23:21 2010
@@ -17,7 +17,9 @@
 					PyObject **defs, int defc,
 					PyObject *kwdefs, PyObject *closure);
 
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) _PyEval_CallTracing(PyObject *func, PyObject *args);
+#endif
 
 #ifdef __cplusplus
 }

Modified: python/branches/pep-0384/Include/fileobject.h
==============================================================================
--- python/branches/pep-0384/Include/fileobject.h	(original)
+++ python/branches/pep-0384/Include/fileobject.h	Sat Oct 30 15:23:21 2010
@@ -23,12 +23,15 @@
 */
 PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding;
 PyAPI_DATA(int) Py_HasFileSystemDefaultEncoding;
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _Py_SetFileSystemEncoding(PyObject *);
+#endif
 
 /* Internal API
 
    The std printer acts as a preliminary sys.stderr until the new io
    infrastructure is in place. */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) PyFile_NewStdPrinter(int);
 PyAPI_DATA(PyTypeObject) PyStdPrinter_Type;
 
@@ -42,6 +45,7 @@
 #else
 #define _PyVerify_fd(A) (1) /* dummy */
 #endif
+#endif /* Py_LIMITED_API */
 
 #ifdef __cplusplus
 }

Modified: python/branches/pep-0384/Include/floatobject.h
==============================================================================
--- python/branches/pep-0384/Include/floatobject.h	(original)
+++ python/branches/pep-0384/Include/floatobject.h	Sat Oct 30 15:23:21 2010
@@ -51,6 +51,7 @@
 #define PyFloat_AS_DOUBLE(op) (((PyFloatObject *)(op))->ob_fval)
 #endif
 
+#ifndef Py_LIMITED_API
 /* _PyFloat_{Pack,Unpack}{4,8}
  *
  * The struct and pickle (at least) modules need an efficient platform-
@@ -111,11 +112,10 @@
 
 /* Format the object based on the format_spec, as defined in PEP 3101
    (Advanced String Formatting). */
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) _PyFloat_FormatAdvanced(PyObject *obj,
 					       Py_UNICODE *format_spec,
 					       Py_ssize_t format_spec_len);
-#endif
+#endif /* Py_LIMITED_API */
 
 #ifdef __cplusplus
 }

Modified: python/branches/pep-0384/Include/import.h
==============================================================================
--- python/branches/pep-0384/Include/import.h	(original)
+++ python/branches/pep-0384/Include/import.h	Sat Oct 30 15:23:21 2010
@@ -30,6 +30,7 @@
 PyAPI_FUNC(void) PyImport_Cleanup(void);
 PyAPI_FUNC(int) PyImport_ImportFrozenModule(char *);
 
+#ifndef Py_LIMITED_API
 #ifdef WITH_THREAD
 PyAPI_FUNC(void) _PyImport_AcquireLock(void);
 PyAPI_FUNC(int) _PyImport_ReleaseLock(void);
@@ -43,14 +44,13 @@
 PyAPI_FUNC(PyObject *)_PyImport_FindExtension(char *, char *);
 PyAPI_FUNC(int)_PyImport_FixupExtension(PyObject*, char *, char *);
 
-#ifndef Py_LIMITED_API
 struct _inittab {
     char *name;
     PyObject* (*initfunc)(void);
 };
 PyAPI_DATA(struct _inittab *) PyImport_Inittab;
 PyAPI_FUNC(int) PyImport_ExtendInittab(struct _inittab *newtab);
-#endif
+#endif /* Py_LIMITED_API */
 
 PyAPI_DATA(PyTypeObject) PyNullImporter_Type;
 

Modified: python/branches/pep-0384/Include/longobject.h
==============================================================================
--- python/branches/pep-0384/Include/longobject.h	(original)
+++ python/branches/pep-0384/Include/longobject.h	Sat Oct 30 15:23:21 2010
@@ -59,7 +59,9 @@
 #endif /* SIZEOF_PID_T */
 
 /* Used by Python/mystrtoul.c. */
+#ifndef Py_LIMITED_API
 PyAPI_DATA(unsigned char) _PyLong_DigitValue[256];
+#endif
 
 /* _PyLong_Frexp returns a double x and an exponent e such that the
    true value is approximately equal to x * 2**e.  e is >= 0.  x is
@@ -67,7 +69,9 @@
    zeroes); otherwise, 0.5 <= abs(x) < 1.0.  On overflow, which is
    possible if the number of bits doesn't fit into a Py_ssize_t, sets
    OverflowError and returns -1.0 for x, 0 for e. */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(double) _PyLong_Frexp(PyLongObject *a, Py_ssize_t *e);
+#endif
 
 PyAPI_FUNC(double) PyLong_AsDouble(PyObject *);
 PyAPI_FUNC(PyObject *) PyLong_FromVoidPtr(void *);
@@ -87,6 +91,7 @@
 PyAPI_FUNC(PyObject *) PyLong_FromUnicode(Py_UNICODE*, Py_ssize_t, int);
 #endif
 
+#ifndef Py_LIMITED_API
 /* _PyLong_Sign.  Return 0 if v is 0, -1 if v < 0, +1 if v > 0.
    v must not be NULL, and must be a normalized long.
    There are no error cases.
@@ -158,11 +163,10 @@
 
 /* Format the object based on the format_spec, as defined in PEP 3101
    (Advanced String Formatting). */
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) _PyLong_FormatAdvanced(PyObject *obj,
 					      Py_UNICODE *format_spec,
 					      Py_ssize_t format_spec_len);
-#endif
+#endif /* Py_LIMITED_API */
 
 /* These aren't really part of the long object, but they're handy. The
    functions are in Python/mystrtoul.c.

Modified: python/branches/pep-0384/Include/modsupport.h
==============================================================================
--- python/branches/pep-0384/Include/modsupport.h	(original)
+++ python/branches/pep-0384/Include/modsupport.h	Sat Oct 30 15:23:21 2010
@@ -31,7 +31,9 @@
 PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, const char *, Py_ssize_t, Py_ssize_t, ...);
 PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...);
 PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kw);
+#endif
 
 PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list);
 PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *,
@@ -105,7 +107,9 @@
 #define PyModule_Create(module) \
 	PyModule_Create2(module, PYTHON_API_VERSION)
 
+#ifndef Py_LIMITED_API
 PyAPI_DATA(char *) _Py_PackageContext;
+#endif
 
 #ifdef __cplusplus
 }

Modified: python/branches/pep-0384/Include/moduleobject.h
==============================================================================
--- python/branches/pep-0384/Include/moduleobject.h	(original)
+++ python/branches/pep-0384/Include/moduleobject.h	Sat Oct 30 15:23:21 2010
@@ -17,7 +17,9 @@
 PyAPI_FUNC(const char *) PyModule_GetName(PyObject *);
 PyAPI_FUNC(const char *) PyModule_GetFilename(PyObject *);
 PyAPI_FUNC(PyObject *) PyModule_GetFilenameObject(PyObject *);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(void) _PyModule_Clear(PyObject *);
+#endif
 PyAPI_FUNC(struct PyModuleDef*) PyModule_GetDef(PyObject*);
 PyAPI_FUNC(void*) PyModule_GetState(PyObject*);
 

Modified: python/branches/pep-0384/Include/object.h
==============================================================================
--- python/branches/pep-0384/Include/object.h	(original)
+++ python/branches/pep-0384/Include/object.h	Sat Oct 30 15:23:21 2010
@@ -445,17 +445,19 @@
 PyAPI_FUNC(PyObject *) PyType_GenericAlloc(PyTypeObject *, Py_ssize_t);
 PyAPI_FUNC(PyObject *) PyType_GenericNew(PyTypeObject *,
                                                PyObject *, PyObject *);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *);
 PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, char *, PyObject **);
+#endif
 PyAPI_FUNC(unsigned int) PyType_ClearCache(void);
 PyAPI_FUNC(void) PyType_Modified(PyTypeObject *);
 
 /* Generic operations on objects */
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int);
-#endif
 PyAPI_FUNC(void) _Py_BreakPoint(void);
 PyAPI_FUNC(void) _PyObject_Dump(PyObject *);
+#endif
 PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *);
 PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *);
 PyAPI_FUNC(PyObject *) PyObject_ASCII(PyObject *);
@@ -468,9 +470,13 @@
 PyAPI_FUNC(PyObject *) PyObject_GetAttr(PyObject *, PyObject *);
 PyAPI_FUNC(int) PyObject_SetAttr(PyObject *, PyObject *, PyObject *);
 PyAPI_FUNC(int) PyObject_HasAttr(PyObject *, PyObject *);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *);
+#endif
 PyAPI_FUNC(PyObject *) PyObject_SelfIter(PyObject *);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) _PyObject_NextNotImplemented(PyObject *);
+#endif
 PyAPI_FUNC(PyObject *) PyObject_GenericGetAttr(PyObject *, PyObject *);
 PyAPI_FUNC(int) PyObject_GenericSetAttr(PyObject *,
                                               PyObject *, PyObject *);
@@ -496,8 +502,10 @@
 PyAPI_FUNC(void) Py_ReprLeave(PyObject *);
 
 /* Helpers for hash functions */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(long) _Py_HashDouble(double);
 PyAPI_FUNC(long) _Py_HashPointer(void*);
+#endif
 
 /* Helper for passing objects to printf and the like */
 #define PyObject_REPR(obj) _PyUnicode_AsString(PyObject_Repr(obj))

Modified: python/branches/pep-0384/Include/pyctype.h
==============================================================================
--- python/branches/pep-0384/Include/pyctype.h	(original)
+++ python/branches/pep-0384/Include/pyctype.h	Sat Oct 30 15:23:21 2010
@@ -1,3 +1,4 @@
+#ifndef Py_LIMITED_API
 #ifndef PYCTYPE_H
 #define PYCTYPE_H
 
@@ -29,3 +30,4 @@
 #define Py_TOUPPER(c) (_Py_ctype_toupper[Py_CHARMASK(c)])
 
 #endif /* !PYCTYPE_H */
+#endif /* !Py_LIMITED_API */

Modified: python/branches/pep-0384/Include/pygetopt.h
==============================================================================
--- python/branches/pep-0384/Include/pygetopt.h	(original)
+++ python/branches/pep-0384/Include/pygetopt.h	Sat Oct 30 15:23:21 2010
@@ -5,9 +5,11 @@
 extern "C" {
 #endif
 
+#ifndef Py_LIMITED_API
 PyAPI_DATA(int) _PyOS_opterr;
 PyAPI_DATA(int) _PyOS_optind;
 PyAPI_DATA(wchar_t *) _PyOS_optarg;
+#endif
 
 PyAPI_FUNC(int) _PyOS_GetOpt(int argc, wchar_t **argv, wchar_t *optstring);
 

Modified: python/branches/pep-0384/Include/pymath.h
==============================================================================
--- python/branches/pep-0384/Include/pymath.h	(original)
+++ python/branches/pep-0384/Include/pymath.h	Sat Oct 30 15:23:21 2010
@@ -67,6 +67,7 @@
    nothing. */
 
 /* we take double rounding as evidence of x87 usage */
+#ifndef Py_LIMITED_API
 #ifndef Py_FORCE_DOUBLE
 #  ifdef X87_DOUBLE_ROUNDING
 PyAPI_FUNC(double) _Py_force_double(double);
@@ -75,11 +76,14 @@
 #    define Py_FORCE_DOUBLE(X) (X)
 #  endif
 #endif
+#endif
 
+#ifndef Py_LIMITED_API
 #ifdef HAVE_GCC_ASM_FOR_X87
 PyAPI_FUNC(unsigned short) _Py_get_387controlword(void);
 PyAPI_FUNC(void) _Py_set_387controlword(unsigned short);
 #endif
+#endif
 
 /* Py_IS_NAN(X)
  * Return 1 if float or double arg is a NaN, else 0.

Modified: python/branches/pep-0384/Include/pystate.h
==============================================================================
--- python/branches/pep-0384/Include/pystate.h	(original)
+++ python/branches/pep-0384/Include/pystate.h	Sat Oct 30 15:23:21 2010
@@ -202,19 +202,25 @@
 /* The implementation of sys._current_frames()  Returns a dict mapping
    thread id to that thread's current frame.
 */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) _PyThread_CurrentFrames(void);
+#endif
 
 /* Routines for advanced debuggers, requested by David Beazley.
    Don't use unless you know what you are doing! */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Head(void);
 PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Next(PyInterpreterState *);
 PyAPI_FUNC(PyThreadState *) PyInterpreterState_ThreadHead(PyInterpreterState *);
 PyAPI_FUNC(PyThreadState *) PyThreadState_Next(PyThreadState *);
+#endif
 
 typedef struct _frame *(*PyThreadFrameGetter)(PyThreadState *self_);
 
 /* hook for PyEval_GetFrame(), requested for Psyco */
+#ifndef Py_LIMITED_API
 PyAPI_DATA(PyThreadFrameGetter) _PyThreadState_GetFrame;
+#endif
 
 #ifdef __cplusplus
 }

Modified: python/branches/pep-0384/Include/pystrtod.h
==============================================================================
--- python/branches/pep-0384/Include/pystrtod.h	(original)
+++ python/branches/pep-0384/Include/pystrtod.h	Sat Oct 30 15:23:21 2010
@@ -18,7 +18,9 @@
                                          int flags,
                                          int *type);
 
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(double) _Py_parse_inf_or_nan(const char *p, char **endptr);
+#endif
 
 
 /* PyOS_double_to_string's "flags" parameter can be set to 0 or more of: */

Modified: python/branches/pep-0384/Include/pythonrun.h
==============================================================================
--- python/branches/pep-0384/Include/pythonrun.h	(original)
+++ python/branches/pep-0384/Include/pythonrun.h	Sat Oct 30 15:23:21 2010
@@ -89,15 +89,17 @@
 /* Py_PyAtExit is for the atexit module, Py_AtExit is for low-level
  * exit functions.
  */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(void) _Py_PyAtExit(void (*func)(void));
+#endif
 PyAPI_FUNC(int) Py_AtExit(void (*func)(void));
 
 PyAPI_FUNC(void) Py_Exit(int);
 
 /* Restore signals that the interpreter has called SIG_IGN on to SIG_DFL. */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(void) _Py_RestoreSignals(void);
 
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *);
 #endif
 
@@ -137,11 +139,14 @@
 PyAPI_FUNC(const char *) Py_GetCopyright(void);
 PyAPI_FUNC(const char *) Py_GetCompiler(void);
 PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(const char *) _Py_svnversion(void);
 PyAPI_FUNC(const char *) Py_SubversionRevision(void);
 PyAPI_FUNC(const char *) Py_SubversionShortBranch(void);
+#endif
 
 /* Internal -- various one-time initializations */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void);
 PyAPI_FUNC(PyObject *) _PySys_Init(void);
 PyAPI_FUNC(void) _PyImport_Init(void);
@@ -150,8 +155,10 @@
 PyAPI_FUNC(int) _PyFrame_Init(void);
 PyAPI_FUNC(void) _PyFloat_Init(void);
 PyAPI_FUNC(int) PyByteArray_Init(void);
+#endif
 
 /* Various internal finalizers */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(void) _PyExc_Fini(void);
 PyAPI_FUNC(void) _PyImport_Fini(void);
 PyAPI_FUNC(void) PyMethod_Fini(void);
@@ -166,6 +173,7 @@
 PyAPI_FUNC(void) PyFloat_Fini(void);
 PyAPI_FUNC(void) PyOS_FiniInterrupts(void);
 PyAPI_FUNC(void) _PyGC_Fini(void);
+#endif
 
 /* Stuff with no proper home (yet) */
 #ifndef Py_LIMITED_API
@@ -173,7 +181,9 @@
 #endif
 PyAPI_DATA(int) (*PyOS_InputHook)(void);
 PyAPI_DATA(char) *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *, char *);
+#ifndef Py_LIMITED_API
 PyAPI_DATA(PyThreadState*) _PyOS_ReadlineTState;
+#endif
 
 /* Stack size, in "pointers" (so we get extra safety margins
    on 64-bit platforms).  On a 32-bit platform, this translates

Modified: python/branches/pep-0384/Include/pytime.h
==============================================================================
--- python/branches/pep-0384/Include/pytime.h	(original)
+++ python/branches/pep-0384/Include/pytime.h	Sat Oct 30 15:23:21 2010
@@ -1,3 +1,4 @@
+#ifndef Py_LIMITED_API
 #ifndef Py_PYTIME_H
 #define Py_PYTIME_H
 
@@ -33,3 +34,4 @@
 #endif
 
 #endif /* Py_PYTIME_H */
+#endif /* Py_LIMITED_API */

Modified: python/branches/pep-0384/Include/setobject.h
==============================================================================
--- python/branches/pep-0384/Include/setobject.h	(original)
+++ python/branches/pep-0384/Include/setobject.h	Sat Oct 30 15:23:21 2010
@@ -96,9 +96,13 @@
 PyAPI_FUNC(int) PySet_Contains(PyObject *anyset, PyObject *key);
 PyAPI_FUNC(int) PySet_Discard(PyObject *set, PyObject *key);
 PyAPI_FUNC(int) PySet_Add(PyObject *set, PyObject *key);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key, long *hash);
+#endif
 PyAPI_FUNC(PyObject *) PySet_Pop(PyObject *set);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _PySet_Update(PyObject *set, PyObject *iterable);
+#endif
 
 #ifdef __cplusplus
 }

Modified: python/branches/pep-0384/Include/sliceobject.h
==============================================================================
--- python/branches/pep-0384/Include/sliceobject.h	(original)
+++ python/branches/pep-0384/Include/sliceobject.h	Sat Oct 30 15:23:21 2010
@@ -32,7 +32,9 @@
 
 PyAPI_FUNC(PyObject *) PySlice_New(PyObject* start, PyObject* stop,
                                   PyObject* step);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) _PySlice_FromIndices(Py_ssize_t start, Py_ssize_t stop);
+#endif
 PyAPI_FUNC(int) PySlice_GetIndices(PyObject *r, Py_ssize_t length,
                                   Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
 PyAPI_FUNC(int) PySlice_GetIndicesEx(PyObject *r, Py_ssize_t length,

Modified: python/branches/pep-0384/Include/sysmodule.h
==============================================================================
--- python/branches/pep-0384/Include/sysmodule.h	(original)
+++ python/branches/pep-0384/Include/sysmodule.h	Sat Oct 30 15:23:21 2010
@@ -20,7 +20,9 @@
 PyAPI_FUNC(void) PySys_FormatStdout(const char *format, ...);
 PyAPI_FUNC(void) PySys_FormatStderr(const char *format, ...);
 
+#ifndef Py_LIMITED_API
 PyAPI_DATA(PyObject *) _PySys_TraceFunc, *_PySys_ProfileFunc;
+#endif
 
 PyAPI_FUNC(void) PySys_ResetWarnOptions(void);
 PyAPI_FUNC(void) PySys_AddWarnOption(const wchar_t *);

Modified: python/branches/pep-0384/Include/timefuncs.h
==============================================================================
--- python/branches/pep-0384/Include/timefuncs.h	(original)
+++ python/branches/pep-0384/Include/timefuncs.h	Sat Oct 30 15:23:21 2010
@@ -14,7 +14,9 @@
  * to fit in a time_t.  ValueError is set on return iff the return
  * value is (time_t)-1 and PyErr_Occurred().
  */
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(time_t) _PyTime_DoubleToTimet(double x);
+#endif
 
 
 #ifdef __cplusplus

Modified: python/branches/pep-0384/Include/traceback.h
==============================================================================
--- python/branches/pep-0384/Include/traceback.h	(original)
+++ python/branches/pep-0384/Include/traceback.h	Sat Oct 30 15:23:21 2010
@@ -20,7 +20,9 @@
 
 PyAPI_FUNC(int) PyTraceBack_Here(struct _frame *);
 PyAPI_FUNC(int) PyTraceBack_Print(PyObject *, PyObject *);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _Py_DisplaySourceLine(PyObject *, PyObject *, int, int);
+#endif
 
 /* Reveal traceback type so we can typecheck traceback objects */
 PyAPI_DATA(PyTypeObject) PyTraceBack_Type;

Modified: python/branches/pep-0384/Include/tupleobject.h
==============================================================================
--- python/branches/pep-0384/Include/tupleobject.h	(original)
+++ python/branches/pep-0384/Include/tupleobject.h	Sat Oct 30 15:23:21 2010
@@ -45,9 +45,13 @@
 PyAPI_FUNC(PyObject *) PyTuple_GetItem(PyObject *, Py_ssize_t);
 PyAPI_FUNC(int) PyTuple_SetItem(PyObject *, Py_ssize_t, PyObject *);
 PyAPI_FUNC(PyObject *) PyTuple_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _PyTuple_Resize(PyObject **, Py_ssize_t);
+#endif
 PyAPI_FUNC(PyObject *) PyTuple_Pack(Py_ssize_t, ...);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject *);
+#endif
 
 /* Macro, trading safety for speed */
 #ifndef Py_LIMITED_API

Modified: python/branches/pep-0384/Include/ucnhash.h
==============================================================================
--- python/branches/pep-0384/Include/ucnhash.h	(original)
+++ python/branches/pep-0384/Include/ucnhash.h	Sat Oct 30 15:23:21 2010
@@ -1,5 +1,5 @@
 /* Unicode name database interface */
-
+#ifndef Py_LIMITED_API
 #ifndef Py_UCNHASH_H
 #define Py_UCNHASH_H
 #ifdef __cplusplus
@@ -31,3 +31,4 @@
 }
 #endif
 #endif /* !Py_UCNHASH_H */
+#endif /* !Py_LIMITED_API */

Modified: python/branches/pep-0384/Include/unicodeobject.h
==============================================================================
--- python/branches/pep-0384/Include/unicodeobject.h	(original)
+++ python/branches/pep-0384/Include/unicodeobject.h	Sat Oct 30 15:23:21 2010
@@ -579,7 +579,9 @@
 PyAPI_FUNC(void) PyUnicode_InternInPlace(PyObject **);
 PyAPI_FUNC(void) PyUnicode_InternImmortal(PyObject **);
 PyAPI_FUNC(PyObject *) PyUnicode_InternFromString(const char *);
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(void) _Py_ReleaseInternedUnicodeStrings(void);
+#endif
 
 /* Use only if you know it's a string */
 #define PyUnicode_CHECK_INTERNED(op) (((PyUnicodeObject *)(op))->state)
@@ -675,9 +677,11 @@
 
 */
 
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) _PyUnicode_AsDefaultEncodedString(
     PyObject *unicode,
     const char *errors);
+#endif
 
 /* Returns a pointer to the default encoding (normally, UTF-8) of the
    Unicode object unicode and the size of the encoded representation
@@ -693,9 +697,11 @@
 
 */
 
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(char *) _PyUnicode_AsStringAndSize(
     PyObject *unicode,
     Py_ssize_t *size);
+#endif
 
 /* Returns a pointer to the default encoding (normally, UTf-8) of the
    Unicode object unicode.
@@ -711,7 +717,9 @@
 
 */
 
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(char *) _PyUnicode_AsString(PyObject *unicode);
+#endif
 
 /* Returns the currently active default encoding.
 
@@ -1059,11 +1067,13 @@
 
     Only for internal use in _codecsmodule.c */
 
+#ifndef Py_LIMITED_API
 PyObject *_PyUnicode_DecodeUnicodeInternal(
     const char *string,
     Py_ssize_t length,
     const char *errors
     );
+#endif
 
 /* --- Latin-1 Codecs -----------------------------------------------------
 
@@ -1544,6 +1554,7 @@
 
 /* Helper array used by Py_UNICODE_ISSPACE(). */
 
+#ifndef Py_LIMITED_API
 PyAPI_DATA(const unsigned char) _Py_ascii_whitespace[];
 
 /* These should not be used directly. Use the Py_UNICODE_IS* and
@@ -1625,7 +1636,6 @@
     Py_UCS4 ch       /* Unicode character */
     );
 
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(size_t) Py_UNICODE_strlen(
     const Py_UNICODE *u
     );
@@ -1659,7 +1669,7 @@
     const Py_UNICODE *s,
     Py_UNICODE c
     );
-#endif
+#endif /* Py_LIMITED_API */
 
 #ifdef __cplusplus
 }

Modified: python/branches/pep-0384/Include/warnings.h
==============================================================================
--- python/branches/pep-0384/Include/warnings.h	(original)
+++ python/branches/pep-0384/Include/warnings.h	Sat Oct 30 15:23:21 2010
@@ -4,7 +4,9 @@
 extern "C" {
 #endif
 
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject*) _PyWarnings_Init(void);
+#endif
 
 PyAPI_FUNC(int) PyErr_WarnEx(PyObject *, const char *, Py_ssize_t);
 PyAPI_FUNC(int) PyErr_WarnFormat(PyObject *, Py_ssize_t, const char *, ...);
@@ -12,7 +14,9 @@
                                     const char *, PyObject *);
 
 /* DEPRECATED: Use PyErr_WarnEx() instead. */
+#ifndef Py_LIMITED_API
 #define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1)
+#endif
 
 #ifdef __cplusplus
 }

Modified: python/branches/pep-0384/PC/python3.def
==============================================================================
--- python/branches/pep-0384/PC/python3.def	(original)
+++ python/branches/pep-0384/PC/python3.def	Sat Oct 30 15:23:21 2010
@@ -1,3 +1,695 @@
 LIBRARY	"python3"
 EXPORTS
+  PyArg_Parse=python32.PyArg_Parse
+  PyArg_ParseTuple=python32.PyArg_ParseTuple
+  PyArg_ParseTupleAndKeywords=python32.PyArg_ParseTupleAndKeywords
+  PyArg_UnpackTuple=python32.PyArg_UnpackTuple
+  PyArg_VaParse=python32.PyArg_VaParse
+  PyArg_VaParseTupleAndKeywords=python32.PyArg_VaParseTupleAndKeywords
+  PyArg_ValidateKeywordArguments=python32.PyArg_ValidateKeywordArguments
+  PyBaseObject_Type=python32.PyBaseObject_Type
+  PyBool_FromLong=python32.PyBool_FromLong
+  PyBool_Type=python32.PyBool_Type
+  PyBuffer_FillContiguousStrides=python32.PyBuffer_FillContiguousStrides
+  PyBuffer_FillInfo=python32.PyBuffer_FillInfo
+  PyBuffer_FromContiguous=python32.PyBuffer_FromContiguous
+  PyBuffer_GetPointer=python32.PyBuffer_GetPointer
+  PyBuffer_IsContiguous=python32.PyBuffer_IsContiguous
+  PyBuffer_Release=python32.PyBuffer_Release
+  PyBuffer_ToContiguous=python32.PyBuffer_ToContiguous
+  PyByteArrayIter_Type=python32.PyByteArrayIter_Type
+  PyByteArray_AsString=python32.PyByteArray_AsString
+  PyByteArray_Concat=python32.PyByteArray_Concat
+  PyByteArray_FromObject=python32.PyByteArray_FromObject
+  PyByteArray_FromStringAndSize=python32.PyByteArray_FromStringAndSize
+  PyByteArray_Resize=python32.PyByteArray_Resize
+  PyByteArray_Size=python32.PyByteArray_Size
+  PyByteArray_Type=python32.PyByteArray_Type
+  PyBytesIter_Type=python32.PyBytesIter_Type
+  PyBytes_AsString=python32.PyBytes_AsString
+  PyBytes_AsStringAndSize=python32.PyBytes_AsStringAndSize
+  PyBytes_Concat=python32.PyBytes_Concat
+  PyBytes_ConcatAndDel=python32.PyBytes_ConcatAndDel
+  PyBytes_DecodeEscape=python32.PyBytes_DecodeEscape
+  PyBytes_FromFormat=python32.PyBytes_FromFormat
+  PyBytes_FromFormatV=python32.PyBytes_FromFormatV
+  PyBytes_FromObject=python32.PyBytes_FromObject
+  PyBytes_FromString=python32.PyBytes_FromString
+  PyBytes_FromStringAndSize=python32.PyBytes_FromStringAndSize
+  PyBytes_Repr=python32.PyBytes_Repr
+  PyBytes_Size=python32.PyBytes_Size
+  PyBytes_Type=python32.PyBytes_Type
+  PyCFunction_Call=python32.PyCFunction_Call
+  PyCFunction_ClearFreeList=python32.PyCFunction_ClearFreeList
+  PyCFunction_GetFlags=python32.PyCFunction_GetFlags
+  PyCFunction_GetFunction=python32.PyCFunction_GetFunction
+  PyCFunction_GetSelf=python32.PyCFunction_GetSelf
+  PyCFunction_NewEx=python32.PyCFunction_NewEx
+  PyCFunction_Type=python32.PyCFunction_Type
+  PyCallIter_New=python32.PyCallIter_New
+  PyCallIter_Type=python32.PyCallIter_Type
+  PyCallable_Check=python32.PyCallable_Check
+  PyCapsule_GetContext=python32.PyCapsule_GetContext
+  PyCapsule_GetDestructor=python32.PyCapsule_GetDestructor
+  PyCapsule_GetName=python32.PyCapsule_GetName
+  PyCapsule_GetPointer=python32.PyCapsule_GetPointer
+  PyCapsule_Import=python32.PyCapsule_Import
+  PyCapsule_IsValid=python32.PyCapsule_IsValid
+  PyCapsule_New=python32.PyCapsule_New
+  PyCapsule_SetContext=python32.PyCapsule_SetContext
+  PyCapsule_SetDestructor=python32.PyCapsule_SetDestructor
+  PyCapsule_SetName=python32.PyCapsule_SetName
+  PyCapsule_SetPointer=python32.PyCapsule_SetPointer
+  PyCapsule_Type=python32.PyCapsule_Type
+  PyClassMethodDescr_Type=python32.PyClassMethodDescr_Type
+  PyCodec_BackslashReplaceErrors=python32.PyCodec_BackslashReplaceErrors
+  PyCodec_Decode=python32.PyCodec_Decode
+  PyCodec_Decoder=python32.PyCodec_Decoder
+  PyCodec_Encode=python32.PyCodec_Encode
+  PyCodec_Encoder=python32.PyCodec_Encoder
+  PyCodec_IgnoreErrors=python32.PyCodec_IgnoreErrors
+  PyCodec_IncrementalDecoder=python32.PyCodec_IncrementalDecoder
+  PyCodec_IncrementalEncoder=python32.PyCodec_IncrementalEncoder
+  PyCodec_KnownEncoding=python32.PyCodec_KnownEncoding
+  PyCodec_LookupError=python32.PyCodec_LookupError
+  PyCodec_Register=python32.PyCodec_Register
+  PyCodec_RegisterError=python32.PyCodec_RegisterError
+  PyCodec_ReplaceErrors=python32.PyCodec_ReplaceErrors
+  PyCodec_StreamReader=python32.PyCodec_StreamReader
+  PyCodec_StreamWriter=python32.PyCodec_StreamWriter
+  PyCodec_StrictErrors=python32.PyCodec_StrictErrors
+  PyCodec_XMLCharRefReplaceErrors=python32.PyCodec_XMLCharRefReplaceErrors
+  PyComplex_FromDoubles=python32.PyComplex_FromDoubles
+  PyComplex_ImagAsDouble=python32.PyComplex_ImagAsDouble
+  PyComplex_RealAsDouble=python32.PyComplex_RealAsDouble
+  PyComplex_Type=python32.PyComplex_Type
+  PyDescr_NewClassMethod=python32.PyDescr_NewClassMethod
+  PyDescr_NewGetSet=python32.PyDescr_NewGetSet
+  PyDescr_NewMember=python32.PyDescr_NewMember
+  PyDescr_NewMethod=python32.PyDescr_NewMethod
+  PyDictItems_Type=python32.PyDictItems_Type
+  PyDictIterItem_Type=python32.PyDictIterItem_Type
+  PyDictIterKey_Type=python32.PyDictIterKey_Type
+  PyDictIterValue_Type=python32.PyDictIterValue_Type
+  PyDictKeys_Type=python32.PyDictKeys_Type
+  PyDictProxy_New=python32.PyDictProxy_New
+  PyDictProxy_Type=python32.PyDictProxy_Type
+  PyDictValues_Type=python32.PyDictValues_Type
+  PyDict_Clear=python32.PyDict_Clear
+  PyDict_Contains=python32.PyDict_Contains
+  PyDict_Copy=python32.PyDict_Copy
+  PyDict_DelItem=python32.PyDict_DelItem
+  PyDict_DelItemString=python32.PyDict_DelItemString
+  PyDict_GetItem=python32.PyDict_GetItem
+  PyDict_GetItemString=python32.PyDict_GetItemString
+  PyDict_GetItemWithError=python32.PyDict_GetItemWithError
+  PyDict_Items=python32.PyDict_Items
+  PyDict_Keys=python32.PyDict_Keys
+  PyDict_Merge=python32.PyDict_Merge
+  PyDict_MergeFromSeq2=python32.PyDict_MergeFromSeq2
+  PyDict_New=python32.PyDict_New
+  PyDict_Next=python32.PyDict_Next
+  PyDict_SetItem=python32.PyDict_SetItem
+  PyDict_SetItemString=python32.PyDict_SetItemString
+  PyDict_Size=python32.PyDict_Size
+  PyDict_Type=python32.PyDict_Type
+  PyDict_Update=python32.PyDict_Update
+  PyDict_Values=python32.PyDict_Values
+  PyEllipsis_Type=python32.PyEllipsis_Type
+  PyEnum_Type=python32.PyEnum_Type
+  PyErr_BadArgument=python32.PyErr_BadArgument
+  PyErr_BadInternalCall=python32.PyErr_BadInternalCall
+  PyErr_CheckSignals=python32.PyErr_CheckSignals
+  PyErr_Clear=python32.PyErr_Clear
+  PyErr_Display=python32.PyErr_Display
+  PyErr_ExceptionMatches=python32.PyErr_ExceptionMatches
+  PyErr_Fetch=python32.PyErr_Fetch
+  PyErr_Format=python32.PyErr_Format
+  PyErr_GivenExceptionMatches=python32.PyErr_GivenExceptionMatches
+  PyErr_NewException=python32.PyErr_NewException
+  PyErr_NewExceptionWithDoc=python32.PyErr_NewExceptionWithDoc
+  PyErr_NoMemory=python32.PyErr_NoMemory
+  PyErr_NormalizeException=python32.PyErr_NormalizeException
+  PyErr_Occurred=python32.PyErr_Occurred
+  PyErr_Print=python32.PyErr_Print
+  PyErr_PrintEx=python32.PyErr_PrintEx
+  PyErr_ProgramText=python32.PyErr_ProgramText
+  PyErr_Restore=python32.PyErr_Restore
+  PyErr_SetFromErrno=python32.PyErr_SetFromErrno
+  PyErr_SetFromErrnoWithFilename=python32.PyErr_SetFromErrnoWithFilename
+  PyErr_SetFromErrnoWithFilenameObject=python32.PyErr_SetFromErrnoWithFilenameObject
+  PyErr_SetInterrupt=python32.PyErr_SetInterrupt
+  PyErr_SetNone=python32.PyErr_SetNone
+  PyErr_SetObject=python32.PyErr_SetObject
+  PyErr_SetString=python32.PyErr_SetString
+  PyErr_SyntaxLocation=python32.PyErr_SyntaxLocation
+  PyErr_WarnEx=python32.PyErr_WarnEx
+  PyErr_WarnExplicit=python32.PyErr_WarnExplicit
+  PyErr_WarnFormat=python32.PyErr_WarnFormat
+  PyErr_WriteUnraisable=python32.PyErr_WriteUnraisable
+  PyEval_AcquireLock=python32.PyEval_AcquireLock
+  PyEval_AcquireThread=python32.PyEval_AcquireThread
+  PyEval_CallFunction=python32.PyEval_CallFunction
+  PyEval_CallMethod=python32.PyEval_CallMethod
+  PyEval_CallObjectWithKeywords=python32.PyEval_CallObjectWithKeywords
+  PyEval_EvalCode=python32.PyEval_EvalCode
+  PyEval_EvalCodeEx=python32.PyEval_EvalCodeEx
+  PyEval_EvalFrame=python32.PyEval_EvalFrame
+  PyEval_EvalFrameEx=python32.PyEval_EvalFrameEx
+  PyEval_GetBuiltins=python32.PyEval_GetBuiltins
+  PyEval_GetCallStats=python32.PyEval_GetCallStats
+  PyEval_GetFrame=python32.PyEval_GetFrame
+  PyEval_GetFuncDesc=python32.PyEval_GetFuncDesc
+  PyEval_GetFuncName=python32.PyEval_GetFuncName
+  PyEval_GetGlobals=python32.PyEval_GetGlobals
+  PyEval_GetLocals=python32.PyEval_GetLocals
+  PyEval_InitThreads=python32.PyEval_InitThreads
+  PyEval_ReInitThreads=python32.PyEval_ReInitThreads
+  PyEval_ReleaseLock=python32.PyEval_ReleaseLock
+  PyEval_ReleaseThread=python32.PyEval_ReleaseThread
+  PyEval_RestoreThread=python32.PyEval_RestoreThread
+  PyEval_SaveThread=python32.PyEval_SaveThread
+  PyEval_ThreadsInitialized=python32.PyEval_ThreadsInitialized
+  PyExc_ArithmeticError=python32.PyExc_ArithmeticError
+  PyExc_AssertionError=python32.PyExc_AssertionError
+  PyExc_AttributeError=python32.PyExc_AttributeError
+  PyExc_BaseException=python32.PyExc_BaseException
+  PyExc_BufferError=python32.PyExc_BufferError
+  PyExc_BytesWarning=python32.PyExc_BytesWarning
+  PyExc_DeprecationWarning=python32.PyExc_DeprecationWarning
+  PyExc_EOFError=python32.PyExc_EOFError
+  PyExc_EnvironmentError=python32.PyExc_EnvironmentError
+  PyExc_Exception=python32.PyExc_Exception
+  PyExc_FloatingPointError=python32.PyExc_FloatingPointError
+  PyExc_FutureWarning=python32.PyExc_FutureWarning
+  PyExc_GeneratorExit=python32.PyExc_GeneratorExit
+  PyExc_IOError=python32.PyExc_IOError
+  PyExc_ImportError=python32.PyExc_ImportError
+  PyExc_ImportWarning=python32.PyExc_ImportWarning
+  PyExc_IndentationError=python32.PyExc_IndentationError
+  PyExc_IndexError=python32.PyExc_IndexError
+  PyExc_KeyError=python32.PyExc_KeyError
+  PyExc_KeyboardInterrupt=python32.PyExc_KeyboardInterrupt
+  PyExc_LookupError=python32.PyExc_LookupError
+  PyExc_MemoryError=python32.PyExc_MemoryError
+  PyExc_MemoryErrorInst=python32.PyExc_MemoryErrorInst
+  PyExc_NameError=python32.PyExc_NameError
+  PyExc_NotImplementedError=python32.PyExc_NotImplementedError
+  PyExc_OSError=python32.PyExc_OSError
+  PyExc_OverflowError=python32.PyExc_OverflowError
+  PyExc_PendingDeprecationWarning=python32.PyExc_PendingDeprecationWarning
+  PyExc_RecursionErrorInst=python32.PyExc_RecursionErrorInst
+  PyExc_ReferenceError=python32.PyExc_ReferenceError
+  PyExc_RuntimeError=python32.PyExc_RuntimeError
+  PyExc_RuntimeWarning=python32.PyExc_RuntimeWarning
+  PyExc_StopIteration=python32.PyExc_StopIteration
+  PyExc_SyntaxError=python32.PyExc_SyntaxError
+  PyExc_SyntaxWarning=python32.PyExc_SyntaxWarning
+  PyExc_SystemError=python32.PyExc_SystemError
+  PyExc_SystemExit=python32.PyExc_SystemExit
+  PyExc_TabError=python32.PyExc_TabError
+  PyExc_TypeError=python32.PyExc_TypeError
+  PyExc_UnboundLocalError=python32.PyExc_UnboundLocalError
+  PyExc_UnicodeDecodeError=python32.PyExc_UnicodeDecodeError
+  PyExc_UnicodeEncodeError=python32.PyExc_UnicodeEncodeError
+  PyExc_UnicodeError=python32.PyExc_UnicodeError
+  PyExc_UnicodeTranslateError=python32.PyExc_UnicodeTranslateError
+  PyExc_UnicodeWarning=python32.PyExc_UnicodeWarning
+  PyExc_UserWarning=python32.PyExc_UserWarning
+  PyExc_ValueError=python32.PyExc_ValueError
+  PyExc_Warning=python32.PyExc_Warning
+  PyExc_ZeroDivisionError=python32.PyExc_ZeroDivisionError
+  PyException_GetCause=python32.PyException_GetCause
+  PyException_GetContext=python32.PyException_GetContext
+  PyException_GetTraceback=python32.PyException_GetTraceback
+  PyException_SetCause=python32.PyException_SetCause
+  PyException_SetContext=python32.PyException_SetContext
+  PyException_SetTraceback=python32.PyException_SetTraceback
+  PyFile_FromFd=python32.PyFile_FromFd
+  PyFile_GetLine=python32.PyFile_GetLine
+  PyFile_WriteObject=python32.PyFile_WriteObject
+  PyFile_WriteString=python32.PyFile_WriteString
+  PyFilter_Type=python32.PyFilter_Type
+  PyFloat_AsDouble=python32.PyFloat_AsDouble
+  PyFloat_FromDouble=python32.PyFloat_FromDouble
+  PyFloat_FromString=python32.PyFloat_FromString
+  PyFloat_GetInfo=python32.PyFloat_GetInfo
+  PyFloat_GetMax=python32.PyFloat_GetMax
+  PyFloat_GetMin=python32.PyFloat_GetMin
+  PyFloat_Type=python32.PyFloat_Type
+  PyFrozenSet_New=python32.PyFrozenSet_New
+  PyFrozenSet_Type=python32.PyFrozenSet_Type
+  PyGC_Collect=python32.PyGC_Collect
+  PyGILState_Ensure=python32.PyGILState_Ensure
+  PyGILState_GetThisThreadState=python32.PyGILState_GetThisThreadState
+  PyGILState_Release=python32.PyGILState_Release
+  PyGetSetDescr_Type=python32.PyGetSetDescr_Type
+  PyImport_AddModule=python32.PyImport_AddModule
+  PyImport_AppendInittab=python32.PyImport_AppendInittab
+  PyImport_Cleanup=python32.PyImport_Cleanup
+  PyImport_ExecCodeModule=python32.PyImport_ExecCodeModule
+  PyImport_ExecCodeModuleEx=python32.PyImport_ExecCodeModuleEx
+  PyImport_ExecCodeModuleWithPathnames=python32.PyImport_ExecCodeModuleWithPathnames
+  PyImport_GetImporter=python32.PyImport_GetImporter
+  PyImport_GetMagicNumber=python32.PyImport_GetMagicNumber
+  PyImport_GetMagicTag=python32.PyImport_GetMagicTag
+  PyImport_GetModuleDict=python32.PyImport_GetModuleDict
+  PyImport_Import=python32.PyImport_Import
+  PyImport_ImportFrozenModule=python32.PyImport_ImportFrozenModule
+  PyImport_ImportModule=python32.PyImport_ImportModule
+  PyImport_ImportModuleLevel=python32.PyImport_ImportModuleLevel
+  PyImport_ImportModuleNoBlock=python32.PyImport_ImportModuleNoBlock
+  PyImport_ReloadModule=python32.PyImport_ReloadModule
+  PyInterpreterState_Clear=python32.PyInterpreterState_Clear
+  PyInterpreterState_Delete=python32.PyInterpreterState_Delete
+  PyInterpreterState_New=python32.PyInterpreterState_New
+  PyIter_Next=python32.PyIter_Next
+  PyListIter_Type=python32.PyListIter_Type
+  PyListRevIter_Type=python32.PyListRevIter_Type
+  PyList_Append=python32.PyList_Append
+  PyList_AsTuple=python32.PyList_AsTuple
+  PyList_GetItem=python32.PyList_GetItem
+  PyList_GetSlice=python32.PyList_GetSlice
+  PyList_Insert=python32.PyList_Insert
+  PyList_New=python32.PyList_New
+  PyList_Reverse=python32.PyList_Reverse
+  PyList_SetItem=python32.PyList_SetItem
+  PyList_SetSlice=python32.PyList_SetSlice
+  PyList_Size=python32.PyList_Size
+  PyList_Sort=python32.PyList_Sort
+  PyList_Type=python32.PyList_Type
+  PyLongRangeIter_Type=python32.PyLongRangeIter_Type
+  PyLong_AsDouble=python32.PyLong_AsDouble
+  PyLong_AsLong=python32.PyLong_AsLong
+  PyLong_AsLongAndOverflow=python32.PyLong_AsLongAndOverflow
+  PyLong_AsLongLong=python32.PyLong_AsLongLong
+  PyLong_AsLongLongAndOverflow=python32.PyLong_AsLongLongAndOverflow
+  PyLong_AsSize_t=python32.PyLong_AsSize_t
+  PyLong_AsSsize_t=python32.PyLong_AsSsize_t
+  PyLong_AsUnsignedLong=python32.PyLong_AsUnsignedLong
+  PyLong_AsUnsignedLongLong=python32.PyLong_AsUnsignedLongLong
+  PyLong_AsUnsignedLongLongMask=python32.PyLong_AsUnsignedLongLongMask
+  PyLong_AsUnsignedLongMask=python32.PyLong_AsUnsignedLongMask
+  PyLong_AsVoidPtr=python32.PyLong_AsVoidPtr
+  PyLong_FromDouble=python32.PyLong_FromDouble
+  PyLong_FromLong=python32.PyLong_FromLong
+  PyLong_FromLongLong=python32.PyLong_FromLongLong
+  PyLong_FromSize_t=python32.PyLong_FromSize_t
+  PyLong_FromSsize_t=python32.PyLong_FromSsize_t
+  PyLong_FromString=python32.PyLong_FromString
+  PyLong_FromUnsignedLong=python32.PyLong_FromUnsignedLong
+  PyLong_FromUnsignedLongLong=python32.PyLong_FromUnsignedLongLong
+  PyLong_FromVoidPtr=python32.PyLong_FromVoidPtr
+  PyLong_GetInfo=python32.PyLong_GetInfo
+  PyLong_Type=python32.PyLong_Type
+  PyMap_Type=python32.PyMap_Type
+  PyMapping_Check=python32.PyMapping_Check
+  PyMapping_GetItemString=python32.PyMapping_GetItemString
+  PyMapping_HasKey=python32.PyMapping_HasKey
+  PyMapping_HasKeyString=python32.PyMapping_HasKeyString
+  PyMapping_Items=python32.PyMapping_Items
+  PyMapping_Keys=python32.PyMapping_Keys
+  PyMapping_Length=python32.PyMapping_Length
+  PyMapping_SetItemString=python32.PyMapping_SetItemString
+  PyMapping_Size=python32.PyMapping_Size
+  PyMapping_Values=python32.PyMapping_Values
+  PyMem_Free=python32.PyMem_Free
+  PyMem_Malloc=python32.PyMem_Malloc
+  PyMem_Realloc=python32.PyMem_Realloc
+  PyMemberDescr_Type=python32.PyMemberDescr_Type
+  PyMemoryView_FromBuffer=python32.PyMemoryView_FromBuffer
+  PyMemoryView_FromObject=python32.PyMemoryView_FromObject
+  PyMemoryView_GetContiguous=python32.PyMemoryView_GetContiguous
+  PyMemoryView_Type=python32.PyMemoryView_Type
+  PyMethodDescr_Type=python32.PyMethodDescr_Type
+  PyModule_AddIntConstant=python32.PyModule_AddIntConstant
+  PyModule_AddObject=python32.PyModule_AddObject
+  PyModule_AddStringConstant=python32.PyModule_AddStringConstant
+  PyModule_Create2=python32.PyModule_Create2
+  PyModule_GetDef=python32.PyModule_GetDef
+  PyModule_GetDict=python32.PyModule_GetDict
+  PyModule_GetFilename=python32.PyModule_GetFilename
+  PyModule_GetFilenameObject=python32.PyModule_GetFilenameObject
+  PyModule_GetName=python32.PyModule_GetName
+  PyModule_GetState=python32.PyModule_GetState
+  PyModule_New=python32.PyModule_New
+  PyModule_Type=python32.PyModule_Type
+  PyNullImporter_Type=python32.PyNullImporter_Type
+  PyNumber_Absolute=python32.PyNumber_Absolute
+  PyNumber_Add=python32.PyNumber_Add
+  PyNumber_And=python32.PyNumber_And
+  PyNumber_AsSsize_t=python32.PyNumber_AsSsize_t
+  PyNumber_Check=python32.PyNumber_Check
+  PyNumber_Divmod=python32.PyNumber_Divmod
+  PyNumber_Float=python32.PyNumber_Float
+  PyNumber_FloorDivide=python32.PyNumber_FloorDivide
+  PyNumber_InPlaceAdd=python32.PyNumber_InPlaceAdd
+  PyNumber_InPlaceAnd=python32.PyNumber_InPlaceAnd
+  PyNumber_InPlaceFloorDivide=python32.PyNumber_InPlaceFloorDivide
+  PyNumber_InPlaceLshift=python32.PyNumber_InPlaceLshift
+  PyNumber_InPlaceMultiply=python32.PyNumber_InPlaceMultiply
+  PyNumber_InPlaceOr=python32.PyNumber_InPlaceOr
+  PyNumber_InPlacePower=python32.PyNumber_InPlacePower
+  PyNumber_InPlaceRemainder=python32.PyNumber_InPlaceRemainder
+  PyNumber_InPlaceRshift=python32.PyNumber_InPlaceRshift
+  PyNumber_InPlaceSubtract=python32.PyNumber_InPlaceSubtract
+  PyNumber_InPlaceTrueDivide=python32.PyNumber_InPlaceTrueDivide
+  PyNumber_InPlaceXor=python32.PyNumber_InPlaceXor
+  PyNumber_Index=python32.PyNumber_Index
+  PyNumber_Invert=python32.PyNumber_Invert
+  PyNumber_Long=python32.PyNumber_Long
+  PyNumber_Lshift=python32.PyNumber_Lshift
+  PyNumber_Multiply=python32.PyNumber_Multiply
+  PyNumber_Negative=python32.PyNumber_Negative
+  PyNumber_Or=python32.PyNumber_Or
+  PyNumber_Positive=python32.PyNumber_Positive
+  PyNumber_Power=python32.PyNumber_Power
+  PyNumber_Remainder=python32.PyNumber_Remainder
+  PyNumber_Rshift=python32.PyNumber_Rshift
+  PyNumber_Subtract=python32.PyNumber_Subtract
+  PyNumber_ToBase=python32.PyNumber_ToBase
+  PyNumber_TrueDivide=python32.PyNumber_TrueDivide
+  PyNumber_Xor=python32.PyNumber_Xor
+  PyOS_AfterFork=python32.PyOS_AfterFork
+  PyOS_InitInterrupts=python32.PyOS_InitInterrupts
+  PyOS_InputHook=python32.PyOS_InputHook
+  PyOS_InterruptOccurred=python32.PyOS_InterruptOccurred
+  PyOS_ReadlineFunctionPointer=python32.PyOS_ReadlineFunctionPointer
+  PyOS_double_to_string=python32.PyOS_double_to_string
+  PyOS_getsig=python32.PyOS_getsig
+  PyOS_mystricmp=python32.PyOS_mystricmp
+  PyOS_mystrnicmp=python32.PyOS_mystrnicmp
+  PyOS_setsig=python32.PyOS_setsig
+  PyOS_snprintf=python32.PyOS_snprintf
+  PyOS_string_to_double=python32.PyOS_string_to_double
+  PyOS_strtol=python32.PyOS_strtol
+  PyOS_strtoul=python32.PyOS_strtoul
+  PyOS_vsnprintf=python32.PyOS_vsnprintf
+  PyObject_ASCII=python32.PyObject_ASCII
+  PyObject_AsCharBuffer=python32.PyObject_AsCharBuffer
+  PyObject_AsFileDescriptor=python32.PyObject_AsFileDescriptor
+  PyObject_AsReadBuffer=python32.PyObject_AsReadBuffer
+  PyObject_AsWriteBuffer=python32.PyObject_AsWriteBuffer
+  PyObject_Bytes=python32.PyObject_Bytes
+  PyObject_Call=python32.PyObject_Call
+  PyObject_CallFunction=python32.PyObject_CallFunction
+  PyObject_CallFunctionObjArgs=python32.PyObject_CallFunctionObjArgs
+  PyObject_CallMethod=python32.PyObject_CallMethod
+  PyObject_CallMethodObjArgs=python32.PyObject_CallMethodObjArgs
+  PyObject_CallObject=python32.PyObject_CallObject
+  PyObject_CheckReadBuffer=python32.PyObject_CheckReadBuffer
+  PyObject_ClearWeakRefs=python32.PyObject_ClearWeakRefs
+  PyObject_CopyData=python32.PyObject_CopyData
+  PyObject_DelItem=python32.PyObject_DelItem
+  PyObject_DelItemString=python32.PyObject_DelItemString
+  PyObject_Dir=python32.PyObject_Dir
+  PyObject_Format=python32.PyObject_Format
+  PyObject_Free=python32.PyObject_Free
+  PyObject_GC_Del=python32.PyObject_GC_Del
+  PyObject_GC_Track=python32.PyObject_GC_Track
+  PyObject_GC_UnTrack=python32.PyObject_GC_UnTrack
+  PyObject_GenericGetAttr=python32.PyObject_GenericGetAttr
+  PyObject_GenericSetAttr=python32.PyObject_GenericSetAttr
+  PyObject_GetAttr=python32.PyObject_GetAttr
+  PyObject_GetAttrString=python32.PyObject_GetAttrString
+  PyObject_GetBuffer=python32.PyObject_GetBuffer
+  PyObject_GetItem=python32.PyObject_GetItem
+  PyObject_GetIter=python32.PyObject_GetIter
+  PyObject_HasAttr=python32.PyObject_HasAttr
+  PyObject_HasAttrString=python32.PyObject_HasAttrString
+  PyObject_Hash=python32.PyObject_Hash
+  PyObject_HashNotImplemented=python32.PyObject_HashNotImplemented
+  PyObject_Init=python32.PyObject_Init
+  PyObject_InitVar=python32.PyObject_InitVar
+  PyObject_IsInstance=python32.PyObject_IsInstance
+  PyObject_IsSubclass=python32.PyObject_IsSubclass
+  PyObject_IsTrue=python32.PyObject_IsTrue
+  PyObject_Length=python32.PyObject_Length
+  PyObject_Malloc=python32.PyObject_Malloc
+  PyObject_Not=python32.PyObject_Not
+  PyObject_Realloc=python32.PyObject_Realloc
+  PyObject_Repr=python32.PyObject_Repr
+  PyObject_RichCompare=python32.PyObject_RichCompare
+  PyObject_RichCompareBool=python32.PyObject_RichCompareBool
+  PyObject_SelfIter=python32.PyObject_SelfIter
+  PyObject_SetAttr=python32.PyObject_SetAttr
+  PyObject_SetAttrString=python32.PyObject_SetAttrString
+  PyObject_SetItem=python32.PyObject_SetItem
+  PyObject_Size=python32.PyObject_Size
+  PyObject_Str=python32.PyObject_Str
+  PyObject_Type=python32.PyObject_Type
+  PyParser_SimpleParseFileFlags=python32.PyParser_SimpleParseFileFlags
+  PyParser_SimpleParseStringFlags=python32.PyParser_SimpleParseStringFlags
+  PyProperty_Type=python32.PyProperty_Type
+  PyRangeIter_Type=python32.PyRangeIter_Type
+  PyRange_Type=python32.PyRange_Type
+  PyReversed_Type=python32.PyReversed_Type
+  PySeqIter_New=python32.PySeqIter_New
+  PySeqIter_Type=python32.PySeqIter_Type
   PySequence_Check=python32.PySequence_Check
+  PySequence_Concat=python32.PySequence_Concat
+  PySequence_Contains=python32.PySequence_Contains
+  PySequence_Count=python32.PySequence_Count
+  PySequence_DelItem=python32.PySequence_DelItem
+  PySequence_DelSlice=python32.PySequence_DelSlice
+  PySequence_Fast=python32.PySequence_Fast
+  PySequence_GetItem=python32.PySequence_GetItem
+  PySequence_GetSlice=python32.PySequence_GetSlice
+  PySequence_In=python32.PySequence_In
+  PySequence_InPlaceConcat=python32.PySequence_InPlaceConcat
+  PySequence_InPlaceRepeat=python32.PySequence_InPlaceRepeat
+  PySequence_Index=python32.PySequence_Index
+  PySequence_Length=python32.PySequence_Length
+  PySequence_List=python32.PySequence_List
+  PySequence_Repeat=python32.PySequence_Repeat
+  PySequence_SetItem=python32.PySequence_SetItem
+  PySequence_SetSlice=python32.PySequence_SetSlice
+  PySequence_Size=python32.PySequence_Size
+  PySequence_Tuple=python32.PySequence_Tuple
+  PySetIter_Type=python32.PySetIter_Type
+  PySet_Add=python32.PySet_Add
+  PySet_Clear=python32.PySet_Clear
+  PySet_Contains=python32.PySet_Contains
+  PySet_Discard=python32.PySet_Discard
+  PySet_New=python32.PySet_New
+  PySet_Pop=python32.PySet_Pop
+  PySet_Size=python32.PySet_Size
+  PySet_Type=python32.PySet_Type
+  PySignal_SetWakeupFd=python32.PySignal_SetWakeupFd
+  PySlice_GetIndices=python32.PySlice_GetIndices
+  PySlice_GetIndicesEx=python32.PySlice_GetIndicesEx
+  PySlice_New=python32.PySlice_New
+  PySlice_Type=python32.PySlice_Type
+  PySortWrapper_Type=python32.PySortWrapper_Type
+  PyState_FindModule=python32.PyState_FindModule
+  PySuper_Type=python32.PySuper_Type
+  PySys_AddWarnOption=python32.PySys_AddWarnOption
+  PySys_AddWarnOptionUnicode=python32.PySys_AddWarnOptionUnicode
+  PySys_FormatStderr=python32.PySys_FormatStderr
+  PySys_FormatStdout=python32.PySys_FormatStdout
+  PySys_GetObject=python32.PySys_GetObject
+  PySys_HasWarnOptions=python32.PySys_HasWarnOptions
+  PySys_ResetWarnOptions=python32.PySys_ResetWarnOptions
+  PySys_SetArgv=python32.PySys_SetArgv
+  PySys_SetArgvEx=python32.PySys_SetArgvEx
+  PySys_SetObject=python32.PySys_SetObject
+  PySys_SetPath=python32.PySys_SetPath
+  PySys_WriteStderr=python32.PySys_WriteStderr
+  PySys_WriteStdout=python32.PySys_WriteStdout
+  PyThreadState_Clear=python32.PyThreadState_Clear
+  PyThreadState_Delete=python32.PyThreadState_Delete
+  PyThreadState_DeleteCurrent=python32.PyThreadState_DeleteCurrent
+  PyThreadState_Get=python32.PyThreadState_Get
+  PyThreadState_GetDict=python32.PyThreadState_GetDict
+  PyThreadState_New=python32.PyThreadState_New
+  PyThreadState_SetAsyncExc=python32.PyThreadState_SetAsyncExc
+  PyThreadState_Swap=python32.PyThreadState_Swap
+  PyTraceBack_Here=python32.PyTraceBack_Here
+  PyTraceBack_Print=python32.PyTraceBack_Print
+  PyTraceBack_Type=python32.PyTraceBack_Type
+  PyTupleIter_Type=python32.PyTupleIter_Type
+  PyTuple_ClearFreeList=python32.PyTuple_ClearFreeList
+  PyTuple_GetItem=python32.PyTuple_GetItem
+  PyTuple_GetSlice=python32.PyTuple_GetSlice
+  PyTuple_New=python32.PyTuple_New
+  PyTuple_Pack=python32.PyTuple_Pack
+  PyTuple_SetItem=python32.PyTuple_SetItem
+  PyTuple_Size=python32.PyTuple_Size
+  PyTuple_Type=python32.PyTuple_Type
+  PyType_ClearCache=python32.PyType_ClearCache
+  PyType_FromSpec=python32.PyType_FromSpec
+  PyType_GenericAlloc=python32.PyType_GenericAlloc
+  PyType_GenericNew=python32.PyType_GenericNew
+  PyType_IsSubtype=python32.PyType_IsSubtype
+  PyType_Modified=python32.PyType_Modified
+  PyType_Ready=python32.PyType_Ready
+  PyType_Type=python32.PyType_Type
+  PyUnicodeDecodeError_Create=python32.PyUnicodeDecodeError_Create
+  PyUnicodeDecodeError_GetEncoding=python32.PyUnicodeDecodeError_GetEncoding
+  PyUnicodeDecodeError_GetEnd=python32.PyUnicodeDecodeError_GetEnd
+  PyUnicodeDecodeError_GetObject=python32.PyUnicodeDecodeError_GetObject
+  PyUnicodeDecodeError_GetReason=python32.PyUnicodeDecodeError_GetReason
+  PyUnicodeDecodeError_GetStart=python32.PyUnicodeDecodeError_GetStart
+  PyUnicodeDecodeError_SetEnd=python32.PyUnicodeDecodeError_SetEnd
+  PyUnicodeDecodeError_SetReason=python32.PyUnicodeDecodeError_SetReason
+  PyUnicodeDecodeError_SetStart=python32.PyUnicodeDecodeError_SetStart
+  PyUnicodeEncodeError_GetEncoding=python32.PyUnicodeEncodeError_GetEncoding
+  PyUnicodeEncodeError_GetEnd=python32.PyUnicodeEncodeError_GetEnd
+  PyUnicodeEncodeError_GetObject=python32.PyUnicodeEncodeError_GetObject
+  PyUnicodeEncodeError_GetReason=python32.PyUnicodeEncodeError_GetReason
+  PyUnicodeEncodeError_GetStart=python32.PyUnicodeEncodeError_GetStart
+  PyUnicodeEncodeError_SetEnd=python32.PyUnicodeEncodeError_SetEnd
+  PyUnicodeEncodeError_SetReason=python32.PyUnicodeEncodeError_SetReason
+  PyUnicodeEncodeError_SetStart=python32.PyUnicodeEncodeError_SetStart
+  PyUnicodeIter_Type=python32.PyUnicodeIter_Type
+  PyUnicodeTranslateError_GetEnd=python32.PyUnicodeTranslateError_GetEnd
+  PyUnicodeTranslateError_GetObject=python32.PyUnicodeTranslateError_GetObject
+  PyUnicodeTranslateError_GetReason=python32.PyUnicodeTranslateError_GetReason
+  PyUnicodeTranslateError_GetStart=python32.PyUnicodeTranslateError_GetStart
+  PyUnicodeTranslateError_SetEnd=python32.PyUnicodeTranslateError_SetEnd
+  PyUnicodeTranslateError_SetReason=python32.PyUnicodeTranslateError_SetReason
+  PyUnicodeTranslateError_SetStart=python32.PyUnicodeTranslateError_SetStart
+  PyUnicode_Append=python32.PyUnicodeUCS2_Append
+  PyUnicode_AppendAndDel=python32.PyUnicodeUCS2_AppendAndDel
+  PyUnicode_AsASCIIString=python32.PyUnicodeUCS2_AsASCIIString
+  PyUnicode_AsCharmapString=python32.PyUnicodeUCS2_AsCharmapString
+  PyUnicode_AsDecodedObject=python32.PyUnicodeUCS2_AsDecodedObject
+  PyUnicode_AsDecodedUnicode=python32.PyUnicodeUCS2_AsDecodedUnicode
+  PyUnicode_AsEncodedObject=python32.PyUnicodeUCS2_AsEncodedObject
+  PyUnicode_AsEncodedString=python32.PyUnicodeUCS2_AsEncodedString
+  PyUnicode_AsEncodedUnicode=python32.PyUnicodeUCS2_AsEncodedUnicode
+  PyUnicode_AsLatin1String=python32.PyUnicodeUCS2_AsLatin1String
+  PyUnicode_AsRawUnicodeEscapeString=python32.PyUnicodeUCS2_AsRawUnicodeEscapeString
+  PyUnicode_AsUTF16String=python32.PyUnicodeUCS2_AsUTF16String
+  PyUnicode_AsUTF32String=python32.PyUnicodeUCS2_AsUTF32String
+  PyUnicode_AsUTF8String=python32.PyUnicodeUCS2_AsUTF8String
+  PyUnicode_AsUnicodeEscapeString=python32.PyUnicodeUCS2_AsUnicodeEscapeString
+  PyUnicode_AsWideChar=python32.PyUnicodeUCS2_AsWideChar
+  PyUnicode_ClearFreelist=python32.PyUnicodeUCS2_ClearFreelist
+  PyUnicode_Compare=python32.PyUnicodeUCS2_Compare
+  PyUnicode_Concat=python32.PyUnicodeUCS2_Concat
+  PyUnicode_Contains=python32.PyUnicodeUCS2_Contains
+  PyUnicode_Count=python32.PyUnicodeUCS2_Count
+  PyUnicode_Decode=python32.PyUnicodeUCS2_Decode
+  PyUnicode_DecodeASCII=python32.PyUnicodeUCS2_DecodeASCII
+  PyUnicode_DecodeCharmap=python32.PyUnicodeUCS2_DecodeCharmap
+  PyUnicode_DecodeFSDefault=python32.PyUnicodeUCS2_DecodeFSDefault
+  PyUnicode_DecodeFSDefaultAndSize=python32.PyUnicodeUCS2_DecodeFSDefaultAndSize
+  PyUnicode_DecodeLatin1=python32.PyUnicodeUCS2_DecodeLatin1
+  PyUnicode_DecodeRawUnicodeEscape=python32.PyUnicodeUCS2_DecodeRawUnicodeEscape
+  PyUnicode_DecodeUTF16=python32.PyUnicodeUCS2_DecodeUTF16
+  PyUnicode_DecodeUTF16Stateful=python32.PyUnicodeUCS2_DecodeUTF16Stateful
+  PyUnicode_DecodeUTF32=python32.PyUnicodeUCS2_DecodeUTF32
+  PyUnicode_DecodeUTF32Stateful=python32.PyUnicodeUCS2_DecodeUTF32Stateful
+  PyUnicode_DecodeUTF8=python32.PyUnicodeUCS2_DecodeUTF8
+  PyUnicode_DecodeUTF8Stateful=python32.PyUnicodeUCS2_DecodeUTF8Stateful
+  PyUnicode_DecodeUnicodeEscape=python32.PyUnicodeUCS2_DecodeUnicodeEscape
+  PyUnicode_FSConverter=python32.PyUnicodeUCS2_FSConverter
+  PyUnicode_FSDecoder=python32.PyUnicodeUCS2_FSDecoder
+  PyUnicode_Find=python32.PyUnicodeUCS2_Find
+  PyUnicode_Format=python32.PyUnicodeUCS2_Format
+  PyUnicode_FromEncodedObject=python32.PyUnicodeUCS2_FromEncodedObject
+  PyUnicode_FromFormat=python32.PyUnicodeUCS2_FromFormat
+  PyUnicode_FromFormatV=python32.PyUnicodeUCS2_FromFormatV
+  PyUnicode_FromObject=python32.PyUnicodeUCS2_FromObject
+  PyUnicode_FromOrdinal=python32.PyUnicodeUCS2_FromOrdinal
+  PyUnicode_FromString=python32.PyUnicodeUCS2_FromString
+  PyUnicode_FromStringAndSize=python32.PyUnicodeUCS2_FromStringAndSize
+  PyUnicode_FromWideChar=python32.PyUnicodeUCS2_FromWideChar
+  PyUnicode_GetDefaultEncoding=python32.PyUnicodeUCS2_GetDefaultEncoding
+  PyUnicode_GetSize=python32.PyUnicodeUCS2_GetSize
+  PyUnicode_IsIdentifier=python32.PyUnicodeUCS2_IsIdentifier
+  PyUnicode_Join=python32.PyUnicodeUCS2_Join
+  PyUnicode_Partition=python32.PyUnicodeUCS2_Partition
+  PyUnicode_RPartition=python32.PyUnicodeUCS2_RPartition
+  PyUnicode_RSplit=python32.PyUnicodeUCS2_RSplit
+  PyUnicode_Replace=python32.PyUnicodeUCS2_Replace
+  PyUnicode_Resize=python32.PyUnicodeUCS2_Resize
+  PyUnicode_RichCompare=python32.PyUnicodeUCS2_RichCompare
+  PyUnicode_SetDefaultEncoding=python32.PyUnicodeUCS2_SetDefaultEncoding
+  PyUnicode_Split=python32.PyUnicodeUCS2_Split
+  PyUnicode_Splitlines=python32.PyUnicodeUCS2_Splitlines
+  PyUnicode_Tailmatch=python32.PyUnicodeUCS2_Tailmatch
+  PyUnicode_Translate=python32.PyUnicodeUCS2_Translate
+  PyUnicode_BuildEncodingMap=python32.PyUnicode_BuildEncodingMap
+  PyUnicode_CompareWithASCIIString=python32.PyUnicode_CompareWithASCIIString
+  PyUnicode_DecodeUTF7=python32.PyUnicode_DecodeUTF7
+  PyUnicode_DecodeUTF7Stateful=python32.PyUnicode_DecodeUTF7Stateful
+  PyUnicode_EncodeFSDefault=python32.PyUnicode_EncodeFSDefault
+  PyUnicode_InternFromString=python32.PyUnicode_InternFromString
+  PyUnicode_InternImmortal=python32.PyUnicode_InternImmortal
+  PyUnicode_InternInPlace=python32.PyUnicode_InternInPlace
+  PyUnicode_Type=python32.PyUnicode_Type
+  PyWeakref_GetObject=python32.PyWeakref_GetObject
+  PyWeakref_NewProxy=python32.PyWeakref_NewProxy
+  PyWeakref_NewRef=python32.PyWeakref_NewRef
+  PyWrapperDescr_Type=python32.PyWrapperDescr_Type
+  PyWrapper_New=python32.PyWrapper_New
+  PyZip_Type=python32.PyZip_Type
+  Py_AddPendingCall=python32.Py_AddPendingCall
+  Py_AtExit=python32.Py_AtExit
+  Py_BuildValue=python32.Py_BuildValue
+  Py_CompileStringFlags=python32.Py_CompileStringFlags
+  Py_DecRef=python32.Py_DecRef
+  Py_EndInterpreter=python32.Py_EndInterpreter
+  Py_Exit=python32.Py_Exit
+  Py_FatalError=python32.Py_FatalError
+  Py_FileSystemDefaultEncoding=python32.Py_FileSystemDefaultEncoding
+  Py_Finalize=python32.Py_Finalize
+  Py_GetBuildInfo=python32.Py_GetBuildInfo
+  Py_GetCompiler=python32.Py_GetCompiler
+  Py_GetCopyright=python32.Py_GetCopyright
+  Py_GetExecPrefix=python32.Py_GetExecPrefix
+  Py_GetPath=python32.Py_GetPath
+  Py_GetPlatform=python32.Py_GetPlatform
+  Py_GetPrefix=python32.Py_GetPrefix
+  Py_GetProgramFullPath=python32.Py_GetProgramFullPath
+  Py_GetProgramName=python32.Py_GetProgramName
+  Py_GetPythonHome=python32.Py_GetPythonHome
+  Py_GetRecursionLimit=python32.Py_GetRecursionLimit
+  Py_GetVersion=python32.Py_GetVersion
+  Py_HasFileSystemDefaultEncoding=python32.Py_HasFileSystemDefaultEncoding
+  Py_IncRef=python32.Py_IncRef
+  Py_Initialize=python32.Py_Initialize
+  Py_InitializeEx=python32.Py_InitializeEx
+  Py_IsInitialized=python32.Py_IsInitialized
+  Py_Main=python32.Py_Main
+  Py_MakePendingCalls=python32.Py_MakePendingCalls
+  Py_NewInterpreter=python32.Py_NewInterpreter
+  Py_ReprEnter=python32.Py_ReprEnter
+  Py_ReprLeave=python32.Py_ReprLeave
+  Py_SetProgramName=python32.Py_SetProgramName
+  Py_SetPythonHome=python32.Py_SetPythonHome
+  Py_SetRecursionLimit=python32.Py_SetRecursionLimit
+  Py_SymtableString=python32.Py_SymtableString
+  Py_VaBuildValue=python32.Py_VaBuildValue
+  _PyErr_BadInternalCall=python32._PyErr_BadInternalCall
+  _PyObject_CallFunction_SizeT=python32._PyObject_CallFunction_SizeT
+  _PyObject_CallMethod_SizeT=python32._PyObject_CallMethod_SizeT
+  _PyObject_GC_Malloc=python32._PyObject_GC_Malloc
+  _PyObject_GC_New=python32._PyObject_GC_New
+  _PyObject_GC_NewVar=python32._PyObject_GC_NewVar
+  _PyObject_GC_Resize=python32._PyObject_GC_Resize
+  _PyObject_New=python32._PyObject_New
+  _PyObject_NewVar=python32._PyObject_NewVar
+  _PyState_AddModule=python32._PyState_AddModule
+  _PyThreadState_Init=python32._PyThreadState_Init
+  _PyThreadState_Prealloc=python32._PyThreadState_Prealloc
+  _PyTrash_delete_later=python32._PyTrash_delete_later
+  _PyTrash_delete_nesting=python32._PyTrash_delete_nesting
+  _PyTrash_deposit_object=python32._PyTrash_deposit_object
+  _PyTrash_destroy_chain=python32._PyTrash_destroy_chain
+  _PyWeakref_CallableProxyType=python32._PyWeakref_CallableProxyType
+  _PyWeakref_ProxyType=python32._PyWeakref_ProxyType
+  _PyWeakref_RefType=python32._PyWeakref_RefType
+  _Py_BuildValue_SizeT=python32._Py_BuildValue_SizeT
+  _Py_CheckRecursionLimit=python32._Py_CheckRecursionLimit
+  _Py_CheckRecursiveCall=python32._Py_CheckRecursiveCall
+  _Py_Dealloc=python32._Py_Dealloc
+  _Py_EllipsisObject=python32._Py_EllipsisObject
+  _Py_FalseStruct=python32._Py_FalseStruct
+  _Py_NoneStruct=python32._Py_NoneStruct
+  _Py_NotImplementedStruct=python32._Py_NotImplementedStruct
+  _Py_SwappedOp=python32._Py_SwappedOp
+  _Py_TrueStruct=python32._Py_TrueStruct
+  _Py_VaBuildValue_SizeT=python32._Py_VaBuildValue_SizeT
