Update to 2.6.5:

What's New in Python 2.6.5?
===========================

*Release date: 2010-03-18*


What's New in Python 2.6.5 rc 2?
================================

*Release date: 2010-03-09*

Core and Builtins
-----------------

- Issue #8089: a OS X framework build with --with-universal-archs=3-way|intel
  had no way to select a 32-bit executable.

- Issue #8084: fixes build issues on OSX 10.6 when targetting OSX 10.4.

Library
-------

- Reverting the changes made in r78432. Discussed in the tracker issue #7540.

- Issue #8107: Fixed test_distutils so it doesn't crash when the source
  directory cannot be found.

Extension Modules
-----------------

- Issue #7670: sqlite3: Fixed crashes when operating on closed connections.

- Issue #8053: logic was inverted on which platforms to run a test on.
  caused test_thread to fail on Windows.


What's New in Python 2.6.5 rc 1?
================================

*Release date: 2010-03-01*

Core and Builtins
-----------------

- Issue #7309: Fix unchecked attribute access when converting
  UnicodeEncodeError, UnicodeDecodeError, and UnicodeTranslateError to
  strings.

- Issue #7649: "u'%c' % char" now behaves like "u'%s' % char" and raises a
  UnicodeDecodeError if 'char' is a byte string that can't be decoded using
  the default encoding.

- Issue #5677: Explicitly forbid write operations on read-only file objects,
  and read operations on write-only file objects.  On Windows, the system C
  library would return a bogus result; on Solaris, it was possible to crash
  the interpreter.  Patch by Stefan Krah.

- Issue #4978: Passing keyword arguments as unicode strings is now allowed.

- Issue #7819: Check sys.call_tracing() arguments types.

- Issue #7788: Fix an interpreter crash produced by deleting a list
  slice with very large step value.

- Issue #7561: Operations on empty bytearrays (such as `int(bytearray())`)
  could crash in many places because of the PyByteArray_AS_STRING() macro
  returning NULL.  The macro now returns a statically allocated empty
  string instead.

- Issue #7604: Deleting an unset slotted attribute did not raise an
  AttributeError.

- Issue #7413: Passing '\0' as the separator to datetime.datetime.isoformat()
  used to drop the time part of the result.

- Issue #6108: unicode(exception) and str(exception) should return the same
  message when only __str__ (and not __unicode__) is overridden in the
  subclass.

- Issue #7491: Metaclass's __cmp__ method was ignored.

- Add Py3k warnings for parameter names in parenthesis.

- Issue #7362: Give a proper error message for def f((x)=3): pass.

- Issue #7085: Fix crash when importing some extensions in a thread
  on MacOSX 10.6.

- Issue #7070: Fix round bug for large odd integer arguments.

- Issue #7078: Set struct.__doc__ from _struct.__doc__.

- Issue #1722344: threading._shutdown() is now called in Py_Finalize(), which
  fixes the problem of some exceptions being thrown at shutdown when the
  interpreter is killed. Patch by Adam Olsen.

- Issue #7084: Fix a (very unlikely) crash when printing a list from one
  thread, and mutating it from another one.  Patch by Scott Dial.

- Issue #1747858: Fix lchown & fchown to work with large uid's and gid's on
  64-bit platforms.


Library
-------

- Issue #7250: Fix info leak of os.environ across multi-run uses of
  wsgiref.handlers.CGIHandler.

- Issue #1729305: Fix doctest to handle encode error with "backslashreplace".

- Issue #691291: codecs.open() should not convert end of lines on reading and
  writing.

- Issue #7975: correct regression in dict methods supported by bsddb.dbshelve.

- Issue #7959: ctypes callback functions are now registered correctly
  with the cycle garbage collector.

- Issue #6243: curses.getkey() can segfault when used with ungetch.
  Fix by Trundle and Jerry Chen.

- Issue #7597: curses.use_env() can now be called before initscr().
  Noted by Kan-Ru Chen.

