python3: Rebase patches onto 3.4.2

This commit is contained in:
Ray Donnelly
2014-10-11 14:46:25 +01:00
parent 7ba945ec2c
commit a391fdb04e
85 changed files with 676 additions and 671 deletions

View File

@@ -1,6 +1,6 @@
diff -Naur a/Include/bytesobject.h b/Include/bytesobject.h
--- a/Include/bytesobject.h 2014-05-19 09:19:37.000000000 +0400
+++ b/Include/bytesobject.h 2014-05-20 00:57:06.338800000 +0400
diff -urN a/Include/bytesobject.h b/Include/bytesobject.h
--- a/Include/bytesobject.h 2014-10-11 14:23:20.866222800 +0100
+++ b/Include/bytesobject.h 2014-10-11 14:23:22.622323200 +0100
@@ -52,9 +52,9 @@
PyAPI_FUNC(PyObject *) PyBytes_FromString(const char *);
PyAPI_FUNC(PyObject *) PyBytes_FromObject(PyObject *);
@@ -13,9 +13,9 @@ diff -Naur a/Include/bytesobject.h b/Include/bytesobject.h
PyAPI_FUNC(Py_ssize_t) PyBytes_Size(PyObject *);
PyAPI_FUNC(char *) PyBytes_AsString(PyObject *);
PyAPI_FUNC(PyObject *) PyBytes_Repr(PyObject *, int);
diff -Naur a/Include/pgenheaders.h b/Include/pgenheaders.h
--- a/Include/pgenheaders.h 2014-05-19 09:19:37.000000000 +0400
+++ b/Include/pgenheaders.h 2014-05-20 00:57:06.338800000 +0400
diff -urN a/Include/pgenheaders.h b/Include/pgenheaders.h
--- a/Include/pgenheaders.h 2014-10-11 14:23:20.873223200 +0100
+++ b/Include/pgenheaders.h 2014-10-11 14:23:22.624323300 +0100
@@ -10,9 +10,9 @@
#include "Python.h"
@@ -28,9 +28,9 @@ diff -Naur a/Include/pgenheaders.h b/Include/pgenheaders.h
#define addarc _Py_addarc
#define addbit _Py_addbit
diff -Naur a/Include/pyerrors.h b/Include/pyerrors.h
--- a/Include/pyerrors.h 2014-05-19 09:19:37.000000000 +0400
+++ b/Include/pyerrors.h 2014-05-20 00:57:06.338800000 +0400
diff -urN a/Include/pyerrors.h b/Include/pyerrors.h
--- a/Include/pyerrors.h 2014-10-11 14:23:20.879223500 +0100
+++ b/Include/pyerrors.h 2014-10-11 14:23:22.624323300 +0100
@@ -454,9 +454,9 @@
#include <stdarg.h>
@@ -43,9 +43,9 @@ diff -Naur a/Include/pyerrors.h b/Include/pyerrors.h
#ifdef __cplusplus
}
diff -Naur a/Include/sysmodule.h b/Include/sysmodule.h
--- a/Include/sysmodule.h 2014-05-19 09:19:37.000000000 +0400
+++ b/Include/sysmodule.h 2014-05-20 00:57:06.338800000 +0400
diff -urN a/Include/sysmodule.h b/Include/sysmodule.h
--- a/Include/sysmodule.h 2014-10-11 14:23:20.861222500 +0100
+++ b/Include/sysmodule.h 2014-10-11 14:23:22.625323400 +0100
@@ -19,9 +19,9 @@
PyAPI_FUNC(void) PySys_SetPath(const wchar_t *);