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/Modules/selectmodule.c b/Modules/selectmodule.c
--- a/Modules/selectmodule.c 2014-05-19 09:19:39.000000000 +0400
+++ b/Modules/selectmodule.c 2014-05-20 00:55:20.820400000 +0400
diff -urN a/Modules/selectmodule.c b/Modules/selectmodule.c
--- a/Modules/selectmodule.c 2014-10-11 14:20:10.158314900 +0100
+++ b/Modules/selectmodule.c 2014-10-11 14:20:11.952417500 +0100
@@ -102,9 +102,9 @@
v = PyObject_AsFileDescriptor( o );
if (v == -1) goto finally;
@@ -22,10 +22,10 @@ diff -Naur a/Modules/selectmodule.c b/Modules/selectmodule.c
FD_SET(v, set);
/* add object and its file descriptor to the list */
diff -Naur a/setup.py b/setup.py
--- a/setup.py 2014-05-20 00:55:20.570800000 +0400
+++ b/setup.py 2014-05-20 00:55:20.836000000 +0400
@@ -628,7 +628,11 @@
diff -urN a/setup.py b/setup.py
--- a/setup.py 2014-10-11 14:20:09.330267500 +0100
+++ b/setup.py 2014-10-11 14:20:11.953417600 +0100
@@ -634,7 +634,11 @@
missing.append('spwd')
# select(2); not on ancient System V