- Issue #7970: email.Generator.flatten now correctly flattens message/rfc822
  messages parsed by email.Parser.HeaderParser.

- Issue #3426: ``os.path.abspath`` now returns unicode when its arg is unicode.

- Issue #7835: shelve should no longer produce mysterious warnings during
  interpreter shutdown.

- Issue #4772: Raise a ValueError when an unknown Bluetooth protocol is
  specified, rather than fall through to AF_PACKET (in the `socket` module).
  Also, raise ValueError rather than TypeError when an unknown TIPC address
  type is specified.  Patch by Brian Curtin.

- Issue #6939: Fix file I/O objects in the `io` module to keep the original
  file position when calling `truncate()`.  It would previously change the
  file position to the given argument, which goes against the tradition of
  ftruncate() and other truncation APIs.  Patch by Pascal Chambon.

- Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when
  the release file is empty.

- Issue #7748: Since unicode values are supported for some metadata options
  in Distutils, the DistributionMetadata get_* methods will now return an utf-8
  encoded string for them. This ensure that the upload and register commands
  send the right values to PyPI without any error.

- Issue #1670765: Prevent email.generator.Generator from re-wrapping
  headers in multipart/signed MIME parts, which fixes one of the sources of
  invalid modifications to such parts by Generator.

- Issue #7701: Fix crash in binascii.b2a_uu() in debug mode when given a
  1-byte argument.  Patch by Victor Stinner.

- Issue #3299: Fix possible crash in te _sre module when given bad
  argument values in debug mode.  Patch by Victor Stinner.

- Issue #5827: Make sure that normpath preserves unicode.  Initial patch
  by Matt Giuca.

- Issue #5372: Drop the reuse of .o files in Distutils' ccompiler (since
  ing the .c
  file). Initial patch by Collin Winter.

- Issue #7617: Make sure distutils.unixccompiler.UnixCCompiler recognizes
  gcc when it has a fully qualified configuration prefix. Initial patch
  by Arfrever.

- Issue #7071: byte-compilation in Distue.

- Issue #7092: Remove py3k warning when importing cPickle.  2to3 handles
  renaming of `cPickle` to `pickle`.  The warning was annoying since there's
  no alternative to cPickle if you care about performance.  Patch by Florent
  Xicluna.

- Issue #745tch by
  Victor Stinner.

- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when
  opening an empty or very small file.

- Issue #7552: Removed line feed in the base64 Authorization header in
  the Distutils upload command to avoid an ers on long passwords. Initial patch by JP St. Pierre.

- Issue #7231: urllib2 cannot handle https with proxy requiring auth. Patch by
  Tatsuhiro Tsujikawa.

- Issue #7348: StringIO.StringIO.readline(-1) now acts as if it got no argument
  like other file objects.

- Issue #5949: fixed IMAP4_SSL hang when the IMAP server response is
  missing proper end-of-line termination.

- Fix variations of extending deques:  d.extend(d)  d.extendleft(d)  d+=d

- Issue #1923: Fixed the removal of meaningful spaces when PKG-INFO is
  generated in Distutils. Patch by Stephen Emslie.

- Issue #4120: Drop reference to CRT from manifest when building extensions
  with msvc9compiler.

- Issue #7410: deepcopy of itertools.count() erroneously reset the count.

- Issue #7403: logging: Fixed possible race condition in lock creation.

- Issue #7341: Close the internal file object in the TarFile constructor in
  case of an error.

- Issue #7328: pydoc no longer corrupts sys.path when run with the '-m' switch

- Issue #7318: multiprocessing now uses a timeout when it fails to establish
  a connection with another process, rather than looping endlessly. The
  default timeout is 20 seconds, which should be amply sufficient for
  local connections.

