Plenty of fun on the ol' branch tonight. Here's some notes from my patching run tonight. Feedback solicited. ta, Anthony Wontfix: many files: docstring changes from, e.g: -"count(s, sub[, start[, end]]) -> int\n\ -\n\ to +"count(s, sub[, start[, end]]) -> int\n" +"\n" Did these actually fix anything? many files: compiler warning fixes (unless I'm there already). Got enough to do as it is. many files: config.h -> pyconfig.h: Don't see a point - if it's broken in 2.1.1, it'll still be broken in 2.1.2. Or is this bad enough to fix? Modules/getpath.c: sys.executable gets it wrong (bug #424002) many files: CPPFLAGS broken out (patch #414991) Modules/parsermodule.c: fix for #431886, not allowing single test , Modules/zlibmodule.c: allow threads in zlib, misc other fixes - diff is nearly the entire file. The fix for patch #403753 would be good, but is an incompatibility. Hm. many files: The RISC/OS patch. This seems scary. many files: SF [#466125] PyLong_AsLongLong works for any integer. Open to arguments, but it looks like a feature to me. Modules/resource.c: fix to enable on cygwin Unsure: xreadlines.c:1.8 date: 2001/08/29 23:50:42; author: nascheme; state: Exp; lines: +1 -1 Remove bogus PyGC_HEAD_SIZE. this looks fine - someone want to just confirm? gcmodule: the lock to stop multiple calls to collect() - pretty sure I've got a working patch for this, but it's hard to test. Still to-do (if someone with excess roundtuits ... :) Look at the sre fixes, work out which are bugfixes _curses* linux glibc2.0 fixes another couple of files in Modules/ -- Anthony Baxter <anthony@interlink.com.au> It's never too late to have a happy childhood.