leonhd / unladen-swallow

Automatically exported from code.google.com/p/unladen-swallow
Other
1 stars 1 forks source link

Merge Python 2.6.4 with Unladen Swallow #102

Closed GoogleCodeExporter closed 8 years ago

GoogleCodeExporter commented 8 years ago
Attached below is a patch which merges the changes done between Python 2.6.1 
and 2.6.4 into 
Unladen Swallow. I created it using Mercurial, and the following steps:

First, identify which revisions correspond to the releases to be merged in the 
release26-maint 
branch. I found them to be 8e0b418a9718 & 11c097bc0a30. Now, generate a diff of 
the two:
$ hg diff -r 8e0b418a9718:11c097bc0a30 > ~/Desktop/python261-264.diff

In a Mercurial clone of Unladen Swallow — such as 
<https://bitbucket.org/danchr/unladen-
swallow/> — import the changes on to the Python vendor branch:
$ hg up -r ../vendor/cpython-2.6
$ hg import ~/Desktop/python261-264.diff

Now, merge the changes into the development branch:
$ hg up -r default
$ hg merge -r ../vendor/cpython-2.6

If you configured Mercurial to use a graphical merge tool, you'll only be 
prompted for conflicts. 
In order to find out why a particular change was in Unladen Swallow, a command 
such as the 
following is your friend:
$ hg log -pb default <file>
Where “<file>” should be replaced by whatever file you see a conflict in.

Original issue reported on code.google.com by danchr on 21 Dec 2009 at 6:47

Attachments:

GoogleCodeExporter commented 8 years ago
Attached below are the results of a regression test on my computer. The setup 
is:

% uname -a
Darwin dookie.local 10.2.0 Darwin Kernel Version 10.2.0: Tue Nov  3 10:37:10 
PST 2009; root:xnu-
1486.2.11~1/RELEASE_I386 i386

The results where:

319 tests OK.
9 tests failed:
    test_asynchat test_cpickle test_cprofile test_import test_pickle
    test_pickletools test_profile test_smtplib test_xpickle
40 tests skipped:
    test_aepack test_al test_applesingle test_bsddb185 test_bsddb3
    test_cd test_cl test_codecmaps_cn test_codecmaps_hk
    test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_curses
    test_dl test_epoll test_gdbm test_gl test_imageop test_imgfile
    test_jit_gdb test_largefile test_linuxaudiodev test_macos
    test_macostools test_normalization test_ossaudiodev test_pep277
    test_py3kwarn test_scriptpackages test_smtpnet test_socketserver
    test_startfile test_sunaudiodev test_timeout test_urllib2net
    test_urllibnet test_winreg test_winsound test_zipfile64
    test_zipimport_support
8 skips unexpected on darwin:
    test_dl test_aepack test_applesingle test_macostools test_bsddb185
    test_macos test_zipimport_support test_scriptpackages

Original comment by danchr on 21 Dec 2009 at 7:00

Attachments:

GoogleCodeExporter commented 8 years ago
I'm uploading a new patch to the Rietveld issue, #179115, now. Four tests fail, 
of which two seem particular to 
my setup. The complete output of a test run is attached.

324 tests OK.
4 tests failed:
    test_asynchat test_smtplib test_sys test_xpickle
40 tests skipped:
    test_aepack test_al test_applesingle test_bsddb185 test_bsddb3
    test_cd test_cl test_codecmaps_cn test_codecmaps_hk
    test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_curses
    test_dl test_epoll test_gdbm test_gl test_imageop test_imgfile
    test_jit_gdb test_largefile test_linuxaudiodev test_macos
    test_macostools test_normalization test_ossaudiodev test_pep277
    test_py3kwarn test_scriptpackages test_smtpnet test_socketserver
    test_startfile test_sunaudiodev test_timeout test_urllib2net
    test_urllibnet test_winreg test_winsound test_zipfile64
    test_zipimport_support
8 skips unexpected on darwin:
    test_dl test_aepack test_applesingle test_macostools test_bsddb185
    test_macos test_zipimport_support test_scriptpackages

Original comment by danchr on 22 Dec 2009 at 8:42

Attachments:

GoogleCodeExporter commented 8 years ago
Three attempts at uploading the patch to Rietveld failed with an HTTP error 
500, so I'm uploading it here 
instead.

Original comment by danchr on 22 Dec 2009 at 9:49

Attachments:

GoogleCodeExporter commented 8 years ago
Oops; I just noticed that I forgot to refresh the patch before uploading it. 
One hunk should be removed:

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -879,11 +879,6 @@ _Unpickler_SetStringInput(Unpicklerobjec
    self->input_len = PyString_Size(input);
    self->next_read_idx = 0;

-   if (PyString_GET_SIZE(str) != n) {
-       PyErr_SetNone(PyExc_EOFError);
-       return -1;
-   }
-
    return self->input_len;
 }

Original comment by danchr on 22 Dec 2009 at 9:57

GoogleCodeExporter commented 8 years ago
Assigning to jyasskin, since he said he was going to work on this anyway.

Original comment by collinw on 11 Jan 2010 at 10:30

GoogleCodeExporter commented 8 years ago
I'm seeing failures in test_aifc, test_distutils, test_xpickle, and 
test_zipfile on x86-64 
linux. Still running the tests on darwin.

Original comment by jyass...@gmail.com on 12 Jan 2010 at 12:50

GoogleCodeExporter commented 8 years ago
test_aifc and test_zipfile failed because 
Lib/test/{Sine-1000Hz-300ms.aif,zipdir.zip} 
are binary files that don't show up in the svn diff. Copying them in manually 
fixes 
the tests. Here's an updated patch that fixes test_distutils and test_xpickle. 
I'm 
running a test on Darwin, and then I'll submit this.

Original comment by jyass...@gmail.com on 12 Jan 2010 at 8:05

Attachments:

GoogleCodeExporter commented 8 years ago
Committed as r988. Let me know if you see problems.

Original comment by jyass...@gmail.com on 12 Jan 2010 at 10:19