- Issue #7282: Fix a memory leak when an RLock was used in a thread other
  than those started through `threading.Thread` (for example, using
  `thread.start_new_thread()`.

- Issue #7264: Fix a possible deadlock when deallocating thread-local objects
  which are part of a reference cycle.

- Issue #7249: Methods of io.BytesIO now allow `long` as well as `int`
  arguments.

- Issue #6665: Fix fnmatch to properly match filenames with newlines in them.

- Issue #1008086: Fixed socket.inet_aton() to always return 4 bytes even on
  LP64 platforms (most 64-bit Linux, bsd, unix systems).

- Issue #7246 & Issue #7208: getpass now properly flushes input before
  reading from stdin so that existing input does not confuse it and
  lead to incorrect entry or an IOError.  It also properly flushes it
  afterwards to avoid the terminal echoing the input afterwards on
  OSes such as Solaris.

- Issue #7244: itertools.izip_longest() no longer ignores exceptions
  raised during the formation of an output tuple.

- Issue #7233: Fix a number of two-argument Decimal methods to make
  sure that they accept an int or long as the second argument.  Also
  fix buggy handling of large arguments (those with coefficient longer
  than the current precision) in shift and rotate.

- Issue #7082: When falling back to the MIME 'name' parameter, the
  correct place to look for it is the Content-Type header.

- Issue #7099: Decimal.is_normal now returns True for numbers with exponent
  larger than emax.

- Issue #7205: Fix a possible deadlock when using a BZ2File object from
  several threads at once.

- Issue #7048: Force Decimal.logb to round its result when that result
  is too large to fit in the current precision.

- Issue #1488943: difflib.Differ() doesn't always add hints for tab characters

- Issue #5037: Proxy the __unicode__ special method to __unicode__ instead of
  __str__.

- Issue #7481: When a threading.Thread failed to start it would leave the
  instance stuck in initial state and present in threading.enumerate().

- Issue #1068268: The subprocess module now handles EINTR in internal
  os.waitpid and os.read system calls where appropriate.

Extension Modules
-----------------

- Issue #7808: Fix reference leaks in _bsddb and related tests.

- Stop providing crtassem.h symbols when compiling with Visual Studio 2010, as
  msvcr100.dll is not a platform assembly anymore.

- Issue #6877: Make it possible to link the readline extension to libedit
  on OSX.

- Expat: Fix DoS via XML document with malformed UTF-8 sequences
  (CVE_2009_3560).

- Issue #7242: On Solaris 9 and earlier calling os.fork() from within a
  thread could raise an incorrect RuntimeError about not holding the import
  lock.  The import lock is now reinitialized after fork.

- Issue #7999: os.setreuid() and os.setregid() would refuse to accept a -1
  parameter on some platforms such as OS X.

Build
-----

- Issue #3920, #7903: Define _BSD_SOURCE on OpenBSD 4.4 through 4.9.

- Issue #7661: Allow ctypes to be built from a non-ASCII directory path.
  Patch by Florent Xicluna.

- Issue #7589: Only build the nis module when the correct header files are
  found.

- Switch to OpenSSL 0.9.8l on Windows.

- Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it
  compiles correctly under gcc on x86-64.  This fixes a reported
  problem with the --with-tsc build on x86-64.

- Ensure that it possible to build extensions for the default
  binary distribution on OSX 10.6 even when the user does not
  have the 10.4u SDK installed.

- Issue #7541: when using ``python-config`` with a framework install the
  compiler might use the wrong library.

Documentation
-------------

- Updating `Using Python` documentation to include description of CPython's
  -J, -U and -X options.

- Update python manual page (options -B, -O0, -s, environment variables
  PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE).

Tests
-----

- issue #7728: test_timeout was changed to use test_support.bind_port
  instead of a hard coded port.

- Issue #7498: test_multiprocessing now uses test_support.find_unused_port
  instead of a hardcoded port number in test_rapid_restart.

- Issue #7431: use TESTFN in test_linecache instead of trying to create a
  file in the Lib/test directory, which might be read-only for the
  user running the tests.

- Issue #7324: add a sanity check to regrtest argument parsing to
  catch the case of an option with no handler.

- Issue #7295: Do not use a hardcoded file name in test_tarfile.

- Issue #7270: Add some dedicated unit tests for multi-thread synchronization
  primitives such as Lock, RLock, Condition, Event and Semaphore.

- Issue #7055: test___all__ now greedily detects all modules which have an
  __all__ attribute, rather than using a hardcoded and incomplete list.

8 files changed, 87 insertions, 74 deletions

diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index e204323b41f..d8c4960d925 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2010/04/18 09:20:25 adam Exp $
+# $NetBSD: Makefile,v 1.23 2010/05/02 14:09:11 wiz Exp $
 
-DISTNAME=	Python-2.6.4
+DISTNAME=	Python-2.6.5
 PKGNAME=	${DISTNAME:S/Python/python26/}
-PKGREVISION=	4
 CATEGORIES=	lang python
-MASTER_SITES=	http://www.python.org/ftp/python/2.6.4/
+MASTER_SITES=	http://www.python.org/ftp/python/2.6.5/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/lang/python26/PLIST.common b/lang/python26/PLIST.common
index 93bb5f49721..b0ef4bbcd99 100644
--- a/lang/python26/PLIST.common
+++ b/lang/python26/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.9 2010/02/11 21:21:49 tnn Exp $
+@comment $NetBSD: PLIST.common,v 1.10 2010/05/02 14:09:11 wiz Exp $
 bin/2to3
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -787,6 +787,9 @@ lib/python${PY_VER_SUFFIX}/distutils/tests/test_filelist.pyo
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_install.py
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_install.pyc
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_install.pyo
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_lib.py
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_lib.pyc
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_lib.pyo
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_scripts.py
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_scripts.pyc
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_install_scripts.pyo
@@ -802,9 +805,15 @@ lib/python${PY_VER_SUFFIX}/distutils/tests/test_sdist.pyo
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_sysconfig.py
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_sysconfig.pyc
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_sysconfig.pyo
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_unixccompiler.py
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_unixccompiler.pyc
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_unixccompiler.pyo
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_upload.py
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_upload.pyc
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_upload.pyo
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_util.py
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_util.pyc
+lib/python${PY_VER_SUFFIX}/distutils/tests/test_util.pyo
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_versionpredicate.py
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_versionpredicate.pyc
 lib/python${PY_VER_SUFFIX}/distutils/tests/test_versionpredicate.pyo
@@ -951,6 +960,8 @@ lib/python${PY_VER_SUFFIX}/email/test/data/msg_41.txt
 lib/python${PY_VER_SUFFIX}/email/test/data/msg_42.txt
 lib/python${PY_VER_SUFFIX}/email/test/data/msg_43.txt
 lib/python${PY_VER_SUFFIX}/email/test/data/msg_44.txt
+lib/python${PY_VER_SUFFIX}/email/test/data/msg_45.txt
+lib/python${PY_VER_SUFFIX}/email/test/data/msg_46.txt
 lib/python${PY_VER_SUFFIX}/email/test/test_email.py
 lib/python${PY_VER_SUFFIX}/email/test/test_email.pyc
 lib/python${PY_VER_SUFFIX}/email/test/test_email.pyo
@@ -1894,6 +1905,9 @@ lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_nonzero.pyo
 lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_numliterals.py
 lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_numliterals.pyc
 lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_numliterals.pyo
+lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_operator.py
+lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_operator.pyc
+lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_operator.pyo
 lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_paren.py
 lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_paren.pyc
 lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_paren.pyo
@@ -2008,6 +2022,9 @@ lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_all_fixers.pyo
 lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_fixers.py
 lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_fixers.pyc
 lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_fixers.pyo
+lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_main.py
+lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_main.pyc
+lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_main.pyo
 lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_parser.py
 lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_parser.pyc
 lib/python${PY_VER_SUFFIX}/lib2to3/tests/test_parser.pyo
@@ -2576,6 +2593,9 @@ lib/python${PY_VER_SUFFIX}/test/keycert.pem
 lib/python${PY_VER_SUFFIX}/test/list_tests.py
 lib/python${PY_VER_SUFFIX}/test/list_tests.pyc
 lib/python${PY_VER_SUFFIX}/test/list_tests.pyo
+lib/python${PY_VER_SUFFIX}/test/lock_tests.py
+lib/python${PY_VER_SUFFIX}/test/lock_tests.pyc
+lib/python${PY_VER_SUFFIX}/test/lock_tests.pyo
 lib/python${PY_VER_SUFFIX}/test/mapping_tests.py
 lib/python${PY_VER_SUFFIX}/test/mapping_tests.pyc
 lib/python${PY_VER_SUFFIX}/test/mapping_tests.pyo
@@ -3425,6 +3445,9 @@ lib/python${PY_VER_SUFFIX}/test/test_random.pyo
 lib/python${PY_VER_SUFFIX}/test/test_re.py
 lib/python${PY_VER_SUFFIX}/test/test_re.pyc
 lib/python${PY_VER_SUFFIX}/test/test_re.pyo
+lib/python${PY_VER_SUFFIX}/test/test_readline.py
+lib/python${PY_VER_SUFFIX}/test/test_readline.pyc
+lib/python${PY_VER_SUFFIX}/test/test_readline.pyo
 lib/python${PY_VER_SUFFIX}/test/test_repr.py
 lib/python${PY_VER_SUFFIX}/test/test_repr.pyc
 lib/python${PY_VER_SUFFIX}/test/test_repr.pyo
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index 1af6db76674..9eacb078297 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.20 2010/02/11 21:09:50 tnn Exp $
+$NetBSD: distinfo,v 1.21 2010/05/02 14:09:11 wiz Exp $
 
-SHA1 (Python-2.6.4.tar.bz2) = bee572680d1966501247cb2b26e0e51f94d1cd13
-RMD160 (Python-2.6.4.tar.bz2) = fd33853842110fa3636dd296f2f27646fd2b151a
-Size (Python-2.6.4.tar.bz2) = 11249486 bytes
+SHA1 (Python-2.6.5.tar.bz2) = 24c94f5428a8c94c9d0b316e3019fee721fdb5d1
+RMD160 (Python-2.6.5.tar.bz2) = 909c6a13749396f2b19fed51821d3e2577b2833b
+Size (Python-2.6.5.tar.bz2) = 11095581 bytes
 SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48
 SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026
 SHA1 (patch-ac) = 858580a4e5c7474127eafb27bdfa96dc96cafad5
 SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b
 SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b
-SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa
-SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e
-SHA1 (patch-am) = 6ca7c1c2360e30807d06ecb62b794604d1ad951a
+SHA1 (patch-ah) = f973ac5a82ba5c665d2ec4b0f6130e903b5a5d7c
+SHA1 (patch-al) = d753e00ab65564a08988f7934870716aca9b02a9
+SHA1 (patch-am) = 77f8ca811777d53d7a1972c177e59568dc49651b
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
-SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2
+SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603
 SHA1 (patch-ap) = 39d81b01fa9e1b894be9ae0922881337bb4d17da
-SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072
 SHA1 (patch-au) = cf68c1975f60d18bf37262fa41cbfef1585aeb55
 SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156
diff --git a/lang/python26/patches/patch-ah b/lang/python26/patches/patch-ah
index 2a020a20df9..cd4bc79d83a 100644
--- a/lang/python26/patches/patch-ah
+++ b/lang/python26/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2010/05/02 14:09:11 wiz Exp $
 
---- Modules/_cursesmodule.c.orig	2008-01-26 15:03:51.000000000 +0100
+--- Modules/_cursesmodule.c.orig	2010-02-22 17:06:22.000000000 +0000
 +++ Modules/_cursesmodule.c
-@@ -314,17 +314,9 @@ Window_NoArg2TupleReturnFunction(getpary
+@@ -317,17 +317,9 @@ Window_NoArg2TupleReturnFunction(getpary
  
  Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
  Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
@@ -20,19 +20,19 @@ $NetBSD: patch-ah,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
  Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
  Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
  Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
-@@ -827,11 +819,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
-   } else if (rtn<=255)
+@@ -886,11 +878,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
      return Py_BuildValue("c", rtn);
-   else
+   } else {
+     const char *knp;
 -#if defined(__NetBSD__)
--    return PyString_FromString(unctrl(rtn));
+-    knp = unctrl(rtn);
 -#else
-     return PyString_FromString((char *)keyname(rtn));
+     knp = keyname(rtn);
 -#endif
+     return PyString_FromString((knp == NULL) ? "" : knp);
+   }
  }
- 
- static PyObject *
-@@ -2039,7 +2027,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
+@@ -2100,7 +2088,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
  }
  #endif /* HAVE_CURSES_IS_TERM_RESIZED */
  
@@ -40,7 +40,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
  static PyObject *
  PyCurses_KeyName(PyObject *self, PyObject *args)
  {
-@@ -2058,7 +2045,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
+@@ -2119,7 +2106,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
  
    return PyString_FromString((knp == NULL) ? "" : (char *)knp);
  }
@@ -48,7 +48,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
  
  static PyObject *  
  PyCurses_KillChar(PyObject *self)  
-@@ -2603,9 +2589,7 @@ static PyMethodDef PyCurses_methods[] = 
+@@ -2664,9 +2650,7 @@ static PyMethodDef PyCurses_methods[] = 
  #ifdef HAVE_CURSES_IS_TERM_RESIZED
    {"is_term_resized",     (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
  #endif
@@ -58,7 +58,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
    {"killchar",            (PyCFunction)PyCurses_KillChar, METH_NOARGS}, 
    {"longname",            (PyCFunction)PyCurses_longname, METH_NOARGS}, 
    {"meta",                (PyCFunction)PyCurses_Meta, METH_VARARGS},
-@@ -2714,9 +2698,7 @@ init_curses(void)
+@@ -2775,9 +2759,7 @@ init_curses(void)
  	SetDictInt("A_DIM",		A_DIM);
  	SetDictInt("A_BOLD",		A_BOLD);
  	SetDictInt("A_ALTCHARSET",	A_ALTCHARSET);
@@ -68,7 +68,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
  	SetDictInt("A_PROTECT",         A_PROTECT);
  	SetDictInt("A_CHARTEXT",        A_CHARTEXT);
  	SetDictInt("A_COLOR",           A_COLOR);
-@@ -2788,7 +2770,6 @@ init_curses(void)
+@@ -2849,7 +2831,6 @@ init_curses(void)
  	  int key;
  	  char *key_n;
  	  char *key_n2;
@@ -76,7 +76,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
  	  for (key=KEY_MIN;key < KEY_MAX; key++) {
  	    key_n = (char *)keyname(key);
  	    if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
-@@ -2816,7 +2797,6 @@ init_curses(void)
+@@ -2877,7 +2858,6 @@ init_curses(void)
  	    if (key_n2 != key_n)
  	      free(key_n2);
  	  }
diff --git a/lang/python26/patches/patch-al b/lang/python26/patches/patch-al
index 80b6b310166..5ac6b89baeb 100644
--- a/lang/python26/patches/patch-al
+++ b/lang/python26/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.3 2009/10/21 11:33:32 tron Exp $
+$NetBSD: patch-al,v 1.4 2010/05/02 14:09:11 wiz Exp $
 
---- configure.orig	2009-03-30 17:56:14.000000000 +0000
+--- configure.orig	2010-03-09 21:47:28.000000000 +0000
 +++ configure
-@@ -4108,17 +4108,18 @@ _ACEOF
+@@ -4166,17 +4166,18 @@ _ACEOF
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
            ;;
@@ -27,7 +27,16 @@ $NetBSD: patch-al,v 1.3 2009/10/21 11:33:32 tron Exp $
      hp*|HP*)
  	  case `uname -m` in
  		ia64)
-@@ -13064,8 +13065,8 @@ then
+@@ -4578,7 +4579,7 @@ fi
+ # tweak OPT based on compiler and platform, only if the user didn't set
+ # it on the command line
+ 
+-if test "${OPT-unset}" == "unset"
++if test "${OPT-unset}" = "unset"
+ then
+     case $GCC in
+     yes)
+@@ -13261,8 +13262,8 @@ then
  			LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
@@ -38,7 +47,7 @@ $NetBSD: patch-al,v 1.3 2009/10/21 11:33:32 tron Exp $
  		fi ;;
  	Darwin/*)
  		# Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -13086,12 +13087,12 @@ then
+@@ -13283,12 +13284,12 @@ then
  				LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			else
  				# No framework, use the Python app as bundle-loader
@@ -54,7 +63,7 @@ $NetBSD: patch-al,v 1.3 2009/10/21 11:33:32 tron Exp $
  	BSD/OS*/4*) LDSHARED="gcc -shared";;
  	FreeBSD*)
  		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
-@@ -13115,6 +13116,7 @@ then
+@@ -13312,6 +13313,7 @@ then
  				esac
  		fi;;
  	NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
@@ -62,7 +71,7 @@ $NetBSD: patch-al,v 1.3 2009/10/21 11:33:32 tron Exp $
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then LDSHARED='$(CC) -shared'
-@@ -13150,6 +13152,7 @@ then
+@@ -13347,6 +13349,7 @@ then
  	Linux*|GNU*) CCSHARED="-fPIC";;
  	BSD/OS*/4*) CCSHARED="-fpic";;
  	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
@@ -70,7 +79,7 @@ $NetBSD: patch-al,v 1.3 2009/10/21 11:33:32 tron Exp $
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then CCSHARED="-fPIC"
-@@ -13207,6 +13210,7 @@ then
+@@ -13404,6 +13407,7 @@ then
  		then
  			LINKFORSHARED="-Wl,--export-dynamic"
  		fi;;
diff --git a/lang/python26/patches/patch-am b/lang/python26/patches/patch-am
index 121d25f2c81..fc81ea8c838 100644
--- a/lang/python26/patches/patch-am
+++ b/lang/python26/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.10 2010/02/11 21:09:50 tnn Exp $
+$NetBSD: patch-am,v 1.11 2010/05/02 14:09:12 wiz Exp $
 
 Disabled modules for normal build:
 bsdddb
@@ -12,7 +12,7 @@ headers and libraries from the system.
 
 Build the 1.85 compat module all the time against the BDB version of choice.
 
---- setup.py.orig	2009-10-08 09:48:32.000000000 +0000
+--- setup.py.orig	2010-03-08 07:08:25.000000000 +0000
 +++ setup.py
 @@ -17,7 +17,7 @@ from distutils.command.install import in
  from distutils.command.install_lib import install_lib
@@ -42,7 +42,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
  
          # Add paths specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
-@@ -626,9 +632,7 @@ class PyBuildExt(build_ext):
+@@ -629,9 +635,7 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -53,7 +53,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -738,151 +742,6 @@ class PyBuildExt(build_ext):
+@@ -741,151 +745,6 @@ class PyBuildExt(build_ext):
              else:
                  raise ValueError("unknown major BerkeleyDB version", major)
  
@@ -133,7 +133,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
 -                                print "being ignored (4.6.x must be >= 4.6.21)"
 -                                continue
 -
--                        if ( (not db_ver_inc_map.has_key(db_ver)) and
+-                        if ( (db_ver not in db_ver_inc_map) and
 -                            allow_db_ver(db_ver) ):
 -                            # save the include directory with the db.h version
 -                            # (first occurrence only)
@@ -205,7 +205,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
          # The sqlite interface
          sqlite_setup_debug = False   # verbose debug prints from this script?
  
-@@ -989,25 +848,12 @@ class PyBuildExt(build_ext):
+@@ -992,25 +851,12 @@ class PyBuildExt(build_ext):
          # we do not build this one.  Otherwise this build will pick up
          # the more recent berkeleydb's db.h file first in the include path
          # when attempting to compile and it will fail.
@@ -236,7 +236,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
  
          # The standard Unix dbm module:
          if platform not in ['cygwin']:
-@@ -1020,7 +866,7 @@ class PyBuildExt(build_ext):
+@@ -1023,7 +869,7 @@ class PyBuildExt(build_ext):
                  exts.append( Extension('dbm', ['dbmmodule.c'],
                                         define_macros=[('HAVE_NDBM_H',None)],
                                         libraries = ndbm_libs ) )
@@ -245,7 +245,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
                  gdbm_libs = ['gdbm']
                  if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'):
                      gdbm_libs.append('gdbm_compat')
-@@ -1036,14 +882,11 @@ class PyBuildExt(build_ext):
+@@ -1039,14 +885,11 @@ class PyBuildExt(build_ext):
                          libraries = gdbm_libs ) )
                  else:
                      missing.append('dbm')
@@ -262,7 +262,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
              else:
                  missing.append('dbm')
  
-@@ -1300,6 +1143,14 @@ class PyBuildExt(build_ext):
+@@ -1304,6 +1147,14 @@ class PyBuildExt(build_ext):
                  )
              libraries = []
  
@@ -277,7 +277,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
          else:                                   # Linux and other unices
              macros = dict(
                  HAVE_SEM_OPEN=1,
-@@ -1900,9 +1751,9 @@ def main():
+@@ -1909,9 +1760,9 @@ def main():
            ext_modules=[Extension('_struct', ['_struct.c'])],
  
            # Scripts to install
diff --git a/lang/python26/patches/patch-ao b/lang/python26/patches/patch-ao
index fd680c9a7d1..9367c9e68bf 100644
--- a/lang/python26/patches/patch-ao
+++ b/lang/python26/patches/patch-ao
@@ -1,13 +1,13 @@
-$NetBSD: patch-ao,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
+$NetBSD: patch-ao,v 1.2 2010/05/02 14:09:12 wiz Exp $
 
---- Lib/distutils/util.py.orig	2006-05-23 17:54:23.000000000 -0400
+--- Lib/distutils/util.py.orig	2010-01-08 23:27:23.000000000 +0000
 +++ Lib/distutils/util.py
-@@ -115,6 +115,8 @@ def get_platform ():
-             elif machine in ('PowerPC', 'Power_Macintosh'):
-                 # Pick a sane name for the PPC architecture.
-                 machine = 'ppc'
+@@ -87,6 +87,8 @@ def get_platform ():
+         m = rel_re.match(release)
+         if m:
+             release = m.group()
 +    elif osname[:9] == "dragonfly":
 +        release = string.split(release, "-")[0]
- 
-     return "%s-%s-%s" % (osname, release, machine)
- 
+     elif osname[:6] == "darwin":
+         #
+         # For our purposes, we'll assume that the system version from
diff --git a/lang/python26/patches/patch-ar b/lang/python26/patches/patch-ar
deleted file mode 100644
index 820aa18eed7..00000000000
--- a/lang/python26/patches/patch-ar
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ar,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
-
---- Mac/BuildScript/scripts/postflight.patch-profile.orig	2006-10-08 14:19:28.000000000 -0400
-+++ Mac/BuildScript/scripts/postflight.patch-profile
-@@ -36,10 +36,10 @@ esac
- # Now ensure that our bin directory is on $P and before /usr/bin at that
- for elem in `echo $P | tr ':' ' '`
- do
--	if [ "${elem}" == "${PYTHON_ROOT}/bin" ]; then
-+	if [ "${elem}" = "${PYTHON_ROOT}/bin" ]; then
- 		echo "All right, you're a python lover already"
- 		exit 0
--	elif [ "${elem}" == "/usr/bin" ]; then
-+	elif [ "${elem}" = "/usr/bin" ]; then
- 		break
- 	fi
- done