--- python2.6-2.6.2.orig/debian/pymindeps.py +++ python2.6-2.6.2/debian/pymindeps.py @@ -0,0 +1,170 @@ +#! /usr/bin/python + +# Matthias Klose +# Modified to only exclude module imports from a given module. + +# Copyright 2004 Toby Dickenson +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject +# to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import sys, pprint +import modulefinder +import imp + +class mymf(modulefinder.ModuleFinder): + def __init__(self,*args,**kwargs): + self._depgraph = {} + self._types = {} + self._last_caller = None + modulefinder.ModuleFinder.__init__(self, *args, **kwargs) + + def import_hook(self, name, caller=None, fromlist=None, level=-1): + old_last_caller = self._last_caller + try: + self._last_caller = caller + return modulefinder.ModuleFinder.import_hook(self, name, caller, + fromlist, level) + finally: + self._last_caller = old_last_caller + + def import_module(self, partnam, fqname, parent): + m = modulefinder.ModuleFinder.import_module(self, + partnam, fqname, parent) + if m is not None and self._last_caller: + caller = self._last_caller.__name__ + if '.' in caller: + caller = caller[:caller.index('.')] + callee = m.__name__ + if '.' in callee: + callee = callee[:callee.index('.')] + #print "XXX last_caller", caller, "MOD", callee + #self._depgraph.setdefault(self._last_caller.__name__,{})[r.__name__] = 1 + #if caller in ('pdb', 'doctest') or callee in ('pdb', 'doctest'): + # print caller, "-->", callee + if caller != callee: + self._depgraph.setdefault(caller,{})[callee] = 1 + return m + + def find_module(self, name, path, parent=None): + if parent is not None: + # assert path is not None + fullname = parent.__name__+'.'+name + else: + fullname = name + if self._last_caller: + caller = self._last_caller.__name__ + if fullname in excluded_imports.get(caller, []): + #self.msgout(3, "find_module -> Excluded", fullname) + raise ImportError, name + + if fullname in self.excludes: + #self.msgout(3, "find_module -> Excluded", fullname) + raise ImportError, name + + if path is None: + if name in sys.builtin_module_names: + return (None, None, ("", "", imp.C_BUILTIN)) + + path = self.path + return imp.find_module(name, path) + + def load_module(self, fqname, fp, pathname, file_info): + suffix, mode, type = file_info + m = modulefinder.ModuleFinder.load_module(self, fqname, + fp, pathname, file_info) + if m is not None: + self._types[m.__name__] = type + return m + + def load_package(self, fqname, pathname): + m = modulefinder.ModuleFinder.load_package(self, fqname,pathname) + if m is not None: + self._types[m.__name__] = imp.PKG_DIRECTORY + return m + +def reduce_depgraph(dg): + pass + +# guarded imports, which don't need to be included in python-minimal +excluded_imports = { + 'codecs': set(('encodings',)), + 'collections': set(('doctest', 'cPickle')), + 'copy': set(('reprlib',)), + 'difflib': set(('doctest',)), + 'hashlib': set(('_hashlib', '_md5', '_sha', '_sha256','_sha512',)), + 'heapq': set(('doctest',)), + 'inspect': set(('compiler',)), + 'os': set(('nt', 'ntpath', 'os2', 'os2emxpath', 'mac', 'macpath', + 'riscos', 'riscospath', 'riscosenviron')), + 'optparse': set(('gettext',)), + 'pickle': set(('doctest',)), + 'platform': set(('tempfile',)), + 'socket': set(('_ssl', 'ssl')), + 'tempfile': set(('dummy_thread',)), + 'subprocess': set(('threading',)), + } + +def main(argv): + # Parse command line + import getopt + try: + opts, args = getopt.getopt(sys.argv[1:], "dmp:qx:") + except getopt.error as msg: + print(msg) + return + + # Process options + debug = 1 + domods = 0 + addpath = [] + exclude = [] + for o, a in opts: + if o == '-d': + debug = debug + 1 + if o == '-m': + domods = 1 + if o == '-p': + addpath = addpath + a.split(os.pathsep) + if o == '-q': + debug = 0 + if o == '-x': + exclude.append(a) + + path = sys.path[:] + path = addpath + path + + if debug > 1: + print("version:", sys.version) + print("path:") + for item in path: + print(" ", repr(item)) + + #exclude = ['__builtin__', 'sys', 'os'] + exclude = [] + mf = mymf(path, debug, exclude) + for arg in args: + mf.run_script(arg) + + depgraph = reduce_depgraph(mf._depgraph) + + pprint.pprint({'depgraph':mf._depgraph, 'types':mf._types}) + +if __name__=='__main__': + main(sys.argv[1:]) --- python2.6-2.6.2.orig/debian/changelog +++ python2.6-2.6.2/debian/changelog @@ -0,0 +1,1921 @@ +python2.6 (2.6.2-2~hardy1) hardy; urgency=low + + * Update to 20090719, taken from the 2.6 release branch. + * Build for Ubutu 8.04, don't run the rtinstall/rtremove scripts + for python2.6. + * Don't build the python2.6-doc package (dependencies not available in hardy). + + -- Matthias Klose Sun, 19 Jul 2009 12:58:14 -0400 + +python2.6 (2.6.2-2) experimental; urgency=low + + * Symbol _Py_force_double@Base is i386 only. Closes: #534208. + + -- Matthias Klose Tue, 23 Jun 2009 06:14:40 +0200 + +python2.6 (2.6.2-1) experimental; urgency=low + + * Final Python 2.6.2 release. + - Update Doc/tools/sphinxext/download.html. Closes: #526797. + * Update to 20090621, taken from the 2.6 release branch. + + * Address issues when working with PYTHONUSERBASE and non standard prefix + (pointed out by Larry Hastings): + - distutils.sysconfig.get_python_lib(): Only return ".../dist-packages" if + prefix is the default prefix and if PYTHONUSERBASE is not set in the + environment. + - site.addusersitepackages(): Add USER_BASE/.../dist-packages to sys.path. + * Always use the `unix_prefix' scheme for setup.py install in a virtualenv + setup. LP: #339904. + * Don't make the setup.py install options --install-layout=deb and --prefix + conflict with each other. + * distutils: Always install into `/usr/local/lib/python2.6/dist-packages' + if an option `--prefix=/usr/local' is present (except for virtualenv + and PYTHONUSERBASE installations). LP: #362570. + * Always use `site-packages' as site directory name in virtualenv. + + * Do not add /usr/lib/pythonXY.zip on sys.path. + * Add symbols files for libpython2.6 and python2.6-dbg, don't include symbols + from builtins, which can either be built as builtins or extensions. + * Keep an empty lib-dynload in python2.6-minimal to avoid a warning on + startup. + * Build a shared library configured --with-pydebug. LP: #322580. + * Fix some lintian warnings. + * Use the information in /etc/lsb-release for platform.dist(). LP: #196526. + * Move the bdist_wininst files into the -dev package (only needed to build + windows installers). + * Document changes to the site directory name in the installation manual. + * Fix issue #1113244: Py_XINCREF, Py_DECREF, Py_XDECREF: Add + `do { ... } while (0)' to avoid compiler warnings. Closes: #516956. + * debian/pyhtml2devhelp.py: update for python 2.6 (Marc Deslauriers). + * debian/rules: re-enable documentation files for devhelp. LP: #338791. + * python2.6-doc: Depend on libjs-jquery, use jquery.js from this package. + Closes: #523482. + + -- Matthias Klose Sun, 21 Jun 2009 16:12:15 +0200 + +python2.6 (2.6.1-3) experimental; urgency=low + + * Update to 20090318, taken from the 2.6 release branch. + * Use the information in /etc/lsb-release for platform.dist(). + * Update installation schemes: LP: #338395. Closes: #520278. + - When the --prefix option is used for setup.py install, Use the + `unix_prefix' scheme. + - Use the `deb_system' scheme if --install-layout=deb is specified. + - Use the the `unix_local' scheme if neither --install-layout=deb + nor --prefix is specified. + - The options --install-layout=deb and --prefix are exclusive. + * Don't fail installation/removal if directories in /usr/local cannot + be created. LP: #338227. + * Don't try to move away the site-packages directory. There never was a + python2.6 upload using site-packages. Closes: #518780. + * Fix build failure on mips/mipsel. Closes: #519386. + + -- Matthias Klose Wed, 18 Mar 2009 22:17:20 +0100 + +python2.6 (2.6.1-2) experimental; urgency=low + + * Move libpython2.6.a into the python2.6-dev package. + * Move idlelib into the idle-python2.6 package. + + -- Matthias Klose Wed, 25 Feb 2009 18:42:19 +0100 + +python2.6 (2.6.1-1) experimental; urgency=low + + * New upstream version, upload to experimental. + * Update to 20090225, taken from the 2.6 release branch. + * Don't build-depend on locales on armel, hppa, ia64 and mipsel; package is + currently not installable. + + -- Matthias Klose Wed, 25 Feb 2009 18:42:19 +0100 + +python2.6 (2.6.1-0ubuntu9) jaunty; urgency=low + + * Don't build pyexpat, _elementtree and _ctypes as builtin extensions, + third party packages make too many assumptions about these not built + as builtins. + + -- Matthias Klose Tue, 24 Feb 2009 16:34:27 +0100 + +python2.6 (2.6.1-0ubuntu8) jaunty; urgency=low + + * Link the shared libpython with $(MODLIBS). + + -- Matthias Klose Sun, 22 Feb 2009 16:38:49 +0100 + +python2.6 (2.6.1-0ubuntu7) jaunty; urgency=low + + * Update to 20090222, taken from the 2.6 release branch. + + -- Matthias Klose Sun, 22 Feb 2009 10:35:29 +0100 + +python2.6 (2.6.1-0ubuntu6) jaunty; urgency=low + + * Don't build the gdbm extension from the python2.6 source. + * Build the dbm extension using libdb. + * Don't build-depend on locales on sparc (currently not installable), only + needed by the testsuite. + * Update to 20090219, taken from the 2.6 release branch. + + -- Matthias Klose Thu, 19 Feb 2009 12:43:20 +0100 + +python2.6 (2.6.1-0ubuntu5) jaunty; urgency=low + + * Add build dependency on libdb-dev. + + -- Matthias Klose Mon, 16 Feb 2009 13:34:41 +0100 + +python2.6 (2.6.1-0ubuntu4) jaunty; urgency=low + + * Disable the profiled build on all architectures. + + -- Matthias Klose Mon, 16 Feb 2009 11:18:51 +0100 + +python2.6 (2.6.1-0ubuntu3) jaunty; urgency=low + + * Disable the profiled build on armel as well. + + -- Matthias Klose Sun, 15 Feb 2009 10:38:02 +0100 + +python2.6 (2.6.1-0ubuntu2) jaunty; urgency=low + + * Don't use the profiled build on amd64, lpia and sparc (GCC + PR profile/38292). + + -- Matthias Klose Sat, 14 Feb 2009 14:09:34 +0100 + +python2.6 (2.6.1-0ubuntu1) jaunty; urgency=low + + * Update to 20090211, taken from the 2.6 release branch. + + -- Matthias Klose Fri, 13 Feb 2009 12:51:00 +0100 + +python2.6 (2.6.1-0ubuntu1~ppa1) jaunty; urgency=low + + * Python 2.6.1 release. + * Update to 20081206, taken from the 2.6 release branch. + * Ensure that all extensions from the -minimal package are statically + linked into the interpreter. + * Include expat, _elementtree, datetime, bisect, _bytesio, _locale, + _fileio in -minimal to link these extensions statically. + + -- Matthias Klose Fri, 05 Dec 2008 20:43:51 +0100 + +python2.6 (2.6-0ubuntu1~ppa5) intrepid; urgency=low + + * Test build + + -- Matthias Klose Fri, 14 Nov 2008 10:14:38 +0100 + +python2.6 (2.6-0ubuntu1~ppa4) intrepid; urgency=low + + * Do not build the bsddb3 module from this source, but recommend the + python-bsddb3 package (will be a dependency after python-bsddb3 is in + the archive). + * For locally installed packages, create a directory + /usr/local/lib/python2.6/dist-packages. This is the default for + installations done with distutils and setuptools. Third party stuff + packaged within the distribution goes to /usr/lib/python2.6/dist-packages. + There is no /usr/lib/python2.6/site-packages in the file system and + on sys.path. No package within the distribution must not install + anything in this location. + * Place the gdbm extension into the python2.6 package. + * distutils: Add an option --install-layout=deb, which + - installs into $prefix/dist-packages instead of $prefix/site-packages. + - doesn't encode the python version into the egg name. + + -- Matthias Klose Sat, 25 Oct 2008 11:12:24 +0000 + +python2.6 (2.6-0ubuntu1~ppa3) intrepid; urgency=low + + * Build-depend on libdb4.6-dev, instead of libdb-dev (4.7). Test suite + hangs in the bsddb tests. + + -- Matthias Klose Wed, 22 Oct 2008 11:05:13 +0200 + +python2.6 (2.6-0ubuntu1~ppa2) intrepid; urgency=low + + * Update to 20081021, taken from the 2.6 release branch. + * Fix typos and section names in doc-base files. LP: #273344. + * Build a new package libpython2.6. + * For locally installed packages, create a directory + /usr/local/lib/python2.6/system-site-packages, which is symlinked + from /usr/lib/python2.6/site-packages. Third party stuff packaged + within the distribution goes to /usr/lib/python2.6/dist-packages. + + -- Matthias Klose Tue, 21 Oct 2008 18:09:31 +0200 + +python2.6 (2.6-0ubuntu1~ppa1) intrepid; urgency=low + + * Python 2.6 release. + * Update to current branch 20081009. + + -- Matthias Klose Thu, 09 Oct 2008 14:28:26 +0200 + +python2.6 (2.6~b3-0ubuntu1~ppa1) intrepid; urgency=low + + * Python 2.6 beta3 release. + + -- Matthias Klose Sun, 24 Aug 2008 01:34:54 +0000 + +python2.6 (2.6~b2-0ubuntu1~ppa1) intrepid; urgency=low + + * Python 2.6 beta2 release. + + -- Matthias Klose Thu, 07 Aug 2008 16:45:56 +0200 + +python2.6 (2.6~b1-0ubuntu1~ppa1) intrepid; urgency=low + + * Python 2.6 beta1 release. + + -- Matthias Klose Tue, 15 Jul 2008 12:57:20 +0000 + +python2.6 (2.6~a3-0ubuntu1~ppa2) hardy; urgency=low + + * Test build + + -- Matthias Klose Thu, 29 May 2008 18:08:48 +0200 + +python2.6 (2.6~a3-0ubuntu1~ppa1) hardy; urgency=low + + * Python 2.6 alpha3 release. + * Update to current trunk 20080523. + + -- Matthias Klose Thu, 22 May 2008 17:37:46 +0200 + +python2.5 (2.5.2-5) unstable; urgency=low + + * Backport new function signal.set_wakeup_fd from the trunk. + Background: http://bugzilla.gnome.org/show_bug.cgi?id=481569 + + -- Matthias Klose Wed, 30 Apr 2008 12:05:10 +0000 + +python2.5 (2.5.2-4) unstable; urgency=low + + * Update to 20080427, taken from the 2.5 release branch. + - Fix issues #2670, #2682. + * Disable running pybench on the hppa buildd (ftbfs). + * Allow setting BASECFLAGS, OPT and EXTRA_LDFLAGS (like, CC, CXX, CPP, + CFLAGS, CPPFLAGS, CCSHARED, LDSHARED) from the environment. + * Support parallel= in DEB_BUILD_OPTIONS (see #209008). + + -- Matthias Klose Sun, 27 Apr 2008 10:40:51 +0200 + +python2.5 (2.5.2-3) unstable; urgency=medium + + * Update to 20080416, taken from the 2.5 release branch. + - Fix CVE-2008-1721, integer signedness error in the zlib extension module. + - Fix urllib2 file descriptor happens byte-at-a-time, reverting + a fix for excessively large memory allocations when calling .read() + on a socket object wrapped with makefile(). + * Disable some regression tests on some architectures: + - arm: test_compiler, test_ctypes. + - armel: test_compiler. + - hppa: test_fork1, test_wait3. + - m68k: test_bsddb3, test_compiler. + * Build-depend on libffi-dev instead of libffi4-dev. + * Fix CVE-2008-1679, integer overflows in the imageop module. + + -- Matthias Klose Wed, 16 Apr 2008 23:37:46 +0200 + +python2.5 (2.5.2-2) unstable; urgency=low + + * Use site.addsitedir() to add directories in /usr/local to sys.path. + Addresses: #469157, #469818. + + -- Matthias Klose Sat, 08 Mar 2008 16:11:23 +0100 + +python2.5 (2.5.2-1) unstable; urgency=low + + * Python 2.5.2 release. + * Merge from Ubuntu: + - Move site customization into sitecustomize.py, don't make site.py + a config file. Addresses: #309719, #413172, #457361. + - Move site.py to python2.4-minimal, remove `addbuilddir' from site.py, + which is unnecessary for installed builds. + - python2.5-dev: Recommend libc-dev instead of suggesting it. LP: #164909. + - Fix issue 961805, Tk Text.edit_modified() fails. LP: #84720. + + -- Matthias Klose Thu, 28 Feb 2008 23:18:52 +0100 + +python2.5 (2.5.1-7) unstable; urgency=low + + * Update to 20080209, taken from the 2.5 release branch. + * Build the _bsddb extension with db-4.5 again; 4.6 is seriously + broken when used with the _bsddb extension. + * Do not run pybench on arm and armel. + * python2.5: Provide python2.5-wsgiref. + * Fix a pseudo RC report with duplicated attributes in the control + file. Closes: #464307. + + -- Matthias Klose Sun, 10 Feb 2008 00:22:57 +0100 + +python2.5 (2.5.1-6) unstable; urgency=low + + * Update to 20080102, taken from the 2.5 release branch. + - Only define _BSD_SOURCE on OpenBSD systems. Closes: #455400. + * Fix handling of packages in linecache.py (Kevin Goodsell). LP: #70902. + * Bump debhelper to v5. + * Register binfmt for .py[co] files. + * Use absolute paths when byte-compiling files. Addresses: #453346. + Closes: #413566, LP: #177722. + * CVE-2007-4965, http://bugs.python.org/issue1179: + Multiple integer overflows in the imageop module in Python 2.5.1 and + earlier allow context-dependent attackers to cause a denial of service + (application crash) and possibly obtain sensitive information (memory + contents) via crafted arguments to (1) the tovideo method, and unspecified + other vectors related to (2) imageop.c, (3) rbgimgmodule.c, and other + files, which trigger heap-based buffer overflows. + Patch prepared by Stephan Herrmann. Closes: #443333, LP: #163845. + * Register info docs when doing source only uploads. LP: #174786. + * Remove deprecated value from categories in desktop file. LP: #172874. + * python2.5-dbg: Don't include the gdbm and _tkinter extensions, now provided + in separate packages. + * Provide a symlink changelog -> NEWS. Closes: #439271. + * Fix build failure on hurd, working around poll() on systems on which it + returns an error on invalid FDs. Closes: #438914. + * Configure --with-system-ffi on all architectures. Closes: #448520. + * Fix version numbers in copyright and README files (Dan O'Huiginn). + Closes: #446682. + * Move some documents from python2.5 to python2.5-dev. + + -- Matthias Klose Wed, 02 Jan 2008 22:22:19 +0100 + +python2.5 (2.5.1-5) unstable; urgency=low + + * Build the _bsddb extension with db-4.6. + + -- Matthias Klose Fri, 17 Aug 2007 00:39:35 +0200 + +python2.5 (2.5.1-4) unstable; urgency=low + + * Update to 20070813, taken from the 2.5 release branch. + * Include plat-mac/plistlib.py (plat-mac is not in sys.path by default. + Closes: #435826. + * Use emacs22 to build the documentation in info format. Closes: #434969. + * Build-depend on db-dev (>= 4.6). Closes: #434965. + + -- Matthias Klose Mon, 13 Aug 2007 22:22:44 +0200 + +python2.5 (2.5.1-3) unstable; urgency=high + + * Support mixed-endian IEEE floating point, as found in the ARM old-ABI + (Aurelien Jarno). Closes: #434905. + + -- Matthias Klose Fri, 27 Jul 2007 20:01:35 +0200 + +python2.5 (2.5.1-2) unstable; urgency=low + + * Update to 20070717, taken from the 2.5 release branch. + * Fix reference count for sys.pydebug variable. Addresses: #431393. + * Build depend on libbluetooth-dev instead of libbluetooth2-dev. + + -- Matthias Klose Tue, 17 Jul 2007 14:09:47 +0200 + +python2.5 (2.5.1-1) unstable; urgency=low + + * Python-2.5.1 release. + * Build-depend on gcc-4.1 (>= 4.1.2-4) on alpha, powerpc, s390, sparc. + * Merge from Ubuntu: + - Add debian/patches/subprocess-eintr-safety.dpatch (LP: #87292): + - Create and use wrappers around read(), write(), and os.waitpid() in the + subprocess module which retry the operation on an EINTR (which happens + if e. g. an alarm was raised while the system call was in progress). + It is incredibly hard and inconvenient to sensibly handle this in + applications, so let's fix this at the right level. + - Patch based on original proposal of Peter <85>strand + in http://python.org/sf/1068268. + - Add two test cases. + - Change the interpreter to build and install python extensions + built with the python-dbg interpreter with a different name into + the same path (by appending `_d' to the extension name). The debug build + of the interpreter tries to first load a foo_d.so or foomodule_d.so + extension, then tries again with the normal name. + - When trying to import the profile and pstats modules, don't + exit, add a hint to the exception pointing to the python-profiler + package, don't exit. + - Keep the module version in the .egg-info name, only remove the + python version. + - python2.5-dbg: Install Misc/SpecialBuilds.txt, document the + debug changes in README.debug. + * Update to 20070425, taken from the 2.5 release branch. + + -- Matthias Klose Wed, 25 Apr 2007 22:12:50 +0200 + +python2.5 (2.5-6) unstable; urgency=medium + + * webbrowser.py: Recognize other browsers: www-browser, x-www-browser, + iceweasel, iceape. + * Move pyconfig.h from the python2.5-dev into the python2.5 package; + required by builds for pure python modules without having python2.5-dev + installed (matching the functionality in python2.4). + * Move the unicodedata module into python2.5-minimal; allows byte compilation + of UTF8 encoded files. + * Do not install anymore outdated debhelper sample scripts. + * Install Misc/SpecialBuilds.txt as python2.5-dbg document. + + -- Matthias Klose Wed, 21 Feb 2007 01:17:12 +0100 + +python2.5 (2.5-5) unstable; urgency=high + + * Do not run the python benchmark on m68k. Timer problems. + Fixes FTBFS on m68k. + * Update to 20061209, taken from the 2.5 release branch. + - Fixes building the library reference in info format. + + -- Matthias Klose Sat, 9 Dec 2006 13:40:48 +0100 + +python2.5 (2.5-4) unstable; urgency=medium + + * Update to 20061203, taken from the 2.5 release branch. + - Fixes build failures on knetfreebsd and the hurd. Closes: #397000. + * Clarify README about distutils. Closes: #396394. + * Move python2.5-config to python2.5-dev. Closes: #401451. + * Cleanup build-conflicts. Addresses: #394512. + + -- Matthias Klose Sun, 3 Dec 2006 18:22:49 +0100 + +python2.5 (2.5-3.1) unstable; urgency=low + + * Non-maintainer upload. + * python2.5-minimal depends on python-minimal (>= 2.4.4-1) because it's the + first version which lists python2.5 as an unsupported runtime (ie a + runtime that is available but for which modules are not auto-compiled). + And being listed there is required for python-central to accept the + installation of python2.5-minimal. Closes: #397006 + + -- Raphael Hertzog Wed, 22 Nov 2006 15:41:06 +0100 + +python2.5 (2.5-3) unstable; urgency=medium + + * Update to 20061029 (2.4.4 was released on 20061019), taken from + the 2.5 release branch. We do not want to have regressions in + 2.5 compared to the 2.4.4 release. + * Don't run pybench on m68k, fails in the calibration loop. Closes: #391030. + * Run the installation/removal hooks. Closes: #383292, #391036. + + -- Matthias Klose Sun, 29 Oct 2006 11:35:19 +0100 + +python2.5 (2.5-2) unstable; urgency=medium + + * Update to 20061003, taken from the 2.5 release branch. + * On arm and m68k, don't run the pybench in debug mode. + * Fix building the source within exec_prefix (Alexander Wirt). + Closes: #385336. + + -- Matthias Klose Tue, 3 Oct 2006 10:08:36 +0200 + +python2.5 (2.5-1) unstable; urgency=low + + * Python 2.5 release. + * Update to 20060926, taken from the 2.5 release branch. + * Run the Python benchmark during the build, compare the results + of the static and shared builds. + * Fix invalid html in python2.5.devhelp.gz. + * Add a python2.5 console entry to the menu (hidden by default). + * python2.5: Suggest python-profiler. + + -- Matthias Klose Tue, 26 Sep 2006 02:36:11 +0200 + +python2.5 (2.5~c1-1) unstable; urgency=low + + * Python 2.5 release candidate 1. + * Update to trunk 20060818. + + -- Matthias Klose Sat, 19 Aug 2006 19:21:05 +0200 + +python2.5 (2.5~b3-1) unstable; urgency=low + + * Build the _ctypes module for m68k-linux. + + -- Matthias Klose Fri, 11 Aug 2006 18:19:19 +0000 + +python2.5 (2.5~b3-0ubuntu1) edgy; urgency=low + + * Python 2.5 beta3 release. + * Update to trunk 20060811. + * Rebuild the documentation. + * Fix value of sys.exec_prefix in the debug build. + * Do not build the library reference in info format; fails to build. + * Link the interpreter against the shared runtime library. With + gcc-4.1 the difference in the pystones benchmark dropped from about + 12% to about 6%. + * Install the statically linked version of the interpreter as + python2.5-static for now. + * Link the shared libpython with -O1. + + -- Matthias Klose Thu, 10 Aug 2006 14:04:48 +0000 + +python2.5 (2.4.3+2.5b2-3) unstable; urgency=low + + * Disable the testsuite on s390; don't care about "minimally configured" + buildd's. + + -- Matthias Klose Sun, 23 Jul 2006 11:45:03 +0200 + +python2.5 (2.4.3+2.5b2-2) unstable; urgency=low + + * Update to trunk 20060722. + * Merge idle-lib from idle-python2.5 into python2.5. + * Merge lib-tk from python-tk into python2.5. + * Tkinter.py: Suggest installation of python-tk package on failed + import of the _tkinter extension. + * Don't run the testsuite for the debug build on alpha. + * Don't run the test_compiler test on m68k. Just takes too long. + * Disable building ctypes on m68k (requires support for closures). + + -- Matthias Klose Sat, 22 Jul 2006 22:26:42 +0200 + +python2.5 (2.4.3+2.5b2-1) unstable; urgency=low + + * Python 2.5 beta2 release. + * Update to trunk 20060716. + * When built on a buildd, do not run the following test which try to + access the network: test_codecmaps_cn, test_codecmaps_hk, test_codecmaps_jp, + test_codecmaps_kr, test_codecmaps_tw, test_normalization. + * When built on a buildd, do not run tests requiring missing write permissions: + test_ossaudiodev. + + -- Matthias Klose Sun, 16 Jul 2006 02:53:50 +0000 + +python2.5 (2.4.3+2.5b2-0ubuntu1) edgy; urgency=low + + * Python 2.5 beta2 release. + + -- Matthias Klose Thu, 13 Jul 2006 17:16:52 +0000 + +python2.5 (2.4.3+2.5b1-1ubuntu2) edgy; urgency=low + + * Fix python-dev dependencies. + * Update to trunk 20060709. + + -- Matthias Klose Sun, 9 Jul 2006 18:50:32 +0200 + +python2.5 (2.4.3+2.5b1-1ubuntu1) edgy; urgency=low + + * Python 2.5 beta1 release. + * Update to trunk 20060623. + * Merge changes from the python2.4 packages. + * python2.5-minimal: Add _struct. + + -- Matthias Klose Fri, 23 Jun 2006 16:04:46 +0200 + +python2.5 (2.4.3+2.5a1-1) experimental; urgency=low + + * Update to trunk 20060409. + * Run testsuite for debug build as well. + * Build-depend on gcc-4.1. + + -- Matthias Klose Sun, 9 Apr 2006 22:27:05 +0200 + +python2.5 (2.4.3+2.5a1-0ubuntu1) dapper; urgency=low + + * Python 2.5 alpha1 release. + * Drop integrated patches. + * Add build dependencies on libsqlite3-dev and libffi4-dev. + * Add (build-)dependency on mime-support, libgpmg1 (test suite). + * Build using the system FFI. + * python2.5 provides python2.5-ctypes and python2.5-pysqlite2, + python2.5-elementtree. + * Move hashlib.py to python-minimal. + * Lib/hotshot/pstats.py: Error out on missing profile/pstats modules. + + -- Matthias Klose Wed, 5 Apr 2006 14:56:15 +0200 + +python2.4 (2.4.3-8ubuntu1) edgy; urgency=low + + * Resynchronize with Debian unstable. Remaining changes: + - Apply langpack-gettext patch. + - diff.gz contains pregenerated html and info docs. + - Build the -doc package from this source. + + -- Matthias Klose Thu, 22 Jun 2006 18:39:57 +0200 + +python2.4 (2.4.3-8) unstable; urgency=low + + * Remove python2.4's dependency on python-central. On installation of + the runtime, call hooks /usr/share/python/runtime.d/*.rtinstall. + On removal, call hooks /usr/share/python/runtime.d/*.rtremove. + Addresses: #372658. + * Call the rtinstall hooks only, if it's a new installation, or the first + installation using the hooks. Adresses: #373677. + + -- Matthias Klose Sun, 18 Jun 2006 00:56:13 +0200 + +python2.4 (2.4.3-7) unstable; urgency=medium + + * Reupload, depend on python-central (>= 0.4.15). + * Add build-conflict on python-xml. + + -- Matthias Klose Wed, 14 Jun 2006 18:56:57 +0200 + +python2.4 (2.4.3-6) medium; urgency=low + + * idle-python2.4: Remove the old postinst and prerm scripts. + * Name the runtime correctly in python2.4-minimal's installation + scripts. + + -- Matthias Klose Mon, 12 Jun 2006 17:39:56 +0000 + +python2.4 (2.4.3-5) unstable; urgency=low + + * python2.4-prerm: Handle the case, when python-central is not installed. + * idle-python2.4: Depend on python-tk instead of python2.4-tk. + + -- Matthias Klose Fri, 9 Jun 2006 05:17:17 +0200 + +python2.4 (2.4.3-4) unstable; urgency=low + + * SVN update up to 2006-06-07 + * Use python-central. + * Don't build the -tk and -gdbm packages from this source; now built + from the python-stdlib-extensions source. + * Remove leftover build dependency on libgmp3-dev. + * Do not build-depend on libbluetooth1-dev and libgpmg1-dev on + hurd-i386, kfreebsd-i386, kfreebsd-amd64. Closes: #365830. + * Do not run the test_tcl test; hangs for unknown reasons on at least + the following buildds: vivaldi(m68k), goedel (alpha), mayer (mipsel). + And no virtual package to file bug reports for the buildds ... + Closes: #364419. + * Move the Makefile from python2.4-dev to python2.4. Closes: #366473. + * Fix typo in pdb(1). Closes: #365772. + * New autoconf likes the mandir in /usr/share instead of /usr; work + with both locations. Closes: #367618. + + -- Matthias Klose Wed, 7 Jun 2006 21:37:20 +0200 + +python2.4 (2.4.3-3) unstable; urgency=low + + * SVN update up to 2006-04-21 + * Update locale aliases from /usr/share/X11/locale/locale.alias. + * Start idle with option -n from the desktop menu, so that the program + can be started in parallel. + * Testsuite related changes only: + - Add build dependencies mime-support, libgpmg1 (needed by test cases). + - Run the testsuite with bsddb, audio and curses resources enabled. + - Re-run the failed tests in verbose mode. + - Run the test suite for the debug build as well. + - Build depend on netbase, needed by test_socketmodule. + - Build depend on libgpmg1, needed by test_curses. + - On the buildds do not run the tests needing the network resource. + * Update python logo. + * Check for the availability of the profile and pstats modules when + importing hotshot.pstats. Closes: #334067. + * Don't build the -doc package from the python2.4 source. + * Set OPT in the installed Makefile to -O2. + + -- Matthias Klose Fri, 21 Apr 2006 19:58:43 +0200 + +python2.4 (2.4.3-2) unstable; urgency=low + + * Add (build-)dependency on mime-support. + + -- Matthias Klose Tue, 4 Apr 2006 22:21:41 +0200 + +python2.4 (2.4.3-1) unstable; urgency=low + + * Python 2.4.3 release. + + -- Matthias Klose Thu, 30 Mar 2006 23:42:37 +0200 + +python2.4 (2.4.3-0ubuntu1) dapper; urgency=low + + * Python 2.4.3 release. + - Fixed a bug that the gb18030 codec raises RuntimeError on encoding + surrogate pair area on UCS4 build. Ubuntu: #29289. + + -- Matthias Klose Thu, 30 Mar 2006 10:57:32 +0200 + +python2.4 (2.4.2+2.4.3c1-0ubuntu1) dapper; urgency=low + + * SVN update up to 2006-03-25 (2.4.3 candidate 1). + - Regenerate the documentation. + + -- Matthias Klose Mon, 27 Mar 2006 12:03:05 +0000 + +python2.4 (2.4.2-1ubuntu3) dapper; urgency=low + + * SVN update up to 2006-03-04 + - Regenerate the documentation. + - map.mmap(-1, size, ...) can return anonymous memory again on Unix. + Ubuntu #26201. + * Build-depend on libncursesw5-dev, ncursesw5 is preferred for linking. + Provides UTF-8 compliant curses bindings. + * Fix difflib where certain patterns of differences were making difflib + touch the recursion limit. + + -- Matthias Klose Sat, 4 Mar 2006 21:38:24 +0000 + +python2.4 (2.4.2-1ubuntu2) dapper; urgency=low + + * SVN update up to 2006-01-17 + - pwd is now a builtin module, remove it from python-minimal. + - Regenerate the documentation. + * python2.4-tk: Suggest tix instead of tix8.1. + * Move config/Makefile from the -dev package into the runtime package + to be able to use the bdist_wininst distutils command. Closes: #348335. + + -- Matthias Klose Tue, 17 Jan 2006 11:02:24 +0000 + +python2.4 (2.4.2-1ubuntu1) dapper; urgency=low + + * Temporarily remove build dependency on lsb-release. + + -- Matthias Klose Sun, 20 Nov 2005 17:40:18 +0100 + +python2.4 (2.4.2-1build1) dapper; urgency=low + + * Rebuild (openssl-0.9.8). + + -- Matthias Klose Sun, 20 Nov 2005 15:27:24 +0000 + +python2.4 (2.4.2-1) unstable; urgency=low + + * Python 2.4.2 release. + + -- Matthias Klose Thu, 29 Sep 2005 01:49:28 +0200 + +python2.4 (2.4.1+2.4.2rc1-1) unstable; urgency=low + + * Python 2.4.2 release candidate 1. + * Fix "Fatal Python error" from cStringIO's writelines. + Patch by Andrew Bennetts. + + -- Matthias Klose Thu, 22 Sep 2005 10:33:22 +0200 + +python2.4 (2.4.1-5) unstable; urgency=low + + * CVS update up to 2005-09-14 + - Regenerate the html and info docs. + * Add some more locale aliases. + * Fix substitution pf python version in README.python2.4-minimal. + Closes: #327487. + * On m68k, build using -O2 (closes: #326903). + * On Debian, don't configure --with-fpectl, which stopped working with + glibc-2.3.5. + + -- Matthias Klose Wed, 14 Sep 2005 17:32:56 +0200 + +python2.4 (2.4.1-4) unstable; urgency=low + + * CVS update up to 2005-09-04 + - teTeX 3.0 related fixes (closes: #322407). + - Regenerate the html and info docs. + * Add entry for IDLE in the Gnome menus. + * Don't build-depend on libbluetooth-dev on the Hurd (closes: #307037). + * Reenable the cthreads patch for the Hurd (closes: #307052). + + -- Matthias Klose Sun, 4 Sep 2005 18:31:42 +0200 + +python2.4 (2.4.1-3) unstable; urgency=low + + * Synchronise with Ubuntu: + - Build a python2.4-minimal package. + + -- Matthias Klose Tue, 12 Jul 2005 00:23:10 +0000 + +python2.4 (2.4.1-2ubuntu3) breezy; urgency=low + + * CVS update up to 2005-07-07 + * Regenerate the documentation. + + -- Matthias Klose Thu, 7 Jul 2005 09:21:28 +0200 + +python2.4 (2.4.1-2ubuntu2) breezy; urgency=low + + * CVS update up to 2005-06-15 + * Regenerate the documentation. + * Synchronize with Debian. Ubuntu 10485. + * idle-python2.4 enhances python2.4. Ubuntu 11562. + * README.Debian: Fix reference to the doc directory (closes: #311677). + + -- Matthias Klose Wed, 15 Jun 2005 08:56:57 +0200 + +python2.4 (2.4.1-2ubuntu1) breezy; urgency=low + + * Update build dependencies: + db4.2-dev -> db4.3-dev, + libreadline4-dev -> libreadline5-dev. + * python2.4-dev: Add missing templates to generate HTML docs. Ubuntu 11531. + + -- Matthias Klose Sun, 29 May 2005 00:01:05 +0200 + +python2.4 (2.4.1-2) unstable; urgency=low + + * Add the debug symbols for the python2.4, python2.4-gdbm + and python2.4-tk packages to the python2.4-dbg package. + * Add gdbinit example to doc directory. + + -- Matthias Klose Thu, 5 May 2005 11:12:32 +0200 + +python2.4 (2.4.1-1ubuntu2) breezy; urgency=low + + * Add the debug symbols for the python2.4, python2.4-minimal, python2.4-gdbm + and python2.4-tk packages to the python2.4-dbg package. Ubuntu 10261, + * Add gdbinit example to doc directory. + * For os.utime, use utimes(2), correctly working with glibc-2.3.5. + Ubuntu 10294. + + -- Matthias Klose Thu, 5 May 2005 09:06:07 +0200 + +python2.4 (2.4.1-1ubuntu1) breezy; urgency=low + + * Reupload as 2.4.1-1ubuntu1. + + -- Matthias Klose Thu, 14 Apr 2005 10:46:32 +0200 + +python2.4 (2.4.1-1) unstable; urgency=low + + * Python 2.4.1 release. + * Fix noise in python-doc installation/removal. + * New Python section for the info docs. + + -- Matthias Klose Wed, 30 Mar 2005 19:42:03 +0200 + +python2.4 (2.4.1-0) hoary; urgency=low + + * Python 2.4.1 release. + * Fix noise in python-doc installation/removal. + * New Python section for the info docs. + + -- Matthias Klose Wed, 30 Mar 2005 16:35:34 +0200 + +python2.4 (2.4+2.4.1rc2-2) unstable; urgency=low + + * Add the valgrind support file to /etc/python2.4 + * Build the -dbg package with -DPy_USING_MEMORY_DEBUGGER. + * Lib/locale.py: + - correctly parse LANGUAGE as a colon separated list of languages. + - prefer LC_ALL, LC_CTYPE and LANG over LANGUAGE to get the correct + encoding. + - Don't map 'utf8', 'utf-8' to 'utf', which is not a known encoding + for glibc. + * Fix two typos in python(1). Addresses: #300124. + + -- Matthias Klose Sat, 19 Mar 2005 21:50:14 +0100 + +python2.4 (2.4+2.4.1rc2-1) unstable; urgency=low + + * Python 2.4.1 release candidate 2. + * Build-depend on libbluetooth1-dev. + + -- Matthias Klose Sat, 19 Mar 2005 00:57:14 +0100 + +python2.4 (2.4dfsg-2) unstable; urgency=low + + * CVS update up to 2005-03-03 + + -- Matthias Klose Thu, 3 Mar 2005 22:22:16 +0100 + +python2.4 (2.4dfsg-1ubuntu4) hoary; urgency=medium + + * Move exception finalisation later in the shutdown process - this + fixes the crash seen in bug #1165761, taken from CVS. + * codecs.StreamReader: Reset codec when seeking. Ubuntu #6972. + * Apply fix for SF1124295, fixing an obscure bit of Zope's security machinery. + * distutils: Don't add standard library dirs to library_dirs + and runtime_library_dirs. On amd64, runtime paths pointing to /usr/lib64 + aren't recognized by dpkg-shlibdeps, and the packages containing these + libraries aren't added to ${shlibs:Depends}. + * Lib/locale.py: + - correctly parse LANGUAGE as a colon separated list of languages. + - prefer LC_ALL, LC_CTYPE and LANG over LANGUAGE to get the correct + encoding. + - Don't map 'utf8', 'utf-8' to 'utf', which is not a known encoding + for glibc. + * os.py: Avoid using items() in environ.update(). Fixes #1124513. + * Python/pythonrun.c: + * Build depend on locales, generate the locales needed for the + testsuite. + * Add build dependency on libbluetooth1-dev, adding some bluetooth + functionality to the socket module. + * Lib/test/test_sundry.py: Don't fail on import of profile & pstats, + which are separated out to the python-profiler package. + * Fix typos in manpage. + + -- Matthias Klose Tue, 29 Mar 2005 13:35:53 +0200 + + +python2.4 (2.4dfsg-1ubuntu3) hoary; urgency=low + + * debian/patches/langpack-gettext.dpatch: + - langpack support for python-gettext added + + -- Michael Vogt Tue, 1 Mar 2005 13:13:36 +0100 + +python2.4 (2.4dfsg-1ubuntu2) hoary; urgency=low + + * Revert 'essential' status on python2.4-minimal. This status on + on python-minimal is sufficient (Ubuntu #6392). + + -- Matthias Klose Wed, 9 Feb 2005 23:09:42 +0100 + +python2.4 (2.4dfsg-1ubuntu1) hoary; urgency=low + + * Resyncronise with Debian. + * Mark the python2.4-minimal package as 'essential'. + + -- Matthias Klose Wed, 9 Feb 2005 13:31:09 +0100 + +python2.4 (2.4dfsg-1) unstable; urgency=medium + + * Add licenses and acknowledgements for incorporated software in the + debian/copyright file (addresses: #293932). + * Replace md5 implementation with one having a DFSG conforming license. + * Remove the profile.py and pstats.py modules from the source package, + not having a DFSG conforming license. The modules can be found in + the python2.x-profile package in the non-free section. + Addresses: #293932. + * Add missing norwegian locales (Tollef Fog Heen). + * CVS updates of the release24-maint branch upto 2005-02-08 (date of + the Python 2.3.5 release). + + -- Matthias Klose Tue, 8 Feb 2005 19:13:10 +0100 + +python2.4 (2.4-7ubuntu1) hoary; urgency=low + + * Fix the name of the python-dbg man page. + * Resyncronise with Debian. + * Move more modules to -minimal (new code in copy.py requires these): + dis, inspect, opcode, token, tokenize. + + -- Matthias Klose Tue, 8 Feb 2005 19:13:10 +0100 + +python2.4 (2.4-7) unstable; urgency=medium + + * Add licenses and acknowledgements for incorporated software in the + debian/copyright file (addresses: #293932). + * Replace md5 implementation with one having a DFSG conforming license. + * Add missing norwegian locales (Tollef Fog Heen). + * CVS updates of the release24-maint branch upto 2005-02-08 (date of + the Python 2.3.5 release). + + -- Matthias Klose Tue, 8 Feb 2005 19:13:10 +0100 + +python2.4 (2.4-6) unstable; urgency=low + + * Build a python2.4-dbg package using --with-pydebug. Add a debug + directory /lib-dynload/debug to sys.path instead of + /lib-dynload und install the extension modules of the + debug build in this directory. + Change the module load path to load extension modules from other + site-packages/debug directories (for further details see the + README in the python2.4-dbg package). Closes: #5415. + * Apply the pydebug-path patch. The package was already built in -5. + + -- Matthias Klose Fri, 4 Feb 2005 22:15:13 +0100 + +python2.4 (2.4-5) unstable; urgency=high + + * Fix a flaw in SimpleXMLRPCServerthat can affect any XML-RPC servers. + This affects any programs have been written that allow remote + untrusted users to do unrestricted traversal and can allow them to + access or change function internals using the im_* and func_* attributes. + References: CAN-2005-0089. + * CVS updates of the release24-maint branch upto 2005-02-04. + + -- Matthias Klose Fri, 4 Feb 2005 08:12:10 +0100 + +python2.4 (2.4-4) unstable; urgency=medium + + * Update debian/copyright to the 2.4 license text (closes: #290898). + * Remove /usr/bin/smtpd.py (closes: #291049). + + -- Matthias Klose Mon, 17 Jan 2005 23:54:37 +0100 + +python2.4 (2.4-3ubuntu6) hoary; urgency=low + + * Use old-style dpatches instead of dpatch-run. + + -- Tollef Fog Heen Mon, 7 Feb 2005 15:58:05 +0100 + +python2.4 (2.4-3ubuntu5) hoary; urgency=low + + * Actually apply the patch as well (add to list of patches in + debian/rules) + + -- Tollef Fog Heen Sun, 6 Feb 2005 15:12:58 +0100 + +python2.4 (2.4-3ubuntu4) hoary; urgency=low + + * Add nb_NO and nn_NO locales to Lib/locale.py + + -- Tollef Fog Heen Sun, 6 Feb 2005 14:33:05 +0100 + +python2.4 (2.4-3ubuntu3) hoary; urgency=low + + * Fix a flaw in SimpleXMLRPCServerthat can affect any XML-RPC servers. + This affects any programs have been written that allow remote + untrusted users to do unrestricted traversal and can allow them to + access or change function internals using the im_* and func_* attributes. + References: CAN-2005-0089. + + -- Matthias Klose Wed, 2 Feb 2005 09:08:20 +0000 + +python2.4 (2.4-3ubuntu2) hoary; urgency=low + + * Build a python2.4-dbg package using --with-pydebug. Add a debug + directory /lib-dynload/debug to sys.path instead of + /lib-dynload und install the extension modules of the + debug build in this directory. + Change the module load path to load extension modules from other + site-packages/debug directories (for further details see the + README in the python2.4-dbg package). Closes: #5415. + * Update debian/copyright to the 2.4 license text (closes: #290898). + * Add operator and copy to the -minimal package. + + -- Matthias Klose Mon, 17 Jan 2005 23:19:47 +0100 + +python2.4 (2.4-3ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + * python2.4: Depend on the very same version of python2.4-minimal. + * Docment, that time.strptime currently cannot be used, if the + python-minimal package is installed without the python package. + + -- Matthias Klose Sun, 9 Jan 2005 19:35:48 +0100 + +python2.4 (2.4-3) unstable; urgency=medium + + * Build the fpectl module. + * Updated to CVS release24-maint 20050107. + + -- Matthias Klose Sat, 8 Jan 2005 19:05:21 +0100 + +python2.4 (2.4-2ubuntu5) hoary; urgency=low + + * Updated to CVS release24-maint 20050102. + * python-minimal: + - os.py: Use dict instead of UserDict, remove UserDict from -minimal. + - add pickle, threading, needed for subprocess module. + - optparse.py: conditionally import gettext, if not available, + define _ as the identity function. Patch taken from the trunk. + Avoids import of _locale, locale, gettext, copy, repr, itertools, + collections, token, tokenize. + - Add a build check to make sure that the minimal module list is + closed under dependency. + * Fix lintian warnings. + + -- Matthias Klose Sun, 2 Jan 2005 22:00:14 +0100 + +python2.4 (2.4-2ubuntu4) hoary; urgency=low + + * Add UserDict.py to the -minimal package, since os.py needs it. + + -- Colin Watson Thu, 30 Dec 2004 20:41:28 +0000 + +python2.4 (2.4-2ubuntu3) hoary; urgency=low + + * Add os.py and traceback.py to the -minimal package, get the list + of modules from the README. + + -- Matthias Klose Mon, 27 Dec 2004 08:20:45 +0100 + +python2.4 (2.4-2ubuntu2) hoary; urgency=low + + * Add compileall.py and py_compile.py to the -minimal package, not + just to the README ... + + -- Matthias Klose Sat, 25 Dec 2004 22:24:56 +0100 + +python2.4 (2.4-2ubuntu1) hoary; urgency=low + + * Separate the interpreter and a minimal subset of modules into + a python2.4-minimal package. See the README.Debian.gz in this + package. + * Move site.py to python2.4-minimal as well. + * Add documentation files for devhelp. + + -- Matthias Klose Sun, 19 Dec 2004 22:47:32 +0100 + +python2.4 (2.4-2) unstable; urgency=medium + + * Updated patch for #283108. Thanks to Jim Meyering. + + -- Matthias Klose Fri, 3 Dec 2004 17:00:16 +0100 + +python2.4 (2.4-1) unstable; urgency=low + + * Final 2.4 release. + * Flush stdout/stderr if closed (SF #1074011). + + -- Matthias Klose Wed, 1 Dec 2004 07:54:34 +0100 + +python2.4 (2.3.97-2) unstable; urgency=low + + * Don't run test_tcl, hanging on the buildds. + + -- Matthias Klose Fri, 19 Nov 2004 23:48:42 +0100 + +python2.4 (2.3.97-1) unstable; urgency=low + + * Python 2.4 Release Candidate 1. + + -- Matthias Klose Fri, 19 Nov 2004 21:27:02 +0100 + +python2.4 (2.3.96-1) experimental; urgency=low + + * Updated to CVS release24-maint 20041113. + * Build the docs in info format again. + + -- Matthias Klose Sat, 13 Nov 2004 21:21:10 +0100 + +python2.4 (2.3.95-2) experimental; urgency=low + + * Move distutils package from the python2.4-dev into the python2.4 + package. + + -- Matthias Klose Thu, 11 Nov 2004 22:56:14 +0100 + +python2.4 (2.3.95-1) experimental; urgency=low + + * Python 2.4 beta2 release. + + -- Matthias Klose Thu, 4 Nov 2004 23:43:47 +0100 + +python2.4 (2.3.94-1) experimental; urgency=low + + * Python 2.4 beta1 release. + + -- Matthias Klose Sat, 16 Oct 2004 08:33:57 +0200 + +python2.4 (2.3.93-1) experimental; urgency=low + + * Python 2.4 alpha3 release. + + -- Matthias Klose Fri, 3 Sep 2004 21:53:47 +0200 + +python2.4 (2.3.92-1) experimental; urgency=low + + * Python 2.4 alpha2 release. + + -- Matthias Klose Thu, 5 Aug 2004 23:53:18 +0200 + +python2.4 (2.3.91-1) experimental; urgency=low + + * Python 2.4 alpha1 release. + Highlights: http://www.python.org/2.4/highlights.html + + -- Matthias Klose Fri, 9 Jul 2004 17:38:54 +0200 + +python2.4 (2.3.90-1) experimental; urgency=low + + * Package HEAD branch (pre alpha ..). + + -- Matthias Klose Mon, 14 Jun 2004 23:19:57 +0200 + +python2.3 (2.3.4-1) unstable; urgency=medium + + * Final Python 2.3.4 Release. + * In the API docs, fix signature of PyModule_AddIntConstant (closes: #250826). + * locale.getdefaultlocale: don't fail with empty environment variables. + Closes: #249816. + * Include distutils/command/wininst.exe in -dev package (closes: #249006). + * Disable cthreads on the Hurd (Michael Banck). Closes: #247211. + * Add a note to pygettext(1), that this program is deprecated in favour + of xgettext, which now includes support for Python as well. + Closes: #246332. + + -- Matthias Klose Fri, 28 May 2004 22:59:42 +0200 + +python2.3 (2.3.3.91-1) unstable; urgency=low + + * Python 2.3.4 Release Candidate 1. + * Do not use the default namespace for attributes. Patch taken from the + 2.3 maintenance branch. + The xmllib module is obsolete. Use xml.sax instead. + * http://python.org/sf/945642 - fix nonblocking i/o with ssl socket. + + -- Matthias Klose Thu, 13 May 2004 21:24:52 +0200 + +python2.3 (2.3.3-7) unstable; urgency=low + + * Add a workaround for GNU libc nl_langinfo()'s returning NULL. + Closes: #239237. + Patch taken from 2.3 maintenance branch. + * threading.py: Remove calls to currentThread() in _Condition methods that + were side-effect. Side-effects were deemed unnecessary and were causing + problems at shutdown time when threads were catching exceptions at start + time and then triggering exceptions trying to call currentThread() after + gc'ed. Masked the initial exception which was deemed bad. + Closes: #195812. + * Properly support normalization of empty unicode strings. Closes: #239986. + Patch taken from 2.3 maintenance branch. + * README.maintainers: Add section where to find the documentation tools. + * Fix crash in pyexpat module (closes: #229281). + * For the Hurd, set the interpreters recursion limit to 930. + * Do not try to byte-compile the test files on installation; this + currently breaks the Hurd install. + + -- Matthias Klose Sat, 1 May 2004 07:50:46 +0200 + +python2.3 (2.3.3-6) unstable; urgency=low + + * Don't build the unversioned python{,-*} packages anymore. Now + built from the python-defaults package. + * Update to the proposed python-policy: byte-compile using -E. + * Remove python-elisp's dependency on emacs20 (closes: #232785). + * Don't build python-elisp from the python2.3 source anymore, + get it from python-mode.sf.net as a separate source package. + * python2.3-dev suggests libc-dev (closes: #231091). + * get LDSHARED and CCSHARED (like, CC, CXX, CPP, CFLAGS) from + the environment + * Set CXX in installed config/Makefile (closes: #230273). + + -- Matthias Klose Tue, 24 Feb 2004 07:07:51 +0100 + +python2.3 (2.3.3-5) unstable; urgency=low + + * Build-depend on libdb4.2-dev, instead of libdb4.1-dev. According + to the docs the file format is compatible. + + -- Matthias Klose Mon, 12 Jan 2004 10:37:45 +0100 + +python2.3 (2.3.3-4) unstable; urgency=low + + * Fix broken _bsddb module. setup.py picked up the wrong library. + + -- Matthias Klose Sun, 4 Jan 2004 11:30:00 +0100 + +python2.3 (2.3.3-3) unstable; urgency=low + + * Fix typo in patch (closes: #224797, #226064). + + -- Matthias Klose Sun, 4 Jan 2004 09:23:21 +0100 + +python2.3 (2.3.3-2) unstable; urgency=medium + + * Lib/email/Charset: use locale unaware function to lower case of locale + name (closes: #224797). + * Update python-mode to version from python-mode.sf.net. Fixes highlighting + problems (closes: #223520). + * Backport from mainline: Add IPV6_ socket options from RFCs 3493 and 3542. + + -- Matthias Klose Fri, 2 Jan 2004 14:03:26 +0100 + +python2.3 (2.3.3-1) unstable; urgency=low + + * New upstream release. + * Copy the templates, tools and scripts from the Doc dir in the source + to /usr/share/lib/python2.3/doc in the python2.3-dev package. Needed + for packages building documentation like python does (closes: #207337). + + -- Matthias Klose Fri, 19 Dec 2003 10:57:39 +0100 + +python2.3 (2.3.2.91-1) unstable; urgency=low + + * New upstream version (2.3.3 release candidate). + * Update python-mode.el (closes: #158811, #159630). + Closing unreproducible report (closes: #159628). + + -- Matthias Klose Sat, 6 Dec 2003 14:41:14 +0100 + +python2.3 (2.3.2-7) unstable; urgency=low + + * Put the conflict in the correct direction. python2.3 (2.3.2-6) doesn't + conflict with python (<= 2.3.2-5) but python (2.3.2-6) conflicts with + python2.3 (<= 2.3.2-5) (thanks to Brian May). Really closes #221791. + + -- Matthias Klose Fri, 21 Nov 2003 00:20:02 +0100 + +python2.3 (2.3.2-6) unstable; urgency=low + + * Add conflicts with older python{,2.3} packages to fix overwrite + errors (closes: #221791). + + -- Matthias Klose Thu, 20 Nov 2003 07:24:36 +0100 + +python2.3 (2.3.2-5) unstable; urgency=low + + * Updated to CVS release23-maint 20031119. + * Re-upgrade the dependency of python2.3 on python (>= 2.3) to + a dependency (closes: #221523). + + -- Matthias Klose Wed, 19 Nov 2003 00:30:27 +0100 + +python2.3 (2.3.2-4) unstable; urgency=low + + * Don't build-depend on latex2html (moved to non-free), but keep + the prebuilt docs in debian/patches (closes: #221347). + * Fix typos in the library reference (closes: #220510, #220954). + * Fix typo in python-elisp's autoloading code (closes: #220308). + * Update proposed python policy: private modules can be installed + into /usr/lib/ (arch dependent) and into /usr/share/ + (arch independent). + + -- Matthias Klose Tue, 18 Nov 2003 00:41:39 +0100 + +python2.3 (2.3.2-3) unstable; urgency=low + + * Downgrade the dependency of python2.3 on python (>= 2.3) to + a recommendation. + * Fix path to interpreter in binfmt file. + * Fix segfault in unicodedata module (closes: #218697). + * Adjust python-elisp autoload code (closes: #219821). + + -- Matthias Klose Sun, 9 Nov 2003 19:43:37 +0100 + +python2.3 (2.3.2-2) unstable; urgency=medium + + * Fix broken doc link (closes: #214217). + * Disable wrongly detected large file support for GNU/Hurd. + * Really fix the FTBFS for the binary-indep target (closes: #214303). + + -- Matthias Klose Mon, 6 Oct 2003 07:54:58 +0200 + +python2.3 (2.3.2-1) unstable; urgency=low + + * New upstream version. + * Fix a FTBFS for the binary-indep target. + + -- Matthias Klose Sat, 4 Oct 2003 10:20:15 +0200 + +python2.3 (2.3.1-3) unstable; urgency=low + + * Fix names of codec packages in recommends. + * On alpha compile using -mieee (see #212912). + + -- Matthias Klose Sun, 28 Sep 2003 10:48:12 +0200 + +python2.3 (2.3.1-2) unstable; urgency=low + + * Update python policy draft (closes: #128911, #163785). + * Re-add os.fsync function (closes: #212672). + * Let python2.3-doc conflict with older python2.3 versions (closes: #211882). + * Add recommends for pythonX.Y-japanese-codecs, pythonX.Y-iconvcodec, + pythonX.Y-cjkcodecs, pythonX.Y-korean-codecs (closes: #207161). + * Generate binfmt file (closes: #208005). + * Add IPPROTO_IPV6 option to the socketmodule (closes: #206569). + * Bugs reported against python2.2 and fixed in python2.3: + - Crashes in idle (closes: #186887, #200084). + + -- Matthias Klose Sat, 27 Sep 2003 11:21:47 +0200 + +python2.3 (2.3.1-1) unstable; urgency=low + + * New upstream version (bug fix release). + + -- Matthias Klose Wed, 24 Sep 2003 11:27:43 +0200 + +python2.3 (2.3-4) unstable; urgency=high + + * Disable check for utimes function, which is broken in glibc-2.3.2. + Packages using distutils had '1970/01/01-01:00:01' timestamps in files. + * Bugs fixed by making python2.3 the default python version: + - Canvas.scan_dragto() takes a 3rd optional parmeter "gain". + Closes: #158168. + - New command line parsing module (closes: #38628). + - compileall.py allows compiling single files (closes: #139971). + * Bugs reported for 2.2 and fixed in 2.3: + - Idle does save files with ASCII characters (closes: #179313). + - imaplib support for prefix-quoted strings (closes: #150485). + - posixpath includes getctime (closes: #173827). + - pydoc has support for keywords (closes: #186775). + * Bugs reported for 2.1 and fixed in 2.3: + - Fix handling of "#anchor" URLs in urlparse (closes: #147844). + - Fix readline if C stdin is not a tty, even if sys.stdin is. + Closes: #131810. + * Updated to CVS release23-maint 20030810 (fixing memory leaks in + array and socket modules). + * pydoc's usage output uses the basename of the script. + * Don't explicitely remove /etc/python2.3 on purge (closes: #202864). + * python conflicts with python-xmlbase (closes: #204773). + * Add dependency python (>= 2.3) to python2.3, so make sure the + unversioned names can be used. + + -- Matthias Klose Sun, 10 Aug 2003 09:27:52 +0200 + +python2.3 (2.3-3) unstable; urgency=medium + + * Fix shlibs file. + + -- Matthias Klose Fri, 8 Aug 2003 08:45:12 +0200 + +python2.3 (2.3-2) unstable; urgency=medium + + * Make python2.3 the default python version. + + -- Matthias Klose Tue, 5 Aug 2003 22:13:22 +0200 + +python2.3 (2.3-1) unstable; urgency=low + + * Python 2.3 final release. + + -- Matthias Klose Wed, 30 Jul 2003 08:12:28 +0200 + +python2.3 (2.2.107-1rc2) unstable; urgency=medium + + * Python 2.3 release candidate 2. + * Don't compress .txt files referenced by the html docs (closes: #200298). + * Include the email/_compat* files (closes: #200349). + + -- Matthias Klose Fri, 25 Jul 2003 07:08:09 +0200 + +python2.3 (2.2.106-2beta2) unstable; urgency=medium + + * Python 2.3 beta2 release, updated to CVS 20030704. + - Fixes AssertionError in httplib (closed: #192452). + - Fixes uncaught division by zero in difflib.py (closed: #199287). + * Detect presence of setgroups(2) at configure time (closes: #199839). + * Use default gcc on arm as well. + + -- Matthias Klose Sat, 5 Jul 2003 10:21:33 +0200 + +python2.3 (2.2.105-1beta2) unstable; urgency=low + + * Python 2.3 beta2 release. + - Includes merged idle fork. + - Fixed socket.setdefaulttimeout(). Closes: #189380. + - socket.ssl works with _socketobj. Closes: #196082. + * Do not link libtix to the _tkinter module. It's loaded via + 'package require tix' at runtime. python2.3-tkinter now + suggests tix8.1 instead. + * On arm, use gcc-3.2 to build. + * Add -fno-strict-aliasing rules to OPT to avoid warnings + "dereferencing type-punned pointer will break strict-aliasing rules", + when building with gcc-3.3. + + -- Matthias Klose Mon, 30 Jun 2003 00:19:32 +0200 + +python2.3 (2.2.104-1beta1.1) unstable; urgency=low + + * Non-maintainer upload with maintainer consent. + * debian/control (Build-Depends): s/libgdbmg1-dev/libgdbm-dev/. + + -- James Troup Wed, 4 Jun 2003 02:24:27 +0100 + +python2.3 (2.2.104-1beta1) unstable; urgency=low + + * Python 2.3 beta1 release, updated to CVS 20030514. + - build the current documentation. + * Reenable Tix support. + + -- Matthias Klose Wed, 14 May 2003 07:38:57 +0200 + +python2.3 (2.2.103-1beta1) unstable; urgency=low + + * Python 2.3 beta1 release, updated to CVS 20030506. + - updated due to build problems on mips/mipsel. + - keep the 2.3b1 documentation (doc build problems with cvs). + + -- Matthias Klose Wed, 7 May 2003 06:26:39 +0200 + +python2.3 (2.2.102-1beta1) unstable; urgency=low + + * Python 2.3 beta1 release. + + -- Matthias Klose Sat, 3 May 2003 22:45:16 +0200 + +python2.3 (2.2.101-1exp1) unstable; urgency=medium + + * Python 2.3 alpha2 release, updated to CVS 20030321. + * Tkinter: Catch exceptions thrown for undefined substitutions in + events (needed for tk 8.4.2). + + -- Matthias Klose Fri, 21 Mar 2003 21:32:14 +0100 + +python2.3 (2.2.100-1exp1) unstable; urgency=low + + * Python 2.3 alpha2 release, updated to CVS 20030221. + + -- Matthias Klose Fri, 21 Feb 2003 19:37:17 +0100 + +python2.3 (2.2.99-1exp1) unstable; urgency=low + + * Python 2.3 alpha1 release updated to CVS 20030123. + - should fix the testsuite (and package build) failure on alpha. + * Remove build dependency on libexpat1-dev. Merge the python2.3-xmlbase + package into python2.3 (closes: #177739). + + -- Matthias Klose Thu, 23 Jan 2003 22:48:12 +0100 + +python2.3 (2.2.98-1exp1) unstable; urgency=low + + * Python 2.3 alpha1 release updated to CVS 20030117. + * Build using libdb4.1. + + -- Matthias Klose Sat, 18 Jan 2003 00:14:01 +0100 + +python2.3 (2.2.97-1exp1) unstable; urgency=low + + * Python 2.3 alpha1 release updated to CVS 20030109. + * Build-Depend on g++ (>= 3:3.2). + * Python package maintainers: please wait uploading python dependent + packages until python2.2 and python2.1 are compiled using gcc-3.2. + + -- Matthias Klose Thu, 9 Jan 2003 23:56:42 +0100 + +python2.3 (2.2.96-1exp1) unstable; urgency=low + + * Python 2.3 alpha1 release (not exactly the tarball, but taken from + CVS 20030101). + - Includes support for linking with threaded tk8.4 (closes: #172714). + * Install and register whatsnew document (closes: #173859). + * Properly unregister info documentation. + + -- Matthias Klose Wed, 1 Jan 2003 17:38:54 +0100 + +python2.3 (2.2.95-1exp1) unstable; urgency=low + + * Experimental packages from CVS 021212. + - data in unicodedate module is up to date (closes: #171061). + * Fix idle packaging (closes: #170394). + * Configure using unicode UCS-4 (closes: #171062). + This change breaks compatibility with binary modules, but what do you + expect from experimental packages ... Please recompile dependent packages. + * Don't strip binaries for now. + + -- Matthias Klose Thu, 12 Dec 2002 21:42:27 +0100 + +python2.3 (2.2.94-1exp1) unstable; urgency=low + + * Experimental packages from CVS 021120. + * Remove outdated README.dbm. + * Depend on tk8.4. + * python-elisp: Install emacsen install file with mode 644 (closes: #167718). + + -- Matthias Klose Thu, 21 Nov 2002 01:04:51 +0100 + +python2.3 (2.2.93-1exp1) unstable; urgency=medium + + * Experimental packages from CVS 021015. + * Build a static library libpython2.3-pic.a. + * Enable large file support for the Hurd (closes: #164602). + + -- Matthias Klose Tue, 15 Oct 2002 21:06:27 +0200 + +python2.3 (2.2.92-1exp1) unstable; urgency=low + + * Experimental packages from CVS 020922. + * Fix build error on ia64 (closes: #161234). + * Build depend on gcc-3.2-3.2.1-0pre2 to fix build error on arm. + + -- Matthias Klose Sun, 22 Sep 2002 18:30:28 +0200 + +python2.3 (2.2.91-1exp1) unstable; urgency=low + + * Experimental packages from CVS 020906. + * idle-python2.3: Fix conflict (closes: #159267). + * Fix location of python-mode.el (closes: #159564, #159619). + * Use tix8.1. + * Apply fix for distutils/ccompiler problem (closes: #159288). + + -- Matthias Klose Sat, 7 Sep 2002 09:55:07 +0200 + +python2.3 (2.2.90-1exp1) unstable; urgency=low + + * Experimental packages from CVS 020820. + * Don't build python2.3-elisp, but put the latest version into + python-elisp. + + -- Matthias Klose Thu, 22 Aug 2002 21:52:04 +0200 + +python2.2 (2.2.1-6) unstable; urgency=low + + * CVS updates of the release22-maint branch upto 2002-07-23. + * Enable IPv6 support (closes: #152543). + * Add python2.2-tk suggestion for python2.2 (pydoc -g). + * Fix from SF patch #527518: proxy config with user+pass authentication. + * Point pydoc to the correct location of the docs (closes: #147579). + * Remove '*.py[co]' files, when removing the python package, + not when purging (closes: #147130). + * Update to new py2texi.el version (Milan Zamazal). + + -- Matthias Klose Mon, 29 Jul 2002 23:11:32 +0200 + +python2.2 (2.2.1-5) unstable; urgency=low + + * CVS updates of the release22-maint branch upto 2002-05-03. + * Build the info docs (closes: #145653). + + -- Matthias Klose Fri, 3 May 2002 22:35:46 +0200 + +python2.2 (2.2.1-4) unstable; urgency=high + + * Fix indentation errors introduced in last upload (closes: #143809). + + -- Matthias Klose Sun, 21 Apr 2002 01:00:14 +0200 + +python2.2 (2.2.1-3) unstable; urgency=high + + * Add Build-Conflicts: tcl8.0-dev, tk8.0-dev, tcl8.2-dev, tk8.2-dev. + Closes: #143534 (build a working _tkinter module, on machines, where + 8.0's tk.h gets included). + * CVS updates of the release22-maint branch upto 2002-04-20. + + -- Matthias Klose Sat, 20 Apr 2002 09:22:37 +0200 + +python2.2 (2.2.1-2) unstable; urgency=low + + * Forgot to copy the dlmodule patch from the 2.1.3 package. Really + closes: #141681. + + -- Matthias Klose Sat, 13 Apr 2002 01:28:05 +0200 + +python2.2 (2.2.1-1) unstable; urgency=high + + * Final 2.2.1 release. + * According to report #131813, the python interpreter is much faster on some + architectures, when beeing linked statically with the python library (25%). + Gregor and me tested on i386, m68k and alpha, but we could not reproduce + such a speedup (generally between 5% and 10%). But we are linking the + python executable now statically ... + * Build info docs from the tex source, merge the python-doc-info + package into the python-doc package. + * Always build the dl module. Failure in case of + sizeof(int)!=sizeof(long)!=sizeof(void*) + is delayed until dl.open is called. Closes: #141681. + + -- Matthias Klose Thu, 11 Apr 2002 00:19:19 +0200 + +python2.2 (2.2.0.92-0) unstable; urgency=low + + * Package CVS sources, omit cvs-updates.dpatch (closes: #140977). + + -- Matthias Klose Wed, 3 Apr 2002 08:20:52 +0200 + +python2.2 (2.2-6) unstable; urgency=medium + + * Update to python-2.2.1 release candidate 2 (final release scheduled + for April 10). + * Enable dl module (closes: #138992). + * Build doc files with python binary from package (closes: #139657). + * Build _tkinter module with BLT and Tix support. + * python2.2-elisp: Conflict with python2-elisp (closes: #138970). + * string.split docs updated in python-2.2.1 (closes: #129272). + + -- Matthias Klose Mon, 1 Apr 2002 13:52:36 +0200 + +python2.2 (2.2-5) unstable; urgency=low + + * CVS updates of the release22-maint branch upto 20020310 (aproaching + the first 2.2.1 release candidate). + * Stolen from HEAD: check argument of locale.nl_langinfo (closes: #137371). + + -- Matthias Klose Fri, 15 Mar 2002 01:05:59 +0100 + +python2.2 (2.2-4) unstable; urgency=medium + + * Include test/{__init__.py,README,pystone.py} in package (closes: #129013). + * Fix python-elisp conflict (closes: #129046). + * Don't compress stylesheets (closes: #133179). + * CVS updates of the release22-maint branch upto 20020310. + + -- Matthias Klose Sun, 10 Mar 2002 23:32:28 +0100 + +python2.2 (2.2-3) unstable; urgency=medium + + * Updates from the CVS python22-maint branch up to 20020107. + webbrowser.py: properly escape url's. + * The Hurd does not have large file support: disabled. + + -- Matthias Klose Mon, 7 Jan 2002 21:55:57 +0100 + +python2.2 (2.2-2) unstable; urgency=medium + + * CVS updates of the release22-maint branch upto 20011229. Fixes: + - Include TCP_CORK flag in plat-linux2 headers (fixes: #84340). + - Update CDROM.py module (fixes: #125785). + * Add missing chunk of the GNU/Hurd patch (therefore urgency medium). + * Send anonymous password when using anonftp (closes: #126814). + + -- Matthias Klose Sat, 29 Dec 2001 20:18:26 +0100 + +python2.2 (2.2-1) unstable; urgency=low + + * New upstream version: 2.2. + * Bugs fixed upstream: + - Docs for os.kill reference the signal module for constants. + - Documentation strings in the tutorial end with a period (closes: #94770). + - Tk: grid_location method moved from Grid to Misc (closes: #98338). + - mhlib.SubMessage.getbodytext takes decode parameter (closes: #31876). + - Strings in modules are locale aware (closes: #51444). + - Printable 8-bit characters in strings are correctly printed + (closes: #64354). + - Dictionary can be updated with abstract mapping object (closes: #46566). + * Make site.py a config files. + + -- Matthias Klose Sat, 22 Dec 2001 00:51:46 +0100 + +python2.2 (2.1.99c1-1) unstable; urgency=low + + * New upstream version: 2.2c1 (release candidate). + * Do not provide python2.2-base anymore. + * Install correct README.Debian for python2.2 package. Include hint + where to find Makefile.pre.in. + * Suggest installation of python-ssl. + * Remove idle config files on purge. + * Remove empty /usr/lib/python2.2 directory on purge. + + -- Matthias Klose Sat, 15 Dec 2001 17:56:27 +0100 + +python2.2 (2.1.99beta2-1) unstable; urgency=high + + * debian/rules: Reflect removal of regrtest package (closes: #122278). + Resulted in build failures on all architectures. + * Build -doc package from source. + + -- Matthias Klose Sat, 8 Dec 2001 00:38:41 +0100 + +python2.2 (2.1.99beta2-0.1) unstable; urgency=low + + * Non maintainer upload. + * New upstream version (this is 2.2beta2). + * Do not build the python-regrtest package anymore; keep the test framework + components test/regrtest.py and test/test_support.py in the python + package (closes: #119408). + + -- Gregor Hoffleit Tue, 27 Nov 2001 09:53:26 +0100 + +python2.2 (2.1.99beta1-4) unstable; urgency=low + + * Configure with --with-fpectl (closes: #118125). + * setup.py: Remove broken check for _curses_panel module (#116081). + * idle: Move config-* files to /etc and mark as conffiles (#106390). + * Move idle packages to section `devel'. + + -- Matthias Klose Wed, 31 Oct 2001 10:56:45 +0100 + +python2.2 (2.1.99beta1-3) unstable; urgency=low + + * Fix shlibs file (was still referring to 2.1). Closes: #116810. + * README.Debian: point to draft of python-policy in the python package. + + -- Matthias Klose Wed, 31 Oct 2001 10:56:45 +0100 + +python2.2 (2.1.99beta1-2) unstable; urgency=medium + + * Fix shlibs file (was still referring to 2.1). Closes: #116810. + * Rename package python2.2-base to python2.2. + + -- Matthias Klose Wed, 24 Oct 2001 23:00:50 +0200 + +python2.2 (2.1.99beta1-1) unstable; urgency=low + + * New upstream version (beta). Call the package version 2.1.99beta1-1. + * New maintainer until the final 2.2 release. + * Updated the debian patches. + + -- Matthias Klose Sat, 20 Oct 2001 18:56:26 +0200 + +python2.1 (2.1.1-1.2) unstable; urgency=low + + * Really remove the python alternative. + + -- Matthias Klose Sat, 20 Oct 2001 15:16:56 +0200 + +python2.1 (2.1.1-1.1) unstable; urgency=low + + * README FOR PACKAGE MAINTAINERS: It is planned to remove the python2-XXX + packages from unstable and move on to python2.1. + If you repackage/adapt your modules for python2.1, don't build + python2-XXX and python2.1-XXX packages from the same source package, + so that the python2-XXX package can be removed without influencing the + python2.1-XXX package. + + See the debian-python mailing list at http://lists.debian.org/devel.html + for details and the current discussion and a draft for a debian-python + policy (August to October 2001). + + * Remove alternative for /usr/bin/python. The python-base package now + provides the default python version. + + * Regenerate control file to fix build dependencies (closes: #116190). + * Remove alternative for /usr/bin/{python,pydoc}. + * Provide a libpython2.1.so symlink in /usr/lib/python2.1/config, + so that the shared library is found when -L/usr/lib/python2.1/config + is specified. + * Conflict with old package versions, where /usr/bin/python is a real + program (closes: #115943). + * python2.1-elisp conflicts with python-elisp (closes: #115895). + * We now have 2.1 (closes: #96851, #107849, #110243). + + -- Matthias Klose Fri, 19 Oct 2001 17:34:41 +0200 + +python2.1 (2.1.1-1) unstable; urgency=low + + * Incorporated Matthias' modifications. + + -- Gregor Hoffleit Thu, 11 Oct 2001 00:16:42 +0200 + +python2.1 (2.1.1-0.2) unstable; urgency=low + + * New upstream 2.1.1. + * GPL compatible licence (fixes #84080, #102949, #110643). + * Fixed upstream (closes: #99692, #111340). + * Build in separate build directory. + * Split Debian patches into debian/patches directory. + * Build dependencies: Add libgmp3-dev, libexpat1-dev, tighten + debhelper dependency. + * debian/rules: Updated a "bit". + * python-elisp: Remove custom dependency (closes: #87783), + fix emacs path (closes: #89712), remove emacs19 dependency (#82694). + * Mention distutils in python-dev package description (closes: #108170). + * Update README.Debian (closes: #85430). + * Run versioned python in postinsts (closes: #113349). + * debian/sample.{postinst,prerm}: Change to version independent scripts. + * Use '/usr/bin/env python2.1' as interpreter for all python scripts. + * Add libssl-dev to Build-Conflicts. + * python-elisp: Add support for emacs21 (closes: #98635). + * Do not compress .py files in doc directories. + * Don't link explicitely with libc. + + -- Matthias Klose Wed, 3 Oct 2001 09:53:08 +0200 + +python2.1 (2.1.1-0.1) unstable; urgency=low + + * New upstream version (CVS branch release21-maint, will become 2.1.1): + This CVS branch will be released as 2.1.1 under a GPL compatible + license. + + -- Gregor Hoffleit Wed, 27 Jun 2001 22:47:58 +0200 + +python2 (2.1-0.1) unstable; urgency=low + + * Fixed Makefile.pre.in. + * Fixed the postinst files in order to use 2.1 (instead of 2.0). + * Mention the immanent release of 2.0.1 and 2.1.1, with a GPL + compatible license. + + -- Gregor Hoffleit Sun, 17 Jun 2001 21:05:25 +0200 + +python2 (2.1-0) unstable; urgency=low + + * New upstream version. + * Experimental packages. + + -- Gregor Hoffleit Thu, 10 May 2001 00:20:04 +0200 + +python2 (2.0-7) unstable; urgency=low + + * Rebuilt with recent tcl8.3-dev/tk8.3-dev in order to fix a + dependency problem with python2-tk (closes: #87793, #92962). + * Change postinst to create and update /usr/local/lib/python2.0 and + site-python with permissions and owner as mandated by policy: + 2775 and root:staff (closes: #89047). + * Fix to compileall.py: A superfluous argument made compileall without + options fail (cf. #92990 for python). + * Move the distutils module into python2-dev. It needs Makefile.pre.in + in order to work (closes: #89900). + * Remove build-dependency on libgdbm2-dev (which isn't built anyway). + * Add a build-dependency on libdb2-dev (cf. #90220 for python). + + -- Gregor Hoffleit Sat, 14 Apr 2001 21:07:51 +0200 + +python2 (2.0-6) unstable; urgency=low + + * Remove python-zlib package; merge it into python-base. + * Mark that README.python2 is not yet updated. + + -- Gregor Hoffleit Wed, 21 Feb 2001 12:34:18 +0100 + +python2 (2.0-5) unstable; urgency=low + + * Recompile with tcl/tk8.3 (closes: #82088). + * Modifications to README.why-python2 (closes: #82116). + * Add menu hint to idle2 menu entry. + * idle2 is renamed idle-python2 and now build correctly (closes: #82218). + * Add build-dependency on autoconf (closes: #85339). + * Build bsddbmodule as shared module (Modules/Setup.config.in), + and link libpython2.so with -lm in Makefile (closes: #86027). + * various cleanups in debian/rules, e.g. removing dh_suidregister. + * Make pdb available as /usr/bin/pdb-python2 in python2-dev + (cf. #79870 in python-base). + * Remove libgmp3 from build-dependencies, since we currently can't + build the mpzmodule for Python2 due to license problems. + + -- Gregor Hoffleit Sun, 18 Feb 2001 00:12:17 +0100 + +python2 (2.0-4) unstable; urgency=low + + * control: make python2-elisp conflict with python-elisp (it doesn't + make sense to have both of them installed, does it ?) + * include build-depend on libxmltok1-dev. + * again, build with tcl/tk8.0. + + -- Gregor Hoffleit Wed, 10 Jan 2001 23:37:01 +0100 + +python2 (2.0-3) unstable; urgency=low + + * Modules/Setup.in: Added a missing \ that made _tkinter be built + incorrectly. + * rules: on the fly, change all '#!' python scripts to use python2. + + -- Gregor Hoffleit Wed, 13 Dec 2000 20:07:24 +0100 + +python2 (2.0-2) unstable; urgency=low + + * Aaargh. Remove conflicts/provides/replaces on python-base to make + parallel installation of python-base and python2-base possible. + * Install examples into /usr/share/doc/python2 (not python) and fix + symlink to python2.0 (thanks to Rick Younie for + pointing out this). + * Rename man page to python2.1. + + -- Gregor Hoffleit Wed, 13 Dec 2000 09:31:05 +0100 + +python2 (2.0-1) unstable; urgency=low + + * New upstream version. Initial release for python2. + + -- Gregor Hoffleit Mon, 11 Dec 2000 22:39:46 +0100 --- python2.6-2.6.2.orig/debian/PVER-doc.doc-base.PVER-ref.in +++ python2.6-2.6.2/debian/PVER-doc.doc-base.PVER-ref.in @@ -0,0 +1,18 @@ +Document: @PVER@-ref +Title: Python Reference Manual (v@VER@) +Author: Guido van Rossum +Abstract: This reference manual describes the syntax and "core semantics" of + the language. It is terse, but attempts to be exact and complete. + The semantics of non-essential built-in object types and of the + built-in functions and modules are described in the *Python + Library Reference*. For an informal introduction to the language, + see the *Python Tutorial*. For C or C++ programmers, two + additional manuals exist: *Extending and Embedding the Python + Interpreter* describes the high-level picture of how to write a + Python extension module, and the *Python/C API Reference Manual* + describes the interfaces available to C/C++ programmers in detail. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/reference/index.html +Files: /usr/share/doc/@PVER@/html/reference/*.html --- python2.6-2.6.2.orig/debian/mincheck.py +++ python2.6-2.6.2/debian/mincheck.py @@ -0,0 +1,41 @@ + +import sys + +def get_listed(fn): + modules = set() + for line in file(fn).readlines(): + modules.add(line.split()[1]) + return modules + +def get_dependencies(fn): + t = eval(file(fn).read()) + modules = set() + depgraph = t['depgraph'] + for mod, deps in depgraph.iteritems(): + if mod != '__main__': + modules.add(mod) + modules.update(deps.keys()) + return depgraph, modules + +def main(): + mods = get_listed(sys.argv[1]) + depgraph, deps = get_dependencies(sys.argv[2]) + print "Listed modules:", sorted(mods) + print + print "Dependent modules:", sorted(deps) + print + + missing = deps.difference(mods) + if missing: + print "Missing modules in python-minimal:" + print missing + for m in missing: + users = [] + for caller, callees in depgraph.iteritems(): + if m in callees: + users.append(caller) + print m, "used in: ", users + sys.exit(len(missing)) + +main() + --- python2.6-2.6.2.orig/debian/libPVER.symbols.lpia.in +++ python2.6-2.6.2/debian/libPVER.symbols.lpia.in @@ -0,0 +1,4 @@ +libpython@VER@.so.1.0 libpython@VER@ #MINVER# + Py_InitModule4@Base @VER@ + _Py_force_double@Base @VER@ +#include "libpython.symbols" --- python2.6-2.6.2.orig/debian/PVER-doc.doc-base.PVER-new.in +++ python2.6-2.6.2/debian/PVER-doc.doc-base.PVER-new.in @@ -0,0 +1,10 @@ +Document: @PVER@-new +Title: What's new in Python @VER@ +Author: A.M. Kuchling +Abstract: This documents lists new features and changes worth mentioning + in Python @VER@. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/whatsnew/@VER@.html +Files: /usr/share/doc/@PVER@/html/whatsnew/@VER@.html --- python2.6-2.6.2.orig/debian/control.in +++ python2.6-2.6.2/debian/control.in @@ -0,0 +1,112 @@ +Source: @PVER@ +Section: python +Priority: optional +Maintainer: Matthias Klose +Build-Depends: debhelper (>= 5.0.42~), autoconf, automake1.10, libreadline5-dev, libncursesw5-dev (>= 5.3), tk8.4-dev, zlib1g-dev, blt-dev (>= 2.4z), libssl-dev, sharutils, libbz2-dev, libbluetooth-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], locales [!armel !hppa !ia64 !mipsel], libsqlite3-dev, libffi4-dev (>= 3.0.5), mime-support, libgpmg1 [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], netbase, lsb-release, bzip2, libdb-dev +Build-Conflicts: tcl8.3-dev, tk8.3-dev, @PVER@-xml, python-xml, libgdbm-dev +XS-Python-Version: @VER@ +Standards-Version: 3.8.2 +Vcs-Browser: https://code.launchpad.net/~doko/python/pkg@VER@ +Vcs-Bzr: http://bazaar.launchpad.net/~doko/python/pkg@VER@ + +Package: @PVER@ +Architecture: any +Priority: @PRIO@ +Depends: @PVER@-minimal (= ${binary:Version}), mime-support, ${shlibs:Depends}, ${misc:Depends} +Suggests: @PVER@-doc, @PVER@-profiler, binutils +Provides: @PVER@-cjkcodecs, @PVER@-ctypes, @PVER@-elementtree, @PVER@-celementtree, @PVER@-wsgiref +XB-Python-Version: @VER@ +Description: An interactive high-level object-oriented language (version @VER@) + Version @VER@ of the high-level, interactive object oriented language, + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + +Package: @PVER@-minimal +Architecture: any +Priority: @MINPRIO@ +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: @PVER@ +Suggests: binfmt-support +Replaces: @PVER@ (<< 2.6) +Conflicts: binfmt-support (<< 1.1.2) +XB-Python-Runtime: @PVER@ +XB-Python-Version: @VER@ +Description: A minimal subset of the Python language (version @VER@) + This package contains the interpreter and some essential modules. It can + be used in the boot process for some basic tasks. + See /usr/share/doc/@PVER@-minimal/README.Debian for a list of the modules + contained in this package. + +Package: lib@PVER@ +Architecture: any +Section: libs +Priority: @PRIO@ +Depends: @PVER@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: @PVER@ (<< 2.6) +Description: Shared Python runtime library (version @VER@) + Version @VER@ of the high-level, interactive object oriented language, + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + . + This package contains the shared runtime library, normally not needed + for programs using the statically linked interpreter. + +Package: @PVER@-examples +Architecture: all +Depends: @PVER@ (>= ${source:Version}), ${misc:Depends} +Description: Examples for the Python language (v@VER@) + Examples, Demos and Tools for Python (v@VER@). These are files included in + the upstream Python distribution (v@VER@). + +Package: @PVER@-dev +Architecture: any +Depends: @PVER@ (= ${binary:Version}), lib@PVER@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: libc6-dev | libc-dev +Replaces: @PVER@ (<< 2.6.2-1) +Description: Header files and a static library for Python (v@VER@) + Header files, a static library and development tools for building + Python (v@VER@) modules, extending the Python interpreter or embedding + Python (v@VER@) in applications. + . + Maintainers of Python packages should read README.maintainers. + +Package: idle-@PVER@ +Architecture: all +Depends: @PVER@, python-tk (>= 2.6~a3), @PVER@-tk, ${misc:Depends} +Enhances: @PVER@ +Replaces: @PVER@ (<< 2.6.1-2) +XB-Python-Version: @VER@ +Description: An IDE for Python (v@VER@) using Tkinter + IDLE is an Integrated Development Environment for Python (v@VER@). + IDLE is written using Tkinter and therefore quite platform-independent. + +Package: @PVER@-doc +Section: doc +Architecture: all +Depends: libjs-jquery, ${misc:Depends} +Suggests: @PVER@ +Description: Documentation for the high-level object-oriented language Python (v@VER@) + These is the official set of documentation for the interactive high-level + object-oriented language Python (v@VER@). All documents are provided + in HTML format. The package consists of ten documents: + . + * What's New in Python@VER@ + * Tutorial + * Python Library Reference + * Macintosh Module Reference + * Python Language Reference + * Extending and Embedding Python + * Python/C API Reference + * Installing Python Modules + * Documenting Python + * Distributing Python Modules + +Package: @PVER@-dbg +Section: debug +Architecture: any +Priority: extra +Depends: @PVER@ (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: python-gdbm-dbg, python-tk-dbg +Description: Debug Build of the Python Interpreter (version @VER@) + Python interpreter configured with --pydebug. Dynamically loaded modules are + searched in /usr/lib/@PVER@/lib-dynload/debug first. --- python2.6-2.6.2.orig/debian/FAQ.html +++ python2.6-2.6.2/debian/FAQ.html @@ -0,0 +1,8997 @@ + + +The Whole Python FAQ + + + +

The Whole Python FAQ

+Last changed on Wed Feb 12 21:31:08 2003 CET + +

(Entries marked with ** were changed within the last 24 hours; +entries marked with * were changed within the last 7 days.) +

+ +

+

+

1. General information and availability

+ + +

+

+

2. Python in the real world

+ + +

+

+

3. Building Python and Other Known Bugs

+ + +

+

+

4. Programming in Python

+ + +

+

+

5. Extending Python

+ + +

+

+

6. Python's design

+ + +

+

+

7. Using Python on non-UNIX platforms

+ + +

+

+

8. Python on Windows

+ + +
+

1. General information and availability

+ +
+

1.1. What is Python?

+Python is an interpreted, interactive, object-oriented programming +language. It incorporates modules, exceptions, dynamic typing, very +high level dynamic data types, and classes. Python combines +remarkable power with very clear syntax. It has interfaces to many +system calls and libraries, as well as to various window systems, and +is extensible in C or C++. It is also usable as an extension language +for applications that need a programmable interface. Finally, Python +is portable: it runs on many brands of UNIX, on the Mac, and on PCs +under MS-DOS, Windows, Windows NT, and OS/2. +

+To find out more, the best thing to do is to start reading the +tutorial from the documentation set (see a few questions further +down). +

+See also question 1.17 (what is Python good for). +

+ +Edit this entry / +Log info + +/ Last changed on Mon May 26 16:05:18 1997 by +GvR +

+ +

+

1.2. Why is it called Python?

+Apart from being a computer scientist, I'm also a fan of "Monty +Python's Flying Circus" (a BBC comedy series from the seventies, in +the -- unlikely -- case you didn't know). It occurred to me one day +that I needed a name that was short, unique, and slightly mysterious. +And I happened to be reading some scripts from the series at the +time... So then I decided to call my language Python. +

+By now I don't care any more whether you use a Python, some other +snake, a foot or 16-ton weight, or a wood rat as a logo for Python! +

+ +Edit this entry / +Log info + +/ Last changed on Thu Aug 24 00:50:41 2000 by +GvR +

+ +

+

1.3. How do I obtain a copy of the Python source?

+The latest Python source distribution is always available from +python.org, at http://www.python.org/download. The latest development sources can be obtained via anonymous CVS from SourceForge, at http://www.sf.net/projects/python . +

+The source distribution is a gzipped tar file containing the complete C source, LaTeX +documentation, Python library modules, example programs, and several +useful pieces of freely distributable software. This will compile and +run out of the box on most UNIX platforms. (See section 7 for +non-UNIX information.) +

+Older versions of Python are also available from python.org. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Apr 9 17:06:16 2002 by +A.M. Kuchling +

+ +

+

1.4. How do I get documentation on Python?

+All documentation is available on-line, starting at http://www.python.org/doc/. +

+The LaTeX source for the documentation is part of the source +distribution. If you don't have LaTeX, the latest Python +documentation set is available, in various formats like postscript +and html, by anonymous ftp - visit the above URL for links to the +current versions. +

+PostScript for a high-level description of Python is in the file nluug-paper.ps +(a separate file on the ftp site). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jan 21 12:02:55 1998 by +Ken Manheimer +

+ +

+

1.5. Are there other ftp sites that mirror the Python distribution?

+The following anonymous ftp sites keep mirrors of the Python +distribution: +

+USA: +

+

+        ftp://ftp.python.org/pub/python/
+        ftp://gatekeeper.dec.com/pub/plan/python/
+        ftp://ftp.uu.net/languages/python/
+        ftp://ftp.wustl.edu/graphics/graphics/sgi-stuff/python/
+        ftp://ftp.sterling.com/programming/languages/python/
+        ftp://uiarchive.cso.uiuc.edu/pub/lang/python/
+        ftp://ftp.pht.com/mirrors/python/python/
+	ftp://ftp.cdrom.com/pub/python/
+
+Europe: +

+

+        ftp://ftp.cwi.nl/pub/python/
+        ftp://ftp.funet.fi/pub/languages/python/
+        ftp://ftp.sunet.se/pub/lang/python/
+        ftp://unix.hensa.ac.uk/mirrors/uunet/languages/python/
+        ftp://ftp.lip6.fr/pub/python/
+        ftp://sunsite.cnlab-switch.ch/mirror/python/
+        ftp://ftp.informatik.tu-muenchen.de/pub/comp/programming/languages/python/
+
+Australia: +

+

+        ftp://ftp.dstc.edu.au/pub/python/
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed Mar 24 09:20:49 1999 by +A.M. Kuchling +

+ +

+

1.6. Is there a newsgroup or mailing list devoted to Python?

+There is a newsgroup, comp.lang.python, +and a mailing list. The newsgroup and mailing list are gatewayed into +each other -- if you can read news it's unnecessary to subscribe to +the mailing list. To subscribe to the mailing list +(python-list@python.org) visit its Mailman webpage at +http://www.python.org/mailman/listinfo/python-list +

+More info about the newsgroup and mailing list, and about other lists, +can be found at +http://www.python.org/psa/MailingLists.html. +

+Archives of the newsgroup are kept by Deja News and accessible +through the "Python newsgroup search" web page, +http://www.python.org/search/search_news.html. +This page also contains pointer to other archival collections. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jun 23 09:29:36 1999 by +GvR +

+ +

+

1.7. Is there a WWW page devoted to Python?

+Yes, http://www.python.org/ is the official Python home page. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 14:42:59 1997 by +Ken Manheimer +

+ +

+

1.8. Is the Python documentation available on the WWW?

+Yes. Python 2.0 documentation is available from +http://www.pythonlabs.com/tech/python2.0/doc/ and from +http://www.python.org/doc/. Note that most documentation +is available for on-line browsing as well as for downloading. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 03:14:08 2001 by +Moshe Zadka +

+ +

+

1.9. Are there any books on Python?

+Yes, many, and more are being published. See +the python.org Wiki at http://www.python.org/cgi-bin/moinmoin/PythonBooks for a list. +

+You can also search online bookstores for "Python" +(and filter out the Monty Python references; or +perhaps search for "Python" and "language"). +

+ +Edit this entry / +Log info + +/ Last changed on Mon Aug 5 19:08:49 2002 by +amk +

+ +

+

1.10. Are there any published articles about Python that I can reference?

+If you can't reference the web site, and you don't want to reference the books +(see previous question), there are several articles on Python that you could +reference. +

+Most publications about Python are collected on the Python web site: +

+

+    http://www.python.org/doc/Publications.html
+
+It is no longer recommended to reference this +very old article by Python's author: +

+

+    Guido van Rossum and Jelke de Boer, "Interactively Testing Remote
+    Servers Using the Python Programming Language", CWI Quarterly, Volume
+    4, Issue 4 (December 1991), Amsterdam, pp 283-303.
+
+

+ +Edit this entry / +Log info + +/ Last changed on Sat Jul 4 20:52:31 1998 by +GvR +

+ +

+

1.11. Are there short introductory papers or talks on Python?

+There are several - you can find links to some of them collected at +http://www.python.org/doc/Hints.html#intros. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 15:04:05 1997 by +Ken Manheimer +

+ +

+

1.12. How does the Python version numbering scheme work?

+Python versions are numbered A.B.C or A.B. A is the major version +number -- it is only incremented for really major changes in the +language. B is the minor version number, incremented for less +earth-shattering changes. C is the micro-level -- it is +incremented for each bugfix release. See PEP 6 for more information +about bugfix releases. +

+Not all releases have bugfix releases. +Note that in the past (ending with 1.5.2), +micro releases have added significant changes; +in fact the changeover from 0.9.9 to 1.0.0 was the first time +that either A or B changed! +

+Alpha, beta and release candidate versions have an additional suffixes. +The suffix for an alpha version is "aN" for some small number N, the +suffix for a beta version is "bN" for some small number N, and the +suffix for a release candidate version is "cN" for some small number N. +

+Note that (for instance) all versions labeled 2.0aN precede the +versions labeled 2.0bN, which precede versions labeled 2.0cN, and +those precede 2.0. +

+As a rule, no changes are made between release candidates and the final +release unless there are show-stopper bugs. +

+You may also find version numbers with a "+" suffix, e.g. "2.2+". +These are unreleased versions, built directly from the CVS trunk. +

+See also the documentation for sys.version, sys.hexversion, and +sys.version_info. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 14 06:34:17 2002 by +GvR +

+ +

+

1.13. How do I get a beta test version of Python?

+All releases, including alphas, betas and release candidates, are announced on +comp.lang.python and comp.lang.python.announce newsgroups, +which are gatewayed into the python-list@python.org and +python-announce@python.org. In addition, all these announcements appear on +the Python home page, at http://www.python.org. +

+You can also access the development version of Python through CVS. See http://sourceforge.net/cvs/?group_id=5470 for details. If you're not familiar with CVS, documents like http://linux.oreillynet.com/pub/a/linux/2002/01/03/cvs_intro.html +provide an introduction. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 00:57:08 2002 by +Neal Norwitz +

+ +

+

1.14. Are there copyright restrictions on the use of Python?

+Hardly. You can do anything you want with the source, as long as +you leave the copyrights in, and display those copyrights in any +documentation about Python that you produce. Also, don't use the +author's institute's name in publicity without prior written +permission, and don't hold them responsible for anything (read the +actual copyright for a precise legal wording). +

+In particular, if you honor the copyright rules, it's OK to use Python +for commercial use, to sell copies of Python in source or binary form, +or to sell products that enhance Python or incorporate Python (or part +of it) in some form. I would still like to know about all commercial +use of Python! +

+ +Edit this entry / +Log info +

+ +

+

1.15. Why was Python created in the first place?

+Here's a very brief summary of what got me started: +

+I had extensive experience with implementing an interpreted language +in the ABC group at CWI, and from working with this group I had +learned a lot about language design. This is the origin of many +Python features, including the use of indentation for statement +grouping and the inclusion of very-high-level data types (although the +details are all different in Python). +

+I had a number of gripes about the ABC language, but also liked many +of its features. It was impossible to extend the ABC language (or its +implementation) to remedy my complaints -- in fact its lack of +extensibility was one of its biggest problems. +I had some experience with using Modula-2+ and talked with the +designers of Modula-3 (and read the M3 report). M3 is the origin of +the syntax and semantics used for exceptions, and some other Python +features. +

+I was working in the Amoeba distributed operating system group at +CWI. We needed a better way to do system administration than by +writing either C programs or Bourne shell scripts, since Amoeba had +its own system call interface which wasn't easily accessible from the +Bourne shell. My experience with error handling in Amoeba made me +acutely aware of the importance of exceptions as a programming +language feature. +

+It occurred to me that a scripting language with a syntax like ABC +but with access to the Amoeba system calls would fill the need. I +realized that it would be foolish to write an Amoeba-specific +language, so I decided that I needed a language that was generally +extensible. +

+During the 1989 Christmas holidays, I had a lot of time on my hand, +so I decided to give it a try. During the next year, while still +mostly working on it in my own time, Python was used in the Amoeba +project with increasing success, and the feedback from colleagues made +me add many early improvements. +

+In February 1991, after just over a year of development, I decided +to post to USENET. The rest is in the Misc/HISTORY file. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 00:06:23 1997 by +GvR +

+ +

+

1.16. Do I have to like "Monty Python's Flying Circus"?

+No, but it helps. Pythonistas like the occasional reference to SPAM, +and of course, nobody expects the Spanish Inquisition +

+The two main reasons to use Python are: +

+

+ - Portable
+ - Easy to learn
+
+The three main reasons to use Python are: +

+

+ - Portable
+ - Easy to learn
+ - Powerful standard library
+
+(And nice red uniforms.) +

+And remember, there is no rule six. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 28 10:39:21 1997 by +GvR +

+ +

+

1.17. What is Python good for?

+Python is used in many situations where a great deal of dynamism, +ease of use, power, and flexibility are required. +

+In the area of basic text +manipulation core Python (without any non-core extensions) is easier +to use and is roughly as fast as just about any language, and this makes Python +good for many system administration type tasks and for CGI programming +and other application areas that manipulate text and strings and such. +

+When augmented with +standard extensions (such as PIL, COM, Numeric, oracledb, kjbuckets, +tkinter, win32api, etc.) +or special purpose extensions (that you write, perhaps using helper tools such +as SWIG, or using object protocols such as ILU/CORBA or COM) Python +becomes a very convenient "glue" or "steering" +language that helps make heterogeneous collections of unrelated +software packages work together. +For example by combining Numeric with oracledb you can help your +SQL database do statistical analysis, or even Fourier transforms. +One of the features that makes Python excel in the "glue language" role +is Python's simple, usable, and powerful C language runtime API. +

+Many developers also use Python extensively as a graphical user +interface development aide. +

+ +Edit this entry / +Log info + +/ Last changed on Sat May 24 10:13:11 1997 by +Aaron Watters +

+ +

+

1.18. Can I use the FAQ Wizard software to maintain my own FAQ?

+Sure. It's in Tools/faqwiz/ of the python source tree. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Mar 29 06:50:32 2002 by +Aahz +

+ +

+

1.19. Which editor has good support for editing Python source code?

+On Unix, the first choice is Emacs/XEmacs. There's an elaborate +mode for editing Python code, which is available from the Python +source distribution (Misc/python-mode.el). It's also bundled +with XEmacs (we're still working on legal details to make it possible +to bundle it with FSF Emacs). And it has its own web page: +

+

+    http://www.python.org/emacs/python-mode/index.html
+
+There are many other choices, for Unix, Windows or Macintosh. +Richard Jones compiled a table from postings on the Python newsgroup: +

+

+    http://www.bofh.asn.au/~richard/editors.html
+
+See also FAQ question 7.10 for some more Mac and Win options. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 15 23:21:04 1998 by +Gvr +

+ +

+

1.20. I've never programmed before. Is there a Python tutorial?

+There are several, and at least one book. +All information for beginning Python programmers is collected here: +

+

+    http://www.python.org/doc/Newbies.html
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed Sep 5 05:34:07 2001 by +GvR +

+ +

+

1.21. Where in the world is www.python.org located?

+It's currently in Amsterdam, graciously hosted by XS4ALL: +

+

+    http://www.xs4all.nl
+
+Thanks to Thomas Wouters for setting this up!!!! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 3 21:49:27 2001 by +GvR +

+ +

+

2. Python in the real world

+ +
+

2.1. How many people are using Python?

+Certainly thousands, and quite probably tens of thousands of users. +More are seeing the light each day. The comp.lang.python newsgroup is +very active, but overall there is no accurate estimate of the number of subscribers or Python users. +

+Jacek Artymiak has created a Python Users Counter; you can see the +current count by visiting +http://www.wszechnica.safenet.pl/cgi-bin/checkpythonuserscounter.py +(this will not increment the counter; use the link there if you haven't +added yourself already). Most Python users appear not to have registered themselves. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Feb 21 23:29:18 2002 by +GvR +

+ +

+

2.2. Have any significant projects been done in Python?

+At CWI (the former home of Python), we have written a 20,000 line +authoring environment for transportable hypermedia presentations, a +5,000 line multimedia teleconferencing tool, as well as many many +smaller programs. +

+At CNRI (Python's new home), we have written two large applications: +Grail, a fully featured web browser (see +http://grail.cnri.reston.va.us), +and the Knowbot Operating Environment, +a distributed environment for mobile code. +

+The University of Virginia uses Python to control a virtual reality +engine. See http://alice.cs.cmu.edu. +

+The ILU project at Xerox PARC can generate Python glue for ILU +interfaces. See ftp://ftp.parc.xerox.com/pub/ilu/ilu.html. ILU +is a free CORBA compliant ORB which supplies distributed object +connectivity to a host of platforms using a host of languages. +

+Mark Hammond and Greg Stein and others are interfacing Python to +Microsoft's COM and ActiveX architectures. This means, among other +things, that Python may be used in active server pages or as a COM +controller (for example to automatically extract from or insert information +into Excel or MSAccess or any other COM aware application). +Mark claims Python can even be a ActiveX scripting host (which +means you could embed JScript inside a Python application, if you +had a strange sense of humor). Python/AX/COM is distributed as part +of the PythonWin distribution. +

+The University of California, Irvine uses a student administration +system called TELE-Vision written entirely in Python. Contact: Ray +Price rlprice@uci.edu. +

+The Melbourne Cricket Ground (MCG) in Australia (a 100,000+ person venue) +has it's scoreboard system written largely in Python on MS Windows. +Python expressions are used to create almost every scoring entry that +appears on the board. The move to Python/C++ away from exclusive C++ +has provided a level of functionality that would simply not have been +viable otherwise. +

+See also the next question. +

+Note: this FAQ entry is really old. +See http://www.python.org/psa/Users.html for a more recent list. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Oct 25 13:24:15 2000 by +GvR +

+ +

+

2.3. Are there any commercial projects going on using Python?

+Yes, there's lots of commercial activity using Python. See +http://www.python.org/psa/Users.html for a list. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Oct 14 18:17:33 1998 by +ken +

+ +

+

2.4. How stable is Python?

+Very stable. New, stable releases have been coming out roughly every 3 to 12 months since 1991, and this seems likely to continue. +

+With the introduction of retrospective "bugfix" releases the stability of the language implementations can be, and is being, improved independently of the new features offered by more recent major or minor releases. Bugfix releases, indicated by a third component of the version number, only fix known problems and do not gratuitously introduce new and possibly incompatible features or modified library functionality. +

+Release 2.2 got its first bugfix on April 10, 2002. The new version +number is now 2.2.1. The 2.1 release, at 2.1.3, can probably be +considered the "most stable" platform because it has been bugfixed +twice. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jul 23 10:20:04 2002 by +Jens Kubieziel +

+ +

+

2.5. What new developments are expected for Python in the future?

+See http://www.python.org/peps/ for the Python Enhancement +Proposals (PEPs). PEPs are design +documents +describing a suggested new feature for Python, providing +a concise technical specification and a rationale. +

+Also, follow the discussions on the python-dev mailing list. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Apr 9 17:09:51 2002 by +A.M. Kuchling +

+ +

+

2.6. Is it reasonable to propose incompatible changes to Python?

+In general, no. There are already millions of lines of Python code +around the world, so any changes in the language that invalidates more +than a very small fraction of existing programs has to be frowned +upon. Even if you can provide a conversion program, there still is +the problem of updating all documentation. Providing a gradual +upgrade path is the only way if a feature has to be changed. +

+See http://www.python.org/peps/pep-0005.html for the proposed +mechanism for creating backwards-incompatibilities. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 1 22:13:47 2002 by +Fred Drake +

+ +

+

2.7. What is the future of Python?

+Please see http://www.python.org/peps/ for proposals of future +activities. One of the PEPs (Python Enhancement Proposals) deals +with the PEP process and PEP format -- see +http://www.python.org/peps/pep-0001.html if you want to +submit a PEP. In http://www.python.org/peps/pep-0042.html there +is a list of wishlists the Python Development team plans to tackle. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 1 22:15:46 2002 by +Fred Drake +

+ +

+

2.8. What was the PSA, anyway?

+The Python Software Activity was +created by a number of Python aficionados who want Python to be more +than the product and responsibility of a single individual. +The PSA was not an independent organization, but lived +under the umbrealla of CNRI. +

+The PSA has been superseded by the Python Software Foundation, +an independent non-profit organization. The PSF's home page +is at http://www.python.org/psf/. +

+Some pages created by the PSA still live at +http://www.python.org/psa/ +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 25 18:19:44 2002 by +GvR +

+ +

+

2.9. Deleted

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 02:51:30 2001 by +Moshe Zadka +

+ +

+

2.10. Deleted

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 02:52:19 2001 by +Moshe Zadka +

+ +

+

2.11. Is Python Y2K (Year 2000) Compliant?

+As of January, 2001 no major problems have been reported and Y2K +compliance seems to be a non-issue. +

+Since Python is available free of charge, there are no absolute +guarantees. If there are unforeseen problems, liability is the +user's rather than the developers', and there is nobody you can sue for damages. +

+Python does few +date manipulations, and what it does is all based on the Unix +representation for time (even on non-Unix systems) which uses seconds +since 1970 and won't overflow until 2038. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 8 17:19:32 2001 by +Steve Holden +

+ +

+

2.12. Is Python a good language in a class for beginning programmers?

+Yes. This long answer attempts to address any concerns you might +have with teaching Python as a programmer's first language. +(If you want to discuss Python's use in education, then +you may be interested in joining the edu-sig mailinglist. +See http://www.python.org/sigs/edu-sig/ ) +

+It is still common to start students with a procedural +(subset of a) statically typed language such as Pascal, C, or +a subset of C++ or Java. I think that students may be better +served by learning Python as their first language. Python has +a very simple and consistent syntax and a large standard library. +Most importantly, using Python in a beginning programming course +permits students to concentrate on important programming skills, +such as problem decomposition and data type design. +

+With Python, students can be quickly introduced to basic concepts +such as loops and procedures. They can even probably work with +user-defined objects in their very first course. They could +implement a tree structure as nested Python lists, for example. +They could be introduced to objects in their first course if +desired. For a student who has never programmed before, using +a statically typed language seems unnatural. It presents +additional complexity that the student must master and slows +the pace of the course. The students are trying to learn to +think like a computer, decompose problems, design consistent +interfaces, and encapsulate data. While learning to use a +statically typed language is important, it is not necessarily the +best topic to address in the students' first programming course. +

+Many other aspects of Python make it a good first language. +Python has a large standard library (like Java) so that +students can be assigned programming projects very early in the +course that do something. Assignments aren't restricted to the +standard four-function calculator and check balancing programs. +By using the standard library, students can gain the satisfaction +of working on realistic applications as they learn the fundamentals +of programming. Using the standard library also teaches students +about code reuse. +

+Python's interactive interpreter also enables students to +test language features while they're programming. They can keep +a window with the interpreter running while they enter their +programs' source in another window. If they can't remember the +methods for a list, they can do something like this: +

+

+ >>> L = []
+ >>> dir(L)
+ ['append', 'count', 'extend', 'index', 'insert', 'pop', 'remove',
+ 'reverse', 'sort']
+ >>> print L.append.__doc__
+ L.append(object) -- append object to end
+ >>> L.append(1)
+ >>> L
+ [1]
+
+With the interpreter, documentation is never far from the +student as he's programming. +

+There are also good IDEs for Python. Guido van Rossum's IDLE +is a cross-platform IDE for Python that is written in Python +using Tk. There is also a Windows specific IDE called PythonWin. +Emacs users will be happy to know that there is a very good Python +mode for Emacs. All of these programming environments provide +syntax highlighting, auto-indenting, and access to the interactive +interpreter while coding. For more information about IDEs, see XXX. +

+If your department is currently using Pascal because it was +designed to be a teaching language, then you'll be happy to +know that Guido van Rossum designed Python to be simple to +teach to everyone but powerful enough to implement real world +applications. Python makes a good language for first time +programmers because that was one of Python's design goals. +There are papers at http://www.python.org/doc/essays/ on the Python website +by Python's creator explaining his objectives for the language. +One that may interest you is titled "Computer Programming for Everybody" +http://www.python.org/doc/essays/cp4e.html +

+If you're seriously considering Python as a language for your +school, Guido van Rossum may even be willing to correspond with +you about how the language would fit in your curriculum. +See http://www.python.org/doc/FAQ.html#2.2 for examples of +Python's use in the "real world." +

+While Python, its source code, and its IDEs are freely +available, this consideration should not rule +out other languages. There are other free languages (Java, +free C compilers), and many companies are willing to waive some +or all of their fees for student programming tools if it +guarantees that a whole graduating class will know how to +use their tools. That is, if one of the requirements for +the language that will be taught is that it be freely +available, then Python qualifies, but this requirement +does not preclude other languages. +

+While Python jobs may not be as prevalent as C/C++/Java jobs, +teachers should not worry about teaching students critical job +skills in their first course. The skills that win students a +job are those they learn in their senior classes and internships. +Their first programming courses are there to lay a solid +foundation in programming fundamentals. The primary question +in choosing the language for such a course should be which +language permits the students to learn this material without +hindering or limiting them. +

+Another argument for Python is that there are many tasks for +which something like C++ is overkill. That's where languages +like Python, Perl, Tcl, and Visual Basic thrive. It's critical +for students to know something about these languages. (Every +employer for whom I've worked used at least one such language.) +Of the languages listed above, Python probably makes the best +language in a programming curriculum since its syntax is simple, +consistent, and not unlike other languages (C/C++/Java) that +are probably in the curriculum. By starting students with +Python, a department simultaneously lays the foundations for +other programming courses and introduces students to the type +of language that is often used as a "glue" language. As an +added bonus, Python can be used to interface with Microsoft's +COM components (thanks to Mark Hammond). There is also Jython, +a Java implementation of the Python interpreter, that can be +used to connect Java components. +

+If you currently start students with Pascal or C/C++ or Java, +you may be worried they will have trouble learning a statically +typed language after starting with Python. I think that this +fear most often stems from the fact that the teacher started +with a statically typed language, and we tend to like to teach +others in the same way we were taught. In reality, the +transition from Python to one of these other languages is +quite simple. +

+To motivate a statically typed language such as C++, begin the +course by explaining that unlike Python, their first language, +C++ is compiled to a machine dependent executable. Explain +that the point is to make a very fast executable. To permit +the compiler to make optimizations, programmers must help it +by specifying the "types" of variables. By restricting each +variable to a specific type, the compiler can reduce the +book-keeping it has to do to permit dynamic types. The compiler +also has to resolve references at compile time. Thus, the +language gains speed by sacrificing some of Python's dynamic +features. Then again, the C++ compiler provides type safety +and catches many bugs at compile time instead of run time (a +critical consideration for many commercial applications). C++ +is also designed for very large programs where one may want to +guarantee that others don't touch an object's implementation. +C++ provides very strong language features to separate an object's +implementation from its interface. Explain why this separation +is a good thing. +

+The first day of a C++ course could then be a whirlwind introduction +to what C++ requires and provides. The point here is that after +a semester or two of Python, students are hopefully competent +programmers. They know how to handle loops and write procedures. +They've also worked with objects, thought about the benefits of +consistent interfaces, and used the technique of subclassing to +specialize behavior. Thus, a whirlwind introduction to C++ could +show them how objects and subclassing looks in C++. The +potentially difficult concepts of object-oriented design were +taught without the additional obstacles presented by a language +such as C++ or Java. When learning one of these languages, +the students would already understand the "road map." They +understand objects; they would just be learning how objects +fit in a statically typed languages. Language requirements +and compiler errors that seem unnatural to beginning programmers +make sense in this new context. Many students will find it +helpful to be able to write a fast prototype of their algorithms +in Python. Thus, they can test and debug their ideas before +they attempt to write the code in the new language, saving the +effort of working with C++ types for when they've discovered a +working solution for their assignments. When they get annoyed +with the rigidity of types, they'll be happy to learn about +containers and templates to regain some of the lost flexibility +Python afforded them. Students may also gain an appreciation +for the fact that no language is best for every task. They'll +see that C++ is faster, but they'll know that they can gain +flexibility and development speed with a Python when execution +speed isn't critical. +

+If you have any concerns that weren't addressed here, try +posting to the Python newsgroup. Others there have done some +work with using Python as an instructional tool. Good luck. +We'd love to hear about it if you choose Python for your course. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Dec 2 19:32:35 2002 by +Bill Sconce +

+ +

+

3. Building Python and Other Known Bugs

+ +
+

3.1. Is there a test set?

+Sure. You can run it after building with "make test", or you can +run it manually with this command at the Python prompt: +

+

+ import test.autotest
+
+In Python 1.4 or earlier, use +

+

+ import autotest
+
+The test set doesn't test all features of Python, +but it goes a long way to confirm that Python is actually working. +

+NOTE: if "make test" fails, don't just mail the output to the +newsgroup -- this doesn't give enough information to debug the +problem. Instead, find out which test fails, and run that test +manually from an interactive interpreter. For example, if +"make test" reports that test_spam fails, try this interactively: +

+

+ import test.test_spam
+
+This generally produces more verbose output which can be diagnosed +to debug the problem. If you find a bug in Python or the libraries, or in the tests, please report this in the Python bug tracker at SourceForge: +

+http://sourceforge.net/tracker/?func=add&group_id=5470&atid=105470 +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 27 10:29:36 2001 by +Fred Drake +

+ +

+

3.2. When running the test set, I get complaints about floating point operations, but when playing with floating point operations I cannot find anything wrong with them.

+The test set makes occasional unwarranted assumptions about the +semantics of C floating point operations. Until someone donates a +better floating point test set, you will have to comment out the +offending floating point tests and execute similar tests manually. +

+ +Edit this entry / +Log info +

+ +

+

3.3. Link errors after rerunning the configure script.

+It is generally necessary to run "make clean" after a configuration +change. +

+ +Edit this entry / +Log info +

+ +

+

3.4. The python interpreter complains about options passed to a script (after the script name).

+You are probably linking with GNU getopt, e.g. through -liberty. +Don't. The reason for the complaint is that GNU getopt, unlike System +V getopt and other getopt implementations, doesn't consider a +non-option to be the end of the option list. A quick (and compatible) +fix for scripts is to add "--" to the interpreter, like this: +

+

+        #! /usr/local/bin/python --
+
+You can also use this interactively: +

+

+        python -- script.py [options]
+
+Note that a working getopt implementation is provided in the Python +distribution (in Python/getopt.c) but not automatically used. +

+ +Edit this entry / +Log info +

+ +

+

3.5. When building on the SGI, make tries to run python to create glmodule.c, but python hasn't been built or installed yet.

+Comment out the line mentioning glmodule.c in Setup and build a +python without gl first; install it or make sure it is in your $PATH, +then edit the Setup file again to turn on the gl module, and make +again. You don't need to do "make clean"; you do need to run "make +Makefile" in the Modules subdirectory (or just run "make" at the +toplevel). +

+ +Edit this entry / +Log info +

+ +

+

3.6. I use VPATH but some targets are built in the source directory.

+On some systems (e.g. Sun), if the target already exists in the +source directory, it is created there instead of in the build +directory. This is usually because you have previously built without +VPATH. Try running "make clobber" in the source directory. +

+ +Edit this entry / +Log info +

+ +

+

3.7. Trouble building or linking with the GNU readline library.

+You can use the GNU readline library to improve the interactive user +interface: this gives you line editing and command history when +calling python interactively. Its sources are distributed with +Python (at least for 2.0). Uncomment the line +

+#readline readline.c -lreadline -ltermcap +

+in Modules/Setup. The configuration option --with-readline +is no longer supported, at least in Python 2.0. Some hints on +building and using the readline library: +On SGI IRIX 5, you may have to add the following +to rldefs.h: +

+

+        #ifndef sigmask
+        #define sigmask(sig) (1L << ((sig)-1))
+        #endif
+
+On some systems, you will have to add #include "rldefs.h" to the +top of several source files, and if you use the VPATH feature, you +will have to add dependencies of the form foo.o: foo.c to the +Makefile for several values of foo. +The readline library requires use of the termcap library. A +known problem with this is that it contains entry points which +cause conflicts with the STDWIN and SGI GL libraries. The STDWIN +conflict can be solved by adding a line saying '#define werase w_erase' to the +stdwin.h file (in the STDWIN distribution, subdirectory H). The +GL conflict has been solved in the Python configure script by a +hack that forces use of the static version of the termcap library. +Check the newsgroup gnu.bash.bug news:gnu.bash.bug for +specific problems with the readline library (I don't read this group +but I've been told that it is the place for readline bugs). +

+ +Edit this entry / +Log info + +/ Last changed on Sat Dec 2 18:23:48 2000 by +Issac Trotts +

+ +

+

3.8. Trouble with socket I/O on older Linux 1.x versions.

+Once you've built Python, use it to run the regen script in the +Lib/plat-linux2 directory. Apparently the files as distributed don't match the system headers on some Linux versions. +

+Note that this FAQ entry only applies to Linux kernel versions 1.x.y; +these are hardly around any more. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jul 30 20:05:52 2002 by +Jens Kubieziel +

+ +

+

3.9. Trouble with prototypes on Ultrix.

+Ultrix cc seems broken -- use gcc, or edit config.h to #undef +HAVE_PROTOTYPES. +

+ +Edit this entry / +Log info +

+ +

+

3.10. Other trouble building Python on platform X.

+Please submit the details to the SourceForge bug tracker: +

+

+  http://sourceforge.net/tracker/?group_id=5470&atid=105470
+
+and we'll look +into it. Please provide as many details as possible. In particular, +if you don't tell us what type of computer and what operating system +(and version) you are using it will be difficult for us to figure out +what is the matter. If you have compilation output logs, +please use file uploads -- don't paste everything in the message box. +

+In many cases, we won't have access to the same hardware or operating system version, so please, if you have a SourceForge account, log in before filing your report, or if you don't have an account, include an email address at which we can reach you for further questions. Logging in to SourceForge first will also cause SourceForge to send you updates as we act on your report. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 27 10:53:18 2001 by +Fred Drake +

+ +

+

3.11. How to configure dynamic loading on Linux.

+This is now automatic as long as your Linux version uses the ELF +object format (all recent Linuxes do). +

+ +Edit this entry / +Log info +

+ +

+

3.12. I can't get shared modules to work on Linux 2.0 (Slackware96)?

+This is a bug in the Slackware96 release. The fix is simple: Make sure +that there is a link from /lib/libdl.so to /lib/libdl.so.1 so that the +following links are setup: /lib/libdl.so -> /lib/libdl.so.1 +/lib/libdl.so.1 -> /lib/libdl.so.1.7.14 You may have to rerun the +configure script, after rm'ing the config.cache file, before you +attempt to rebuild python after this fix. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 15:45:03 1997 by +GvR +

+ +

+

3.13. Trouble when making modules shared on Linux.

+This happens when you have built Python for static linking and then +enable +
+  *shared*
+
+in the Setup file. Shared library code must be +compiled with "-fpic". If a .o file for the module already exist that +was compiled for static linking, you must remove it or do "make clean" +in the Modules directory. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 13:42:30 1997 by +GvR +

+ +

+

3.14. [deleted]

+[ancient information on threads on linux (when thread support +was not standard) used to be here] +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 2 17:27:13 2002 by +Erno Kuusela +

+ +

+

3.15. Errors when linking with a shared library containing C++ code.

+Link the main Python binary with C++. Change the definition of +LINKCC in Modules/Makefile to be your C++ compiler. You may have to +edit config.c slightly to make it compilable with C++. +

+ +Edit this entry / +Log info +

+ +

+

3.16. Deleted

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 11 16:02:22 2001 by +GvR +

+ +

+

3.17. Deleted.

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 11 15:54:57 2001 by +GvR +

+ +

+

3.18. Compilation or link errors for the _tkinter module

+Most likely, there's a version mismatch between the Tcl/Tk header +files (tcl.h and tk.h) and the Tcl/Tk libraries you are using e.g. +"-ltk8.0" and "-ltcl8.0" arguments for _tkinter in the Setup file). +It is possible to install several versions of the Tcl/Tk libraries, +but there can only be one version of the tcl.h and tk.h header +files. If the library doesn't match the header, you'll get +problems, either when linking the module, or when importing it. +Fortunately, the version number is clearly stated in each file, +so this is easy to find. Reinstalling and using the latest +version usually fixes the problem. +

+(Also note that when compiling unpatched Python 1.5.1 against +Tcl/Tk 7.6/4.2 or older, you get an error on Tcl_Finalize. See +the 1.5.1 patch page at http://www.python.org/1.5/patches-1.5.1/.) +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jun 11 00:49:14 1998 by +Gvr +

+ +

+

3.19. I configured and built Python for Tcl/Tk but "import Tkinter" fails.

+Most likely, you forgot to enable the line in Setup that says +"TKPATH=:$(DESTLIB)/tkinter". +

+ +Edit this entry / +Log info +

+ +

+

3.20. [deleted]

+[ancient information on a gcc+tkinter bug on alpha was here] +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 16:46:23 2002 by +Erno Kuusela +

+ +

+

3.21. Several common system calls are missing from the posix module.

+Most likely, all test compilations run by the configure script +are failing for some reason or another. Have a look in config.log to +see what could be the reason. A common reason is specifying a +directory to the --with-readline option that doesn't contain the +libreadline.a file. +

+ +Edit this entry / +Log info +

+ +

+

3.22. ImportError: No module named string, on MS Windows.

+Most likely, your PYTHONPATH environment variable should be set to +something like: +

+set PYTHONPATH=c:\python;c:\python\lib;c:\python\scripts +

+(assuming Python was installed in c:\python) +

+ +Edit this entry / +Log info +

+ +

+

3.23. Core dump on SGI when using the gl module.

+There are conflicts between entry points in the termcap and curses +libraries and an entry point in the GL library. There's a hack of a +fix for the termcap library if it's needed for the GNU readline +library, but it doesn't work when you're using curses. Concluding, +you can't build a Python binary containing both the curses and gl +modules. +

+ +Edit this entry / +Log info +

+ +

+

3.24. "Initializer not a constant" while building DLL on MS-Windows

+Static type object initializers in extension modules may cause compiles to +fail with an error message like "initializer not a constant". +Fredrik Lundh <Fredrik.Lundh@image.combitech.se> explains: +

+This shows up when building DLL under MSVC. There's two ways to +address this: either compile the module as C++, or change your code to +something like: +

+

+  statichere PyTypeObject bstreamtype = {
+      PyObject_HEAD_INIT(NULL) /* must be set by init function */
+      0,
+      "bstream",
+      sizeof(bstreamobject),
+
+
+  ...
+
+
+  void
+  initbstream()
+  {
+      /* Patch object type */
+      bstreamtype.ob_type = &PyType_Type;
+      Py_InitModule("bstream", functions);
+      ...
+  }
+
+

+ +Edit this entry / +Log info + +/ Last changed on Sun May 25 14:58:05 1997 by +Aaron Watters +

+ +

+

3.25. Output directed to a pipe or file disappears on Linux.

+Some people have reported that when they run their script +interactively, it runs great, but that when they redirect it +to a pipe or file, no output appears. +

+

+    % python script.py
+    ...some output...
+    % python script.py >file
+    % cat file
+    % # no output
+    % python script.py | cat
+    % # no output
+    %
+
+This was a bug in Linux kernel. It is fixed and should not appear anymore. So most Linux users are not affected by this. +

+If redirection doesn't work on your Linux system, check what shell you are using. Shells like (t)csh doesn't support redirection. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jan 16 13:38:30 2003 by +Jens Kubieziel +

+ +

+

3.26. [deleted]

+[ancient libc/linux problem was here] +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 16:48:08 2002 by +Erno Kuusela +

+ +

+

3.27. [deleted]

+[ancient linux + threads + tk problem was described here] +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 16:49:08 2002 by +Erno Kuusela +

+ +

+

3.28. How can I test if Tkinter is working?

+Try the following: +

+

+  python
+  >>> import _tkinter
+  >>> import Tkinter
+  >>> Tkinter._test()
+
+This should pop up a window with two buttons, +one "Click me" and one "Quit". +

+If the first statement (import _tkinter) fails, your Python +installation probably has not been configured to support Tcl/Tk. +On Unix, if you have installed Tcl/Tk, you have to rebuild Python +after editing the Modules/Setup file to enable the _tkinter module +and the TKPATH environment variable. +

+It is also possible to get complaints about Tcl/Tk version +number mismatches or missing TCL_LIBRARY or TK_LIBRARY +environment variables. These have to do with Tcl/Tk installation +problems. +

+A common problem is to have installed versions of tcl.h and tk.h +that don't match the installed version of the Tcl/Tk libraries; +this usually results in linker errors or (when using dynamic +loading) complaints about missing symbols during loading +the shared library. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Aug 28 17:01:46 1997 by +Guido van Rossum +

+ +

+

3.29. Is there a way to get the interactive mode of the python interpreter to perform function/variable name completion?

+(From a posting by Guido van Rossum) +

+On Unix, if you have enabled the readline module (i.e. if Emacs-style +command line editing and bash-style history works for you), you can +add this by importing the undocumented standard library module +"rlcompleter". When completing a simple identifier, it +completes keywords, built-ins and globals in __main__; when completing +NAME.NAME..., it evaluates (!) the expression up to the last dot and +completes its attributes. +

+This way, you can do "import string", type "string.", hit the +completion key twice, and see the list of names defined by the +string module. +

+Tip: to use the tab key as the completion key, call +

+

+    readline.parse_and_bind("tab: complete")
+
+You can put this in a ~/.pythonrc file, and set the PYTHONSTARTUP +environment variable to ~/.pythonrc. This will cause the completion to be enabled +whenever you run Python interactively. +

+Notes (see the docstring for rlcompleter.py for more information): +

+* The evaluation of the NAME.NAME... form may cause arbitrary +application defined code to be executed if an object with a +__getattr__ hook is found. Since it is the responsibility of the +application (or the user) to enable this feature, I consider this an +acceptable risk. More complicated expressions (e.g. function calls or +indexing operations) are not evaluated. +

+* GNU readline is also used by the built-in functions input() and +raw_input(), and thus these also benefit/suffer from the complete +features. Clearly an interactive application can benefit by +specifying its own completer function and using raw_input() for all +its input. +

+* When stdin is not a tty device, GNU readline is never +used, and this module (and the readline module) are silently inactive. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 12 09:55:24 1998 by +A.M. Kuchling +

+ +

+

3.30. Why is the Python interpreter not built as a shared library?

+(This is a Unix question; on Mac and Windows, it is a shared +library.) +

+It's just a nightmare to get this to work on all different platforms. +Shared library portability is a pain. And yes, I know about GNU libtool +-- but it requires me to use its conventions for filenames etc, and it +would require a complete and utter rewrite of all the makefile and +config tools I'm currently using. +

+In practice, few applications embed Python -- it's much more common to +have Python extensions, which already are shared libraries. Also, +serious embedders often want total control over which Python version +and configuration they use so they wouldn't want to use a standard +shared library anyway. So while the motivation of saving space +when lots of apps embed Python is nice in theory, I +doubt that it will save much in practice. (Hence the low priority I +give to making a shared library.) +

+For Linux systems, the simplest method of producing libpython1.5.so seems to +be (originally from the Minotaur project web page, +http://www.equi4.com/minotaur/minotaur.html): +

+

+  make distclean 
+  ./configure 
+  make OPT="-fpic -O2" 
+  mkdir .extract 
+  (cd .extract; ar xv ../libpython1.5.a) 
+  gcc -shared -o libpython1.5.so .extract/*.o 
+  rm -rf .extract
+
+In Python 2.3 this will be supported by the standard build routine +(at least on Linux) with --enable-shared. Note however that there +is little advantage, and it slows down Python because of the need +for PIC code and the extra cost at startup time to find the library. +

+ +Edit this entry / +Log info + +/ Last changed on Thu May 30 13:36:55 2002 by +GvR +

+ +

+

3.31. Build with GCC on Solaris 2.6 (SunOS 5.6) fails

+If you have upgraded Solaris 2.5 or 2.5.1 to Solaris 2.6, +but you have not upgraded +your GCC installation, the compile may fail, e.g. like this: +

+

+ In file included from /usr/include/sys/stream.h:26,
+                  from /usr/include/netinet/in.h:38,
+                  from /usr/include/netdb.h:96,
+                  from ./socketmodule.c:121:
+ /usr/include/sys/model.h:32: #error "No DATAMODEL_NATIVE specified"
+
+Solution: rebuild GCC for Solaris 2.6. +You might be able to simply re-run fixincludes, but +people have had mixed success with doing that. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Oct 21 11:18:46 1998 by +GvR +

+ +

+

3.32. Running "make clean" seems to leave problematic files that cause subsequent builds to fail.

+Use "make clobber" instead. +

+Use "make clean" to reduce the size of the source/build directory +after you're happy with your build and installation. +If you have already tried to build python and you'd like to start +over, you should use "make clobber". It does a "make clean" and also +removes files such as the partially built Python library from a previous build. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jun 24 20:39:26 1999 by +TAB +

+ +

+

3.33. Submitting bug reports and patches

+To report a bug or submit a patch, please use the relevant service +from the Python project at SourceForge. +

+Bugs: http://sourceforge.net/tracker/?group_id=5470&atid=105470 +

+Patches: http://sourceforge.net/tracker/?group_id=5470&atid=305470 +

+If you have a SourceForge account, please log in before submitting your bug report; this will make it easier for us to contact you regarding your report in the event we have follow-up questions. It will also enable SourceForge to send you update information as we act on your bug. If you do not have a SourceForge account, please consider leaving your name and email address as part of the report. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 27 10:58:26 2001 by +Fred Drake +

+ +

+

3.34. I can't load shared libraries under Python 1.5.2, Solaris 7, and gcc 2.95.2

+When trying to load shared libraries, you may see errors like: +ImportError: ld.so.1: python: fatal: relocation error: file /usr/local/lib/python1.5/site-packages/Perp/util/du_SweepUtilc.so: +
+ symbol PyExc_RuntimeError: referenced symbol not found
+
+

+There is a problem with the configure script for Python 1.5.2 +under Solaris 7 with gcc 2.95 . configure should set the make variable +LINKFORSHARED=-Xlinker -export-dynamic +

+

+in Modules/Makefile, +

+Manually add this line to the Modules/Makefile. +This builds a Python executable that can load shared library extensions (xxx.so) . +

+ +Edit this entry / +Log info + +/ Last changed on Mon Feb 19 10:37:05 2001 by +GvR +

+ +

+

3.35. In the regression test, test___all__ fails for the profile module. What's wrong?

+If you have been using the profile module, and have properly calibrated a copy of the module as described in the documentation for the profiler: +

+http://www.python.org/doc/current/lib/profile-calibration.html +

+then it is possible that the regression test "test___all__" will fail if you run the regression test manually rather than using "make test" in the Python source directory. This will happen if you have set your PYTHONPATH environment variable to include the directory containing your calibrated profile module. You have probably calibrated the profiler using an older version of the profile module which does not define the __all__ value, added to the module as of Python 2.1. +

+The problem can be fixed by removing the old calibrated version of the profile module and using the latest version to do a fresh calibration. In general, you will need to re-calibrate for each version of Python anyway, since the performance characteristics can change in subtle ways that impact profiling. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 27 10:44:10 2001 by +Fred Drake +

+ +

+

3.36. relocations remain against allocatable but non-writable sections

+This linker error occurs on Solaris if you attempt to build an extension module which incorporates position-dependent (non-PIC) code. A common source of problems is that a static library (.a file), such as libreadline.a or libcrypto.a is linked with the extension module. The error specifically occurs when using gcc as the compiler, but /usr/ccs/bin/ld as the linker. +

+The following solutions and work-arounds are known: +

+1. Rebuild the libraries (libreadline, libcrypto) with -fPIC (-KPIC if using the system compiler). This is recommended; all object files in a shared library should be position-independent. +

+2. Statically link the extension module and its libraries into the Python interpreter, by editing Modules/Setup. +

+3. Use GNU ld instead of /usr/ccs/bin/ld; GNU ld will accept non-PIC code in shared libraries (and mark the section writable) +

+4. Pass -mimpure-text to GCC when linking the module. This will force gcc to not pass -z text to ld; in turn, ld will make all text sections writable. +

+Options 3 and 4 are not recommended, since the ability to share code across processes is lost. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 29 12:05:11 2002 by +Martin v. Löwis +

+ +

+

4. Programming in Python

+ +
+

4.1. Is there a source code level debugger with breakpoints, step, etc.?

+Yes. +

+Module pdb is a rudimentary but adequate console-mode debugger for Python. It is part of the standard Python library, and is documented in the Library Reference Manual. (You can also write your own debugger by using the code for pdb as an example.) +

+The IDLE interactive development environment, which is part of the standard Python distribution (normally available in Tools/idle), includes a graphical debugger. There is documentation for the IDLE debugger at http://www.python.org/idle/doc/idle2.html#Debugger +

+Pythonwin is a Python IDE that includes a GUI debugger based on bdb. The Pythonwin debugger colors breakpoints and has quite a few cool features (including debugging non-Pythonwin programs). A reference can be found at http://www.python.org/ftp/python/pythonwin/pwindex.html +More recent versions of PythonWin are available as a part of the ActivePython distribution (see http://www.activestate.com/Products/ActivePython/index.html). +

+Pydb is a version of the standard Python debugger pdb, modified for use with DDD (Data Display Debugger), a popular graphical debugger front end. Pydb can be found at http://packages.debian.org/unstable/devel/pydb.html +and DDD can be found at http://www.gnu.org/software/ddd/ +

+There are a number of commmercial Python IDEs that include graphical debuggers. They include: +

+

+ * Wing IDE (http://wingide.com/) 
+ * Komodo IDE (http://www.activestate.com/Products/Komodo/)
+
+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 28 01:43:41 2003 by +Stephen Ferg +

+ +

+

4.2. Can I create an object class with some methods implemented in C and others in Python (e.g. through inheritance)? (Also phrased as: Can I use a built-in type as base class?)

+In Python 2.2, you can inherit from builtin classes such as int, list, dict, etc. +

+In previous versions of Python, you can easily create a Python class which serves as a wrapper around a built-in object, e.g. (for dictionaries): +

+

+        # A user-defined class behaving almost identical
+        # to a built-in dictionary.
+        class UserDict:
+                def __init__(self): self.data = {}
+                def __repr__(self): return repr(self.data)
+                def __cmp__(self, dict):
+                        if type(dict) == type(self.data):
+                                return cmp(self.data, dict)
+                        else:
+                                return cmp(self.data, dict.data)
+                def __len__(self): return len(self.data)
+                def __getitem__(self, key): return self.data[key]
+                def __setitem__(self, key, item): self.data[key] = item
+                def __delitem__(self, key): del self.data[key]
+                def keys(self): return self.data.keys()
+                def items(self): return self.data.items()
+                def values(self): return self.data.values()
+                def has_key(self, key): return self.data.has_key(key)
+
+A2. See Jim Fulton's ExtensionClass for an example of a mechanism +which allows you to have superclasses which you can inherit from in +Python -- that way you can have some methods from a C superclass (call +it a mixin) and some methods from either a Python superclass or your +subclass. ExtensionClass is distributed as a part of Zope (see +http://www.zope.org), but will be phased out with Zope 3, since +Zope 3 uses Python 2.2 or later which supports direct inheritance +from built-in types. Here's a link to the original paper about +ExtensionClass: +http://debian.acm.ndsu.nodak.edu/doc/python-extclass/ExtensionClass.html +

+A3. The Boost Python Library (BPL, http://www.boost.org/libs/python/doc/index.html) +provides a way of doing this from C++ (i.e. you can inherit from an +extension class written in C++ using the BPL). +

+ +Edit this entry / +Log info + +/ Last changed on Tue May 28 21:09:52 2002 by +GvR +

+ +

+

4.3. Is there a curses/termcap package for Python?

+The standard Python source distribution comes with a curses module in +the Modules/ subdirectory, though it's not compiled by default (note +that this is not available in the Windows distribution -- there is +no curses module for Windows). +

+In Python versions before 2.0 the module only supported plain curses; +you couldn't use ncurses features like colors with it (though it would +link with ncurses). +

+In Python 2.0, the curses module has been greatly extended, starting +from Oliver Andrich's enhanced version, to provide many additional +functions from ncurses and SYSV curses, such as colour, alternative +character set support, pads, and mouse support. This means the +module is no longer compatible with operating systems that only +have BSD curses, but there don't seem to be any currently +maintained OSes that fall into this category. +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 23 20:24:06 2002 by +Tim Peters +

+ +

+

4.4. Is there an equivalent to C's onexit() in Python?

+For Python 2.0: The new atexit module provides a register function that +is similar to C's onexit. See the Library Reference for details. For +2.0 you should not assign to sys.exitfunc! +

+For Python 1.5.2: You need to import sys and assign a function to +sys.exitfunc, it will be called when your program exits, is +killed by an unhandled exception, or (on UNIX) receives a +SIGHUP or SIGTERM signal. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:14:55 2000 by +Bjorn Pettersen +

+ +

+

4.5. [deleted]

+[python used to lack nested scopes, it was explained here] +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:18:22 2002 by +Erno Kuusela +

+ +

+

4.6. How do I iterate over a sequence in reverse order?

+If it is a list, the fastest solution is +

+

+        list.reverse()
+        try:
+                for x in list:
+                        "do something with x"
+        finally:
+                list.reverse()
+
+This has the disadvantage that while you are in the loop, the list +is temporarily reversed. If you don't like this, you can make a copy. +This appears expensive but is actually faster than other solutions: +

+

+        rev = list[:]
+        rev.reverse()
+        for x in rev:
+                <do something with x>
+
+If it's not a list, a more general but slower solution is: +

+

+        for i in range(len(sequence)-1, -1, -1):
+                x = sequence[i]
+                <do something with x>
+
+A more elegant solution, is to define a class which acts as a sequence +and yields the elements in reverse order (solution due to Steve +Majewski): +

+

+        class Rev:
+                def __init__(self, seq):
+                        self.forw = seq
+                def __len__(self):
+                        return len(self.forw)
+                def __getitem__(self, i):
+                        return self.forw[-(i + 1)]
+
+You can now simply write: +

+

+        for x in Rev(list):
+                <do something with x>
+
+Unfortunately, this solution is slowest of all, due to the method +call overhead... +

+ +Edit this entry / +Log info + +/ Last changed on Sun May 25 21:10:50 1997 by +GvR +

+ +

+

4.7. My program is too slow. How do I speed it up?

+That's a tough one, in general. There are many tricks to speed up +Python code; I would consider rewriting parts in C only as a last +resort. One thing to notice is that function and (especially) method +calls are rather expensive; if you have designed a purely OO interface +with lots of tiny functions that don't do much more than get or set an +instance variable or call another method, you may consider using a +more direct way, e.g. directly accessing instance variables. Also see +the standard module "profile" (described in the Library Reference +manual) which makes it possible to find out where +your program is spending most of its time (if you have some patience +-- the profiling itself can slow your program down by an order of +magnitude). +

+Remember that many standard optimization heuristics you +may know from other programming experience may well apply +to Python. For example it may be faster to send output to output +devices using larger writes rather than smaller ones in order to +avoid the overhead of kernel system calls. Thus CGI scripts +that write all output in "one shot" may be notably faster than +those that write lots of small pieces of output. +

+Also, be sure to use "aggregate" operations where appropriate. +For example the "slicing" feature allows programs to chop up +lists and other sequence objects in a single tick of the interpreter +mainloop using highly optimized C implementations. Thus to +get the same effect as +

+

+  L2 = []
+  for i in range[3]:
+       L2.append(L1[i])
+
+it is much shorter and far faster to use +

+

+  L2 = list(L1[:3]) # "list" is redundant if L1 is a list.
+
+Note that the map() function, particularly used with +builtin methods or builtin functions can be a convenient +accelerator. For example to pair the elements of two +lists together: +

+

+  >>> map(None, [1,2,3], [4,5,6])
+  [(1, 4), (2, 5), (3, 6)]
+
+or to compute a number of sines: +

+

+  >>> map( math.sin, (1,2,3,4))
+  [0.841470984808, 0.909297426826, 0.14112000806,   -0.756802495308]
+
+The map operation completes very quickly in such cases. +

+Other examples of aggregate operations include the join and split +methods of string objects. For example if s1..s7 are large (10K+) strings then +"".join([s1,s2,s3,s4,s5,s6,s7]) may be far faster than +the more obvious s1+s2+s3+s4+s5+s6+s7, since the "summation" +will compute many subexpressions, whereas join does all +copying in one pass. For manipulating strings also consider the +regular expression libraries and the "substitution" operations +String % tuple and String % dictionary. Also be sure to use +the list.sort builtin method to do sorting, and see FAQ's 4.51 +and 4.59 for examples of moderately advanced usage -- list.sort beats +other techniques for sorting in all but the most extreme +circumstances. +

+There are many other aggregate operations +available in the standard libraries and in contributed libraries +and extensions. +

+Another common trick is to "push loops into functions or methods." +For example suppose you have a program that runs slowly and you +use the profiler (profile.run) to determine that a Python function ff +is being called lots of times. If you notice that ff +

+

+   def ff(x):
+       ...do something with x computing result...
+       return result
+
+tends to be called in loops like (A) +

+

+   list = map(ff, oldlist)
+
+or (B) +

+

+   for x in sequence:
+       value = ff(x)
+       ...do something with value...
+
+then you can often eliminate function call overhead by rewriting +ff to +

+

+   def ffseq(seq):
+       resultseq = []
+       for x in seq:
+           ...do something with x computing result...
+           resultseq.append(result)
+       return resultseq
+
+and rewrite (A) to +

+

+    list = ffseq(oldlist)
+
+and (B) to +

+

+    for value in ffseq(sequence):
+        ...do something with value...
+
+Other single calls ff(x) translate to ffseq([x])[0] with little +penalty. Of course this technique is not always appropriate +and there are other variants, which you can figure out. +

+You can gain some performance by explicitly storing the results of +a function or method lookup into a local variable. A loop like +

+

+    for key in token:
+        dict[key] = dict.get(key, 0) + 1
+
+resolves dict.get every iteration. If the method isn't going to +change, a faster implementation is +

+

+    dict_get = dict.get  # look up the method once
+    for key in token:
+        dict[key] = dict_get(key, 0) + 1
+
+Default arguments can be used to determine values once, at +compile time instead of at run time. This can only be done for +functions or objects which will not be changed during program +execution, such as replacing +

+

+    def degree_sin(deg):
+        return math.sin(deg * math.pi / 180.0)
+
+with +

+

+    def degree_sin(deg, factor = math.pi/180.0, sin = math.sin):
+        return sin(deg * factor)
+
+Because this trick uses default arguments for terms which should +not be changed, it should only be used when you are not concerned +with presenting a possibly confusing API to your users. +

+

+For an anecdote related to optimization, see +

+

+	http://www.python.org/doc/essays/list2str.html
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:03:54 2002 by +Neal Norwitz +

+ +

+

4.8. When I have imported a module, then edit it, and import it again (into the same Python process), the changes don't seem to take place. What is going on?

+For reasons of efficiency as well as consistency, Python only reads +the module file on the first time a module is imported. (Otherwise a +program consisting of many modules, each of which imports the same +basic module, would read the basic module over and over again.) To +force rereading of a changed module, do this: +

+

+        import modname
+        reload(modname)
+
+Warning: this technique is not 100% fool-proof. In particular, +modules containing statements like +

+

+        from modname import some_objects
+
+will continue to work with the old version of the imported objects. +

+ +Edit this entry / +Log info +

+ +

+

4.9. How do I find the current module name?

+A module can find out its own module name by looking at the +(predefined) global variable __name__. If this has the value +'__main__' you are running as a script. +

+ +Edit this entry / +Log info +

+ +

+

4.10. I have a module in which I want to execute some extra code when it is run as a script. How do I find out whether I am running as a script?

+See the previous question. E.g. if you put the following on the +last line of your module, main() is called only when your module is +running as a script: +

+

+        if __name__ == '__main__': main()
+
+

+ +Edit this entry / +Log info +

+ +

+

4.11. I try to run a program from the Demo directory but it fails with ImportError: No module named ...; what gives?

+This is probably an optional module (written in C!) which hasn't +been configured on your system. This especially happens with modules +like "Tkinter", "stdwin", "gl", "Xt" or "Xm". For Tkinter, STDWIN and +many other modules, see Modules/Setup.in for info on how to add these +modules to your Python, if it is possible at all. Sometimes you will +have to ftp and build another package first (e.g. Tcl and Tk for Tkinter). +Sometimes the module only works on specific platforms (e.g. gl only works +on SGI machines). +

+NOTE: if the complaint is about "Tkinter" (upper case T) and you have +already configured module "tkinter" (lower case t), the solution is +not to rename tkinter to Tkinter or vice versa. There is probably +something wrong with your module search path. Check out the value of +sys.path. +

+For X-related modules (Xt and Xm) you will have to do more work: they +are currently not part of the standard Python distribution. You will +have to ftp the Extensions tar file, i.e. +ftp://ftp.python.org/pub/python/src/X-extension.tar.gz and follow +the instructions there. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Feb 12 21:31:08 2003 by +Jens Kubieziel +

+ +

+

4.12. [deleted]

+[stdwin (long dead windowing library) entry deleted] +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 08:30:13 2002 by +Erno Kuusela +

+ +

+

4.13. What GUI toolkits exist for Python?

+Depending on what platform(s) you are aiming at, there are several. +

+Currently supported solutions: +

+Cross-platform: +

+Tk: +

+There's a neat object-oriented interface to the Tcl/Tk widget set, +called Tkinter. It is part of the standard Python distribution and +well-supported -- all you need to do is build and install Tcl/Tk and +enable the _tkinter module and the TKPATH definition in Modules/Setup +when building Python. This is probably the easiest to install and +use, and the most complete widget set. It is also very likely that in +the future the standard Python GUI API will be based on or at least +look very much like the Tkinter interface. For more info about Tk, +including pointers to the source, see the Tcl/Tk home page at +http://www.scriptics.com. Tcl/Tk is now fully +portable to the Mac and Windows platforms (NT and 95 only); you need +Python 1.4beta3 or later and Tk 4.1patch1 or later. +

+wxWindows: +

+There's an interface to wxWindows called wxPython. wxWindows is a +portable GUI class library written in C++. It supports GTK, Motif, +MS-Windows and Mac as targets. Ports to other platforms are being +contemplated or have already had some work done on them. wxWindows +preserves the look and feel of the underlying graphics toolkit, and +there is quite a rich widget set and collection of GDI classes. +See the wxWindows page at http://www.wxwindows.org/ for more details. +wxPython is a python extension module that wraps many of the wxWindows +C++ classes, and is quickly gaining popularity amongst Python +developers. You can get wxPython as part of the source or CVS +distribution of wxWindows, or directly from its home page at +http://alldunn.com/wxPython/. +

+Gtk+: +

+PyGtk bindings for the Gtk+ Toolkit by James Henstridge exist; see ftp://ftp.daa.com.au/pub/james/python/. Note that there are two incompatible bindings. If you are using Gtk+ 1.2.x you should get the 0.6.x PyGtk bindings from +

+

+    ftp://ftp.gtk.org/pub/python/v1.2
+
+If you plan to use Gtk+ 2.0 with Python (highly recommended if you are just starting with Gtk), get the most recent distribution from +

+

+    ftp://ftp.gtk.org/pub/python/v2.0
+
+If you are adventurous, you can also check out the source from the Gnome CVS repository. Set your CVS directory to :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome and check the gnome-python module out from the repository. +

+Other: +

+There are also bindings available for the Qt toolkit (PyQt), and for KDE (PyKDE); see http://www.thekompany.com/projects/pykde/. +

+For OpenGL bindings, see http://starship.python.net/~da/PyOpenGL. +

+Platform specific: +

+The Mac port has a rich and ever-growing set of modules that support +the native Mac toolbox calls. See the documentation that comes with +the Mac port. See ftp://ftp.python.org/pub/python/mac. Support +by Jack Jansen jack@cwi.nl. +

+Pythonwin by Mark Hammond (MHammond@skippinet.com.au) +includes an interface to the Microsoft Foundation +Classes and a Python programming environment using it that's written +mostly in Python. See http://www.python.org/windows/. +

+There's an object-oriented GUI based on the Microsoft Foundation +Classes model called WPY, supported by Jim Ahlstrom jim@interet.com. +Programs written in WPY run unchanged and with native look and feel on +Windows NT/95, Windows 3.1 (using win32s), and on Unix (using Tk). +Source and binaries for Windows and Linux are available in +ftp://ftp.python.org/pub/python/wpy/. +

+Obsolete or minority solutions: +

+There's an interface to X11, including the Athena and Motif widget +sets (and a few individual widgets, like Mosaic's HTML widget and +SGI's GL widget) available from +ftp://ftp.python.org/pub/python/src/X-extension.tar.gz. +Support by Sjoerd Mullender sjoerd@cwi.nl. +

+On top of the X11 interface there's the vpApp +toolkit by Per Spilling, now also maintained by Sjoerd Mullender +sjoerd@cwi.nl. See ftp://ftp.cwi.nl/pub/sjoerd/vpApp.tar.gz. +

+For SGI IRIX only, there are unsupported interfaces to the complete +GL (Graphics Library -- low level but very good 3D capabilities) as +well as to FORMS (a buttons-and-sliders-etc package built on top of GL +by Mark Overmars -- ftp'able from +ftp://ftp.cs.ruu.nl/pub/SGI/FORMS/). This is probably also +becoming obsolete, as OpenGL takes over (see above). +

+There's an interface to STDWIN, a platform-independent low-level +windowing interface for Mac and X11. This is totally unsupported and +rapidly becoming obsolete. The STDWIN sources are at +ftp://ftp.cwi.nl/pub/stdwin/. +

+There is an interface to WAFE, a Tcl interface to the X11 +Motif and Athena widget sets. WAFE is at +http://www.wu-wien.ac.at/wafe/wafe.html. +

+ +Edit this entry / +Log info + +/ Last changed on Mon May 13 21:40:39 2002 by +Skip Montanaro +

+ +

+

4.14. Are there any interfaces to database packages in Python?

+Yes! See the Database Topic Guide at +http://www.python.org/topics/database/ for details. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 4 20:12:19 2000 by +Barney Warplug +

+ +

+

4.15. Is it possible to write obfuscated one-liners in Python?

+Yes. See the following three examples, due to Ulf Bartelt: +

+

+        # Primes < 1000
+        print filter(None,map(lambda y:y*reduce(lambda x,y:x*y!=0,
+        map(lambda x,y=y:y%x,range(2,int(pow(y,0.5)+1))),1),range(2,1000)))
+
+
+        # First 10 Fibonacci numbers
+        print map(lambda x,f=lambda x,f:(x<=1) or (f(x-1,f)+f(x-2,f)): f(x,f),
+        range(10))
+
+
+        # Mandelbrot set
+        print (lambda Ru,Ro,Iu,Io,IM,Sx,Sy:reduce(lambda x,y:x+y,map(lambda y,
+        Iu=Iu,Io=Io,Ru=Ru,Ro=Ro,Sy=Sy,L=lambda yc,Iu=Iu,Io=Io,Ru=Ru,Ro=Ro,i=IM,
+        Sx=Sx,Sy=Sy:reduce(lambda x,y:x+y,map(lambda x,xc=Ru,yc=yc,Ru=Ru,Ro=Ro,
+        i=i,Sx=Sx,F=lambda xc,yc,x,y,k,f=lambda xc,yc,x,y,k,f:(k<=0)or (x*x+y*y
+        >=4.0) or 1+f(xc,yc,x*x-y*y+xc,2.0*x*y+yc,k-1,f):f(xc,yc,x,y,k,f):chr(
+        64+F(Ru+x*(Ro-Ru)/Sx,yc,0,0,i)),range(Sx))):L(Iu+y*(Io-Iu)/Sy),range(Sy
+        ))))(-2.1, 0.7, -1.2, 1.2, 30, 80, 24)
+        #    \___ ___/  \___ ___/  |   |   |__ lines on screen
+        #        V          V      |   |______ columns on screen
+        #        |          |      |__________ maximum of "iterations"
+        #        |          |_________________ range on y axis
+        #        |____________________________ range on x axis
+
+Don't try this at home, kids! +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 15:48:33 1997 by +GvR +

+ +

+

4.16. Is there an equivalent of C's "?:" ternary operator?

+Not directly. In many cases you can mimic a?b:c with "a and b or +c", but there's a flaw: if b is zero (or empty, or None -- anything +that tests false) then c will be selected instead. In many cases you +can prove by looking at the code that this can't happen (e.g. because +b is a constant or has a type that can never be false), but in general +this can be a problem. +

+Tim Peters (who wishes it was Steve Majewski) suggested the following +solution: (a and [b] or [c])[0]. Because [b] is a singleton list it +is never false, so the wrong path is never taken; then applying [0] to +the whole thing gets the b or c that you really wanted. Ugly, but it +gets you there in the rare cases where it is really inconvenient to +rewrite your code using 'if'. +

+As a last resort it is possible to implement the "?:" operator as a function: +

+

+    def q(cond,on_true,on_false):
+        from inspect import isfunction
+
+
+        if cond:
+            if not isfunction(on_true): return on_true
+            else: return apply(on_true)
+        else:
+            if not isfunction(on_false): return on_false 
+            else: return apply(on_false)
+
+In most cases you'll pass b and c directly: q(a,b,c). To avoid evaluating b +or c when they shouldn't be, encapsulate them +within a lambda function, e.g.: q(a,lambda: b, lambda: c). +

+

+

+It has been asked why Python has no if-then-else expression, +since most language have one; it is a frequently requested feature. +

+There are several possible answers: just as many languages do +just fine without one; it can easily lead to less readable code; +no sufficiently "Pythonic" syntax has been discovered; a search +of the standard library found remarkably few places where using an +if-then-else expression would make the code more understandable. +

+Nevertheless, in an effort to decide once and for all whether +an if-then-else expression should be added to the language, +PEP 308 (http://www.python.org/peps/pep-0308.html) has been +put forward, proposing a specific syntax. The community can +now vote on this issue. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Feb 7 19:41:13 2003 by +David Goodger +

+ +

+

4.17. My class defines __del__ but it is not called when I delete the object.

+There are several possible reasons for this. +

+The del statement does not necessarily call __del__ -- it simply +decrements the object's reference count, and if this reaches zero +__del__ is called. +

+If your data structures contain circular links (e.g. a tree where +each child has a parent pointer and each parent has a list of +children) the reference counts will never go back to zero. You'll +have to define an explicit close() method which removes those +pointers. Please don't ever call __del__ directly -- __del__ should +call close() and close() should make sure that it can be called more +than once for the same object. +

+If the object has ever been a local variable (or argument, which is +really the same thing) to a function that caught an expression in an +except clause, chances are that a reference to the object still exists +in that function's stack frame as contained in the stack trace. +Normally, deleting (better: assigning None to) sys.exc_traceback will +take care of this. If a stack was printed for an unhandled +exception in an interactive interpreter, delete sys.last_traceback +instead. +

+There is code that deletes all objects when the interpreter exits, +but it is not called if your Python has been configured to support +threads (because other threads may still be active). You can define +your own cleanup function using sys.exitfunc (see question 4.4). +

+Finally, if your __del__ method raises an exception, a warning message is printed to sys.stderr. +

+

+Starting with Python 2.0, a garbage collector periodically reclaims the space used by most cycles with no external references. (See the "gc" module documentation for details.) There are, however, pathological cases where it can be expected to fail. Moreover, the garbage collector runs some time after the last reference to your data structure vanishes, so your __del__ method may be called at an inconvenient and random time. This is inconvenient if you're trying to reproduce a problem. Worse, the order in which object's __del__ methods are executed is arbitrary. +

+Another way to avoid cyclical references is to use the "weakref" module, which allows you to point to objects without incrementing their reference count. Tree data structures, for instance, should use weak references for their parent and sibling pointers (if they need them!). +

+Question 6.14 is intended to explain the new garbage collection algorithm. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 10 15:27:28 2002 by +Matthias Urlichs +

+ +

+

4.18. How do I change the shell environment for programs called using os.popen() or os.system()? Changing os.environ doesn't work.

+You must be using either a version of python before 1.4, or on a +(rare) system that doesn't have the putenv() library function. +

+Before Python 1.4, modifying the environment passed to subshells was +left out of the interpreter because there seemed to be no +well-established portable way to do it (in particular, some systems, +have putenv(), others have setenv(), and some have none at all). As +of Python 1.4, almost all Unix systems do have putenv(), and so does +the Win32 API, and thus the os module was modified so that changes to +os.environ are trapped and the corresponding putenv() call is made. +

+ +Edit this entry / +Log info +

+ +

+

4.19. What is a class?

+A class is the particular object type created by executing +a class statement. Class objects are used as templates, to create +instance objects, which embody both the data structure +(attributes) and program routines (methods) specific to a datatype. +

+A class can be based on one or more other classes, called its base +class(es). It then inherits the attributes and methods of its base classes. This allows an object model to be successively refined +by inheritance. +

+The term "classic class" is used to refer to the original +class implementation in Python. One problem with classic +classes is their inability to use the built-in data types +(such as list and dictionary) as base classes. Starting +with Python 2.2 an attempt is in progress to unify user-defined +classes and built-in types. It is now possible to declare classes +that inherit from built-in types. +

+ +Edit this entry / +Log info + +/ Last changed on Mon May 27 01:31:21 2002 by +Steve Holden +

+ +

+

4.20. What is a method?

+A method is a function that you normally call as +x.name(arguments...) for some object x. The term is used for methods +of classes and class instances as well as for methods of built-in +objects. (The latter have a completely different implementation and +only share the way their calls look in Python code.) Methods of +classes (and class instances) are defined as functions inside the +class definition. +

+ +Edit this entry / +Log info +

+ +

+

4.21. What is self?

+Self is merely a conventional name for the first argument of a +method -- i.e. a function defined inside a class definition. A method +defined as meth(self, a, b, c) should be called as x.meth(a, b, c) for +some instance x of the class in which the definition occurs; +the called method will think it is called as meth(x, a, b, c). +

+ +Edit this entry / +Log info +

+ +

+

4.22. What is an unbound method?

+An unbound method is a method defined in a class that is not yet +bound to an instance. You get an unbound method if you ask for a +class attribute that happens to be a function. You get a bound method +if you ask for an instance attribute. A bound method knows which +instance it belongs to and calling it supplies the instance automatically; +an unbound method only knows which class it wants for its first +argument (a derived class is also OK). Calling an unbound method +doesn't "magically" derive the first argument from the context -- you +have to provide it explicitly. +

+Trivia note regarding bound methods: each reference to a bound +method of a particular object creates a bound method object. If you +have two such references (a = inst.meth; b = inst.meth), they will +compare equal (a == b) but are not the same (a is not b). +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 6 18:07:25 1998 by +Clarence Gardner +

+ +

+

4.23. How do I call a method defined in a base class from a derived class that overrides it?

+If your class definition starts with "class Derived(Base): ..." +then you can call method meth defined in Base (or one of Base's base +classes) as Base.meth(self, arguments...). Here, Base.meth is an +unbound method (see previous question). +

+ +Edit this entry / +Log info +

+ +

+

4.24. How do I call a method from a base class without using the name of the base class?

+DON'T DO THIS. REALLY. I MEAN IT. It appears that you could call +self.__class__.__bases__[0].meth(self, arguments...) but this fails when +a doubly-derived method is derived from your class: for its instances, +self.__class__.__bases__[0] is your class, not its base class -- so +(assuming you are doing this from within Derived.meth) you would start +a recursive call. +

+Often when you want to do this you are forgetting that classes +are first class in Python. You can "point to" the class you want +to delegate an operation to either at the instance or at the +subclass level. For example if you want to use a "glorp" +operation of a superclass you can point to the right superclass +to use. +

+

+  class subclass(superclass1, superclass2, superclass3):
+      delegate_glorp = superclass2
+      ...
+      def glorp(self, arg1, arg2):
+            ... subclass specific stuff ...
+            self.delegate_glorp.glorp(self, arg1, arg2)
+       ...
+
+
+  class subsubclass(subclass):
+       delegate_glorp = superclass3
+       ...
+
+Note, however that setting delegate_glorp to subclass in +subsubclass would cause an infinite recursion on subclass.delegate_glorp. Careful! Maybe you are getting too fancy for your own good. Consider simplifying the design (?). +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jul 28 13:58:22 1997 by +aaron watters +

+ +

+

4.25. How can I organize my code to make it easier to change the base class?

+You could define an alias for the base class, assign the real base +class to it before your class definition, and use the alias throughout +your class. Then all you have to change is the value assigned to the +alias. Incidentally, this trick is also handy if you want to decide +dynamically (e.g. depending on availability of resources) which base +class to use. Example: +

+

+        BaseAlias = <real base class>
+        class Derived(BaseAlias):
+                def meth(self):
+                        BaseAlias.meth(self)
+                        ...
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 15:49:57 1997 by +GvR +

+ +

+

4.26. How can I find the methods or attributes of an object?

+This depends on the object type. +

+For an instance x of a user-defined class, instance attributes are +found in the dictionary x.__dict__, and methods and attributes defined +by its class are found in x.__class__.__bases__[i].__dict__ (for i in +range(len(x.__class__.__bases__))). You'll have to walk the tree of +base classes to find all class methods and attributes. +

+Many, but not all built-in types define a list of their method names +in x.__methods__, and if they have data attributes, their names may be +found in x.__members__. However this is only a convention. +

+For more information, read the source of the standard (but +undocumented) module newdir. +

+ +Edit this entry / +Log info +

+ +

+

4.27. I can't seem to use os.read() on a pipe created with os.popen().

+os.read() is a low-level function which takes a file descriptor (a +small integer). os.popen() creates a high-level file object -- the +same type used for sys.std{in,out,err} and returned by the builtin +open() function. Thus, to read n bytes from a pipe p created with +os.popen(), you need to use p.read(n). +

+ +Edit this entry / +Log info +

+ +

+

4.28. How can I create a stand-alone binary from a Python script?

+Even though there are Python compilers being developed, +you probably don't need a real compiler, if all you want +is a stand-alone program. There are three solutions to that. +

+One is to use the freeze tool, which is included in the Python +source tree as Tools/freeze. It converts Python byte +code to C arrays. Using a C compiler, you can embed all +your modules into a new program, which is then linked +with the standard Python modules. +

+It works by scanning your source recursively for import statements +(in both forms) and looking for the modules in the standard Python path +as well as in the source directory (for built-in modules). It then +1 the modules written in Python to C code (array initializers +that can be turned into code objects using the marshal module) and +creates a custom-made config file that only contains those built-in +modules which are actually used in the program. It then compiles the +generated C code and links it with the rest of the Python interpreter +to form a self-contained binary which acts exactly like your script. +

+(Hint: the freeze program only works if your script's filename ends in +".py".) +

+There are several utilities which may be helpful. The first is Gordon McMillan's installer at +

+

+    http://www.mcmillan-inc.com/install1.html
+
+which works on Windows, Linux and at least some forms of Unix. +

+Another is Thomas Heller's py2exe (Windows only) at +

+

+    http://starship.python.net/crew/theller/py2exe/
+
+A third is Christian Tismer's SQFREEZE +(http://starship.python.net/crew/pirx/) which appends the byte code +to a specially-prepared Python interpreter, which +will find the byte code in executable. +

+A fourth is Fredrik Lundh's Squeeze +(http://www.pythonware.com/products/python/squeeze/). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jun 19 14:01:30 2002 by +Gordon McMillan +

+ +

+

4.29. What WWW tools are there for Python?

+See the chapters titled "Internet Protocols and Support" and +"Internet Data Handling" in the Library Reference +Manual. Python is full of good things which will help you build server-side and client-side web systems. +

+A summary of available frameworks is maintained by Paul Boddie at +

+

+    http://thor.prohosting.com/~pboddie/Python/web_modules.html
+
+Cameron Laird maintains a useful set of pages about Python web technologies at +

+

+   http://starbase.neosoft.com/~claird/comp.lang.python/web_python.html/
+
+There was a web browser written in Python, called Grail -- +see http://sourceforge.net/project/grail/. This project has been terminated; http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/grail/grail/README gives more details. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Nov 11 22:48:25 2002 by +GvR +

+ +

+

4.30. How do I run a subprocess with pipes connected to both input and output?

+Use the standard popen2 module. For example: +

+

+	import popen2
+	fromchild, tochild = popen2.popen2("command")
+	tochild.write("input\n")
+	tochild.flush()
+	output = fromchild.readline()
+
+Warning: in general, it is unwise to +do this, because you can easily cause a deadlock where your +process is blocked waiting for output from the child, while the child +is blocked waiting for input from you. This can be caused +because the parent expects the child to output more text than it does, +or it can be caused by data being stuck in stdio buffers due to lack +of flushing. The Python parent can of course explicitly flush the data +it sends to the child before it reads any output, but if the child is +a naive C program it can easily have been written to never explicitly +flush its output, even if it is interactive, since flushing is +normally automatic. +

+Note that a deadlock is also possible if you use popen3 to read +stdout and stderr. If one of the two is too large for the internal +buffer (increasing the buffersize does not help) and you read() +the other one first, there is a deadlock, too. +

+Note on a bug in popen2: unless your program calls wait() +or waitpid(), finished child processes are never removed, +and eventually calls to popen2 will fail because of a limit on +the number of child processes. Calling os.waitpid with the +os.WNOHANG option can prevent this; a good place to insert such +a call would be before calling popen2 again. +

+Another way to produce a deadlock: Call a wait() and there is +still more output from the program than what fits into the +internal buffers. +

+In many cases, all you really need is to run some data through a +command and get the result back. Unless the data is infinite in size, +the easiest (and often the most efficient!) way to do this is to write +it to a temporary file and run the command with that temporary file as +input. The standard module tempfile exports a function mktemp() which +generates unique temporary file names. +

+

+ import tempfile
+ import os
+ class Popen3:
+    """
+    This is a deadlock-save version of popen, that returns
+    an object with errorlevel, out (a string) and err (a string).
+    (capturestderr may not work under windows.)
+    Example: print Popen3('grep spam','\n\nhere spam\n\n').out
+    """
+    def __init__(self,command,input=None,capturestderr=None):
+        outfile=tempfile.mktemp()
+        command="( %s ) > %s" % (command,outfile)
+        if input:
+            infile=tempfile.mktemp()
+            open(infile,"w").write(input)
+            command=command+" <"+infile
+        if capturestderr:
+            errfile=tempfile.mktemp()
+            command=command+" 2>"+errfile
+        self.errorlevel=os.system(command) >> 8
+        self.out=open(outfile,"r").read()
+        os.remove(outfile)
+        if input:
+            os.remove(infile)
+        if capturestderr:
+            self.err=open(errfile,"r").read()
+            os.remove(errfile)
+
+Note that many interactive programs (e.g. vi) don't work well with +pipes substituted for standard input and output. You will have to use +pseudo ttys ("ptys") instead of pipes. There is some undocumented +code to use these in the library module pty.py -- I'm afraid you're on +your own here. +

+A different answer is a Python interface to Don Libes' "expect" +library. A Python extension that interfaces to expect is called "expy" +and available from +http://expectpy.sourceforge.net/. +

+A pure Python solution that works like expect is pexpect of Noah Spurrier. +A beta version is available from +http://pexpect.sourceforge.net/ +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 3 16:31:31 2002 by +Tobias Polzin +

+ +

+

4.31. How do I call a function if I have the arguments in a tuple?

+Use the built-in function apply(). For instance, +

+

+    func(1, 2, 3)
+
+is equivalent to +

+

+    args = (1, 2, 3)
+    apply(func, args)
+
+Note that func(args) is not the same -- it calls func() with exactly +one argument, the tuple args, instead of three arguments, the integers +1, 2 and 3. +

+In Python 2.0, you can also use extended call syntax: +

+f(*args) is equivalent to apply(f, args) +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 03:42:50 2001 by +Moshe Zadka +

+ +

+

4.32. How do I enable font-lock-mode for Python in Emacs?

+If you are using XEmacs 19.14 or later, any XEmacs 20, FSF Emacs 19.34 +or any Emacs 20, font-lock should work automatically for you if you +are using the latest python-mode.el. +

+If you are using an older version of XEmacs or Emacs you will need +to put this in your .emacs file: +

+

+        (defun my-python-mode-hook ()
+          (setq font-lock-keywords python-font-lock-keywords)
+          (font-lock-mode 1))
+        (add-hook 'python-mode-hook 'my-python-mode-hook)
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 6 16:18:46 1998 by +Barry Warsaw +

+ +

+

4.33. Is there a scanf() or sscanf() equivalent?

+Not as such. +

+For simple input parsing, the easiest approach is usually to split +the line into whitespace-delimited words using string.split(), and to +convert decimal strings to numeric values using int(), +long() or float(). (Python's int() is 32-bit and its +long() is arbitrary precision.) string.split supports an optional +"sep" parameter which is useful if the line uses something other +than whitespace as a delimiter. +

+For more complicated input parsing, regular expressions (see module re) +are better suited and more powerful than C's sscanf(). +

+There's a contributed module that emulates sscanf(), by Steve Clift; +see contrib/Misc/sscanfmodule.c of the ftp site: +

+

+    http://www.python.org/ftp/python/contrib-09-Dec-1999/Misc/
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:07:51 2002 by +Neal Norwitz +

+ +

+

4.34. Can I have Tk events handled while waiting for I/O?

+Yes, and you don't even need threads! But you'll have to +restructure your I/O code a bit. Tk has the equivalent of Xt's +XtAddInput() call, which allows you to register a callback function +which will be called from the Tk mainloop when I/O is possible on a +file descriptor. Here's what you need: +

+

+        from Tkinter import tkinter
+        tkinter.createfilehandler(file, mask, callback)
+
+The file may be a Python file or socket object (actually, anything +with a fileno() method), or an integer file descriptor. The mask is +one of the constants tkinter.READABLE or tkinter.WRITABLE. The +callback is called as follows: +

+

+        callback(file, mask)
+
+You must unregister the callback when you're done, using +

+

+        tkinter.deletefilehandler(file)
+
+Note: since you don't know *how many bytes* are available for reading, +you can't use the Python file object's read or readline methods, since +these will insist on reading a predefined number of bytes. For +sockets, the recv() or recvfrom() methods will work fine; for other +files, use os.read(file.fileno(), maxbytecount). +

+ +Edit this entry / +Log info +

+ +

+

4.35. How do I write a function with output parameters (call by reference)?

+[Mark Lutz] The thing to remember is that arguments are passed by +assignment in Python. Since assignment just creates references to +objects, there's no alias between an argument name in the caller and +callee, and so no call-by-reference per se. But you can simulate it +in a number of ways: +

+1) By using global variables; but you probably shouldn't :-) +

+2) By passing a mutable (changeable in-place) object: +

+

+      def func1(a):
+          a[0] = 'new-value'     # 'a' references a mutable list
+          a[1] = a[1] + 1        # changes a shared object
+
+
+      args = ['old-value', 99]
+      func1(args)
+      print args[0], args[1]     # output: new-value 100
+
+3) By returning a tuple, holding the final values of arguments: +

+

+      def func2(a, b):
+          a = 'new-value'        # a and b are local names
+          b = b + 1              # assigned to new objects
+          return a, b            # return new values
+
+
+      x, y = 'old-value', 99
+      x, y = func2(x, y)
+      print x, y                 # output: new-value 100
+
+4) And other ideas that fall-out from Python's object model. For instance, it might be clearer to pass in a mutable dictionary: +

+

+      def func3(args):
+          args['a'] = 'new-value'     # args is a mutable dictionary
+          args['b'] = args['b'] + 1   # change it in-place
+
+
+      args = {'a':' old-value', 'b': 99}
+      func3(args)
+      print args['a'], args['b']
+
+5) Or bundle-up values in a class instance: +

+

+      class callByRef:
+          def __init__(self, **args):
+              for (key, value) in args.items():
+                  setattr(self, key, value)
+
+
+      def func4(args):
+          args.a = 'new-value'        # args is a mutable callByRef
+          args.b = args.b + 1         # change object in-place
+
+
+      args = callByRef(a='old-value', b=99)
+      func4(args)
+      print args.a, args.b
+
+
+   But there's probably no good reason to get this complicated :-).
+
+[Python's author favors solution 3 in most cases.] +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 8 23:49:46 1997 by +David Ascher +

+ +

+

4.36. Please explain the rules for local and global variables in Python.

+[Ken Manheimer] In Python, procedure variables are implicitly +global, unless they are assigned anywhere within the block. +In that case +they are implicitly local, and you need to explicitly declare them as +'global'. +

+Though a bit surprising at first, a moment's consideration explains +this. On one hand, requirement of 'global' for assigned vars provides +a bar against unintended side-effects. On the other hand, if global +were required for all global references, you'd be using global all the +time. Eg, you'd have to declare as global every reference to a +builtin function, or to a component of an imported module. This +clutter would defeat the usefulness of the 'global' declaration for +identifying side-effects. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 28 09:53:27 1998 by +GvR +

+ +

+

4.37. How can I have modules that mutually import each other?

+Suppose you have the following modules: +

+foo.py: +

+

+	from bar import bar_var
+	foo_var=1
+
+bar.py: +

+

+	from foo import foo_var
+	bar_var=2
+
+The problem is that the above is processed by the interpreter thus: +

+

+	main imports foo
+	Empty globals for foo are created
+	foo is compiled and starts executing
+	foo imports bar
+	Empty globals for bar are created
+	bar is compiled and starts executing
+	bar imports foo (which is a no-op since there already is a module named foo)
+	bar.foo_var = foo.foo_var
+	...
+
+The last step fails, because Python isn't done with interpreting foo yet and the global symbol dict for foo is still empty. +

+The same thing happens when you use "import foo", and then try to access "foo.one" in global code. +

+

+There are (at least) three possible workarounds for this problem. +

+Guido van Rossum recommends to avoid all uses of "from <module> import ..." (so everything from an imported module is referenced as <module>.<name>) and to place all code inside functions. Initializations of global variables and class variables should use constants or built-in functions only. +

+

+Jim Roskind suggests the following order in each module: +

+

+ exports (globals, functions, and classes that don't need imported base classes)
+ import statements
+ active code (including globals that are initialized from imported values).
+
+Python's author doesn't like this approach much because the imports +appear in a strange place, but has to admit that it works. +

+

+

+Matthias Urlichs recommends to restructure your code so that the recursive import is not necessary in the first place. +

+

+These solutions are not mutually exclusive. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 06:52:51 2002 by +Matthias Urlichs +

+ +

+

4.38. How do I copy an object in Python?

+Try copy.copy() or copy.deepcopy() for the general case. Not all objects can be copied, but most can. +

+Dictionaries have a copy method. Sequences can be copied by slicing: +

+ new_l = l[:]
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:40:26 2002 by +Erno Kuusela +

+ +

+

4.39. How to implement persistent objects in Python? (Persistent == automatically saved to and restored from disk.)

+The library module "pickle" now solves this in a very general way +(though you still can't store things like open files, sockets or +windows), and the library module "shelve" uses pickle and (g)dbm to +create persistent mappings containing arbitrary Python objects. +For possibly better performance also look for the latest version +of the relatively recent cPickle module. +

+A more awkward way of doing things is to use pickle's little sister, +marshal. The marshal module provides very fast ways to store +noncircular basic Python types to files and strings, and back again. +Although marshal does not do fancy things like store instances or +handle shared references properly, it does run extremely fast. For +example loading a half megabyte of data may take less than a +third of a second (on some machines). This often beats doing +something more complex and general such as using gdbm with +pickle/shelve. +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 8 22:59:00 1997 by +David Ascher +

+ +

+

4.40. I try to use __spam and I get an error about _SomeClassName__spam.

+Variables with double leading underscore are "mangled" to provide a +simple but effective way to define class private variables. See the +chapter "New in Release 1.4" in the Python Tutorial. +

+ +Edit this entry / +Log info +

+ +

+

4.41. How do I delete a file? And other file questions.

+Use os.remove(filename) or os.unlink(filename); for documentation, +see the posix section of the library manual. They are the same, +unlink() is simply the Unix name for this function. In earlier +versions of Python, only os.unlink() was available. +

+To remove a directory, use os.rmdir(); use os.mkdir() to create one. +

+To rename a file, use os.rename(). +

+To truncate a file, open it using f = open(filename, "r+"), and use +f.truncate(offset); offset defaults to the current seek position. +(The "r+" mode opens the file for reading and writing.) +There's also os.ftruncate(fd, offset) for files opened with os.open() +-- for advanced Unix hacks only. +

+The shutil module also contains a number of functions to work on files +including copyfile, copytree, and rmtree amongst others. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:30:01 2000 by +Bjorn Pettersen +

+ +

+

4.42. How to modify urllib or httplib to support HTTP/1.1?

+Recent versions of Python (2.0 and onwards) support HTTP/1.1 natively. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 02:56:56 2001 by +Moshe Zadka +

+ +

+

4.43. Unexplicable syntax errors in compile() or exec.

+When a statement suite (as opposed to an expression) is compiled by +compile(), exec or execfile(), it must end in a newline. In some +cases, when the source ends in an indented block it appears that at +least two newlines are required. +

+ +Edit this entry / +Log info +

+ +

+

4.44. How do I convert a string to a number?

+For integers, use the built-in int() function, e.g. int('144') == 144. Similarly, long() converts from string to long integer, e.g. long('144') == 144L; and float() to floating-point, e.g. float('144') == 144.0. +

+Note that these are restricted to decimal interpretation, so +that int('0144') == 144 and int('0x144') raises ValueError. For Python +2.0 int takes the base to convert from as a second optional argument, so +int('0x144', 16) == 324. +

+For greater flexibility, or before Python 1.5, import the module +string and use the string.atoi() function for integers, +string.atol() for long integers, or string.atof() for +floating-point. E.g., +string.atoi('100', 16) == string.atoi('0x100', 0) == 256. +See the library reference manual section for the string module for +more details. +

+While you could use the built-in function eval() instead of +any of those, this is not recommended, because someone could pass you +a Python expression that might have unwanted side effects (like +reformatting your disk). It also has the effect of interpreting numbers +as Python expressions, so that e.g. eval('09') gives a syntax error +since Python regards numbers starting with '0' as octal (base 8). +

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:37:34 2000 by +Bjorn Pettersen +

+ +

+

4.45. How do I convert a number to a string?

+To convert, e.g., the number 144 to the string '144', use the +built-in function repr() or the backquote notation (these are +equivalent). If you want a hexadecimal or octal representation, use +the built-in functions hex() or oct(), respectively. For fancy +formatting, use the % operator on strings, just like C printf formats, +e.g. "%04d" % 144 yields '0144' and "%.3f" % (1/3.0) yields '0.333'. +See the library reference manual for details. +

+ +Edit this entry / +Log info +

+ +

+

4.46. How do I copy a file?

+There's the shutil module which contains a copyfile() +function that implements a copy loop; +it isn't good enough for the Macintosh, though: +it doesn't copy the resource fork and Finder info. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 02:59:40 2001 by +Moshe Zadka +

+ +

+

4.47. How do I check if an object is an instance of a given class or of a subclass of it?

+If you are developing the classes from scratch it might be better to +program in a more proper object-oriented style -- instead of doing a different +thing based on class membership, why not use a method and define the +method differently in different classes? +

+However, there are some legitimate situations +where you need to test for class membership. +

+In Python 1.5, you can use the built-in function isinstance(obj, cls). +

+The following approaches can be used with earlier Python versions: +

+An unobvious method is to raise the object +as an exception and to try to catch the exception with the class you're +testing for: +

+

+	def is_instance_of(the_instance, the_class):
+	    try:
+		raise the_instance
+	    except the_class:
+		return 1
+	    except:
+		return 0
+
+This technique can be used to distinguish "subclassness" +from a collection of classes as well +

+

+                try:
+                              raise the_instance
+                except Audible:
+                              the_instance.play(largo)
+                except Visual:
+                              the_instance.display(gaudy)
+                except Olfactory:
+                              sniff(the_instance)
+                except:
+                              raise ValueError, "dunno what to do with this!"
+
+This uses the fact that exception catching tests for class or subclass +membership. +

+A different approach is to test for the presence of a class attribute that +is presumably unique for the given class. For instance: +

+

+	class MyClass:
+	    ThisIsMyClass = 1
+	    ...
+
+
+	def is_a_MyClass(the_instance):
+	    return hasattr(the_instance, 'ThisIsMyClass')
+
+This version is easier to inline, and probably faster (inlined it +is definitely faster). The disadvantage is that someone else could cheat: +

+

+	class IntruderClass:
+	    ThisIsMyClass = 1    # Masquerade as MyClass
+	    ...
+
+but this may be seen as a feature (anyway, there are plenty of other ways +to cheat in Python). Another disadvantage is that the class must be +prepared for the membership test. If you do not "control the +source code" for the class it may not be advisable to modify the +class to support testability. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jan 2 15:16:04 1998 by +GvR +

+ +

+

4.48. What is delegation?

+Delegation refers to an object oriented technique Python programmers +may implement with particular ease. Consider the following: +

+

+  from string import upper
+
+
+  class UpperOut:
+        def __init__(self, outfile):
+              self.__outfile = outfile
+        def write(self, str):
+              self.__outfile.write( upper(str) )
+        def __getattr__(self, name):
+              return getattr(self.__outfile, name)
+
+Here the UpperOut class redefines the write method +to convert the argument string to upper case before +calling the underlying self.__outfile.write method, but +all other methods are delegated to the underlying +self.__outfile object. The delegation is accomplished +via the "magic" __getattr__ method. Please see the +language reference for more information on the use +of this method. +

+Note that for more general cases delegation can +get trickier. Particularly when attributes must be set +as well as gotten the class must define a __settattr__ +method too, and it must do so carefully. +

+The basic implementation of __setattr__ is roughly +equivalent to the following: +

+

+   class X:
+        ...
+        def __setattr__(self, name, value):
+             self.__dict__[name] = value
+        ...
+
+Most __setattr__ implementations must modify +self.__dict__ to store local state for self without +causing an infinite recursion. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 13 07:11:24 1997 by +aaron watters +

+ +

+

4.49. How do I test a Python program or component.

+We presume for the purposes of this question you are interested +in standalone testing, rather than testing your components inside +a testing framework. The best-known testing framework for Python +is the PyUnit module, maintained at +

+

+    http://pyunit.sourceforge.net/
+
+For standalone testing, it helps to write the program so that +it may be easily tested by using good modular design. +In particular your program +should have almost all functionality encapsulated in either functions +or class methods -- and this sometimes has the surprising and +delightful effect of making the program run faster (because +local variable accesses are faster than global accesses). +Furthermore the program should avoid depending on mutating +global variables, since this makes testing much more difficult to do. +

+The "global main logic" of your program may be as simple +as +

+

+  if __name__=="__main__":
+       main_logic()
+
+at the bottom of the main module of your program. +

+Once your program is organized as a tractable collection +of functions and class behaviours you should write test +functions that exercise the behaviours. A test suite +can be associated with each module which automates +a sequence of tests. This sounds like a lot of work, but +since Python is so terse and flexible it's surprisingly easy. +You can make coding much more pleasant and fun by +writing your test functions in parallel with the "production +code", since this makes it easy to find bugs and even +design flaws earlier. +

+"Support modules" that are not intended to be the main +module of a program may include a "test script interpretation" +which invokes a self test of the module. +

+

+   if __name__ == "__main__":
+      self_test()
+
+Even programs that interact with complex external +interfaces may be tested when the external interfaces are +unavailable by using "fake" interfaces implemented in +Python. For an example of a "fake" interface, the following +class defines (part of) a "fake" file interface: +

+

+ import string
+ testdata = "just a random sequence of characters"
+
+
+ class FakeInputFile:
+   data = testdata
+   position = 0
+   closed = 0
+
+
+   def read(self, n=None):
+       self.testclosed()
+       p = self.position
+       if n is None:
+          result= self.data[p:]
+       else:
+          result= self.data[p: p+n]
+       self.position = p + len(result)
+       return result
+
+
+   def seek(self, n, m=0):
+       self.testclosed()
+       last = len(self.data)
+       p = self.position
+       if m==0: 
+          final=n
+       elif m==1:
+          final=n+p
+       elif m==2:
+          final=len(self.data)+n
+       else:
+          raise ValueError, "bad m"
+       if final<0:
+          raise IOError, "negative seek"
+       self.position = final
+
+
+   def isatty(self):
+       return 0
+
+
+   def tell(self):
+       return self.position
+
+
+   def close(self):
+       self.closed = 1
+
+
+   def testclosed(self):
+       if self.closed:
+          raise IOError, "file closed"
+
+Try f=FakeInputFile() and test out its operations. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:12:10 2002 by +Neal Norwitz +

+ +

+

4.50. My multidimensional list (array) is broken! What gives?

+You probably tried to make a multidimensional array like this. +

+

+   A = [[None] * 2] * 3
+
+This makes a list containing 3 references to the same list of length +two. Changes to one row will show in all rows, which is probably not +what you want. The following works much better: +

+

+   A = [None]*3
+   for i in range(3):
+        A[i] = [None] * 2
+
+This generates a list containing 3 different lists of length two. +

+If you feel weird, you can also do it in the following way: +

+

+   w, h = 2, 3
+   A = map(lambda i,w=w: [None] * w, range(h))
+
+For Python 2.0 the above can be spelled using a list comprehension: +

+

+   w,h = 2,3
+   A = [ [None]*w for i in range(h) ]
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:18:35 2000 by +Bjorn Pettersen +

+ +

+

4.51. I want to do a complicated sort: can you do a Schwartzian Transform in Python?

+Yes, and in Python you only have to write it once: +

+

+ def st(List, Metric):
+     def pairing(element, M = Metric):
+           return (M(element), element)
+     paired = map(pairing, List)
+     paired.sort()
+     return map(stripit, paired)
+
+
+ def stripit(pair):
+     return pair[1]
+
+This technique, attributed to Randal Schwartz, sorts the elements +of a list by a metric which maps each element to its "sort value". +For example, if L is a list of string then +

+

+   import string
+   Usorted = st(L, string.upper)
+
+
+   def intfield(s):
+         return string.atoi( string.strip(s[10:15] ) )
+
+
+   Isorted = st(L, intfield)
+
+Usorted gives the elements of L sorted as if they were upper +case, and Isorted gives the elements of L sorted by the integer +values that appear in the string slices starting at position 10 +and ending at position 15. In Python 2.0 this can be done more +naturally with list comprehensions: +

+

+  tmp1 = [ (x.upper(), x) for x in L ] # Schwartzian transform
+  tmp1.sort()
+  Usorted = [ x[1] for x in tmp1 ]
+
+
+  tmp2 = [ (int(s[10:15]), s) for s in L ] # Schwartzian transform
+  tmp2.sort()
+  Isorted = [ x[1] for x in tmp2 ]
+
+

+Note that Isorted may also be computed by +

+

+   def Icmp(s1, s2):
+         return cmp( intfield(s1), intfield(s2) )
+
+
+   Isorted = L[:]
+   Isorted.sort(Icmp)
+
+but since this method computes intfield many times for each +element of L, it is slower than the Schwartzian Transform. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Jun 1 19:18:46 2002 by +Neal Norwitz +

+ +

+

4.52. How to convert between tuples and lists?

+The function tuple(seq) converts any sequence into a tuple with +the same items in the same order. +For example, tuple([1, 2, 3]) yields (1, 2, 3) and tuple('abc') +yields ('a', 'b', 'c'). If the argument is +a tuple, it does not make a copy but returns the same object, so +it is cheap to call tuple() when you aren't sure that an object +is already a tuple. +

+The function list(seq) converts any sequence into a list with +the same items in the same order. +For example, list((1, 2, 3)) yields [1, 2, 3] and list('abc') +yields ['a', 'b', 'c']. If the argument is a list, +it makes a copy just like seq[:] would. +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 14 14:18:53 1998 by +Tim Peters +

+ +

+

4.53. Files retrieved with urllib contain leading garbage that looks like email headers.

+Extremely old versions of Python supplied libraries which +did not support HTTP/1.1; the vanilla httplib in Python 1.4 +only recognized HTTP/1.0. In Python 2.0 full HTTP/1.1 support is included. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 8 17:26:18 2001 by +Steve Holden +

+ +

+

4.54. How do I get a list of all instances of a given class?

+Python does not keep track of all instances of a class (or of a +built-in type). +

+You can program the class's constructor to keep track of all +instances, but unless you're very clever, this has the disadvantage +that the instances never get deleted,because your list of all +instances keeps a reference to them. +

+(The trick is to regularly inspect the reference counts of the +instances you've retained, and if the reference count is below a +certain level, remove it from the list. Determining that level is +tricky -- it's definitely larger than 1.) +

+ +Edit this entry / +Log info + +/ Last changed on Tue May 27 23:52:16 1997 by +GvR +

+ +

+

4.55. A regular expression fails with regex.error: match failure.

+This is usually caused by too much backtracking; the regular +expression engine has a fixed size stack which holds at most 4000 +backtrack points. Every character matched by e.g. ".*" accounts for a +backtrack point, so even a simple search like +

+

+  regex.match('.*x',"x"*5000)
+
+will fail. +

+This is fixed in the re module introduced with +Python 1.5; consult the Library Reference section on re for more information. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 30 12:35:49 1998 by +A.M. Kuchling +

+ +

+

4.56. I can't get signal handlers to work.

+The most common problem is that the signal handler is declared +with the wrong argument list. It is called as +

+

+	handler(signum, frame)
+
+so it should be declared with two arguments: +

+

+	def handler(signum, frame):
+		...
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed May 28 09:29:08 1997 by +GvR +

+ +

+

4.57. I can't use a global variable in a function? Help!

+Did you do something like this? +

+

+   x = 1 # make a global
+
+
+   def f():
+         print x # try to print the global
+         ...
+         for j in range(100):
+              if q>3:
+                 x=4
+
+Any variable assigned in a function is local to that function. +unless it is specifically declared global. Since a value is bound +to x as the last statement of the function body, the compiler +assumes that x is local. Consequently the "print x" +attempts to print an uninitialized local variable and will +trigger a NameError. +

+In such cases the solution is to insert an explicit global +declaration at the start of the function, making it +

+

+

+   def f():
+         global x
+         print x # try to print the global
+         ...
+         for j in range(100):
+              if q>3:
+                 x=4
+
+

+In this case, all references to x are interpreted as references +to the x from the module namespace. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Feb 12 15:52:12 2001 by +Steve Holden +

+ +

+

4.58. What's a negative index? Why doesn't list.insert() use them?

+Python sequences are indexed with positive numbers and +negative numbers. For positive numbers 0 is the first index +1 is the second index and so forth. For negative indices -1 +is the last index and -2 is the pentultimate (next to last) index +and so forth. Think of seq[-n] as the same as seq[len(seq)-n]. +

+Using negative indices can be very convenient. For example +if the string Line ends in a newline then Line[:-1] is all of Line except +the newline. +

+Sadly the list builtin method L.insert does not observe negative +indices. This feature could be considered a mistake but since +existing programs depend on this feature it may stay around +forever. L.insert for negative indices inserts at the start of the +list. To get "proper" negative index behaviour use L[n:n] = [x] +in place of the insert method. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 13 07:03:18 1997 by +aaron watters +

+ +

+

4.59. How can I sort one list by values from another list?

+You can sort lists of tuples. +

+

+  >>> list1 = ["what", "I'm", "sorting", "by"]
+  >>> list2 = ["something", "else", "to", "sort"]
+  >>> pairs = map(None, list1, list2)
+  >>> pairs
+  [('what', 'something'), ("I'm", 'else'), ('sorting', 'to'), ('by', 'sort')]
+  >>> pairs.sort()
+  >>> pairs
+  [("I'm", 'else'), ('by', 'sort'), ('sorting', 'to'), ('what', 'something')]
+  >>> result = pairs[:]
+  >>> for i in xrange(len(result)): result[i] = result[i][1]
+  ...
+  >>> result
+  ['else', 'sort', 'to', 'something']
+
+And if you didn't understand the question, please see the +example above ;c). Note that "I'm" sorts before "by" because +uppercase "I" comes before lowercase "b" in the ascii order. +Also see 4.51. +

+In Python 2.0 this can be done like: +

+

+ >>> list1 = ["what", "I'm", "sorting", "by"]
+ >>> list2 = ["something", "else", "to", "sort"]
+ >>> pairs = zip(list1, list2)
+ >>> pairs
+ [('what', 'something'), ("I'm", 'else'), ('sorting', 'to'), ('by', 'sort')]
+ >>> pairs.sort()
+ >>> result = [ x[1] for x in pairs ]
+ >>> result
+ ['else', 'sort', 'to', 'something']
+
+[Followup] +

+Someone asked, why not this for the last steps: +

+

+  result = []
+  for p in pairs: result.append(p[1])
+
+This is much more legible. However, a quick test shows that +it is almost twice as slow for long lists. Why? First of all, +the append() operation has to reallocate memory, and while it +uses some tricks to avoid doing that each time, it still has +to do it occasionally, and apparently that costs quite a bit. +Second, the expression "result.append" requires an extra +attribute lookup. The attribute lookup could be done away +with by rewriting as follows: +

+

+  result = []
+  append = result.append
+  for p in pairs: append(p[1])
+
+which gains back some speed, but is still considerably slower +than the original solution, and hardly less convoluted. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:56:35 2000 by +Bjorn Pettersen +

+ +

+

4.60. Why doesn't dir() work on builtin types like files and lists?

+It does starting with Python 1.5. +

+Using 1.4, you can find out which methods a given object supports +by looking at its __methods__ attribute: +

+

+    >>> List = []
+    >>> List.__methods__
+    ['append', 'count', 'index', 'insert', 'remove', 'reverse', 'sort']
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Sep 16 14:56:42 1999 by +Skip Montanaro +

+ +

+

4.61. How can I mimic CGI form submission (METHOD=POST)?

+I would like to retrieve web pages that are the result of POSTing a +form. Is there existing code that would let me do this easily? +

+Yes. Here's a simple example that uses httplib. +

+

+    #!/usr/local/bin/python
+
+
+    import httplib, sys, time
+
+
+    ### build the query string
+    qs = "First=Josephine&MI=Q&Last=Public"
+
+
+    ### connect and send the server a path
+    httpobj = httplib.HTTP('www.some-server.out-there', 80)
+    httpobj.putrequest('POST', '/cgi-bin/some-cgi-script')
+    ### now generate the rest of the HTTP headers...
+    httpobj.putheader('Accept', '*/*')
+    httpobj.putheader('Connection', 'Keep-Alive')
+    httpobj.putheader('Content-type', 'application/x-www-form-urlencoded')
+    httpobj.putheader('Content-length', '%d' % len(qs))
+    httpobj.endheaders()
+    httpobj.send(qs)
+    ### find out what the server said in response...
+    reply, msg, hdrs = httpobj.getreply()
+    if reply != 200:
+	sys.stdout.write(httpobj.getfile().read())
+
+Note that in general for "url encoded posts" (the default) query strings must be "quoted" to, for example, change equals signs and spaces to an encoded form when they occur in name or value. Use urllib.quote to perform this quoting. For example to send name="Guy Steele, Jr.": +

+

+   >>> from urllib import quote
+   >>> x = quote("Guy Steele, Jr.")
+   >>> x
+   'Guy%20Steele,%20Jr.'
+   >>> query_string = "name="+x
+   >>> query_string
+   'name=Guy%20Steele,%20Jr.'
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 21 03:47:07 1999 by +TAB +

+ +

+

4.62. If my program crashes with a bsddb (or anydbm) database open, it gets corrupted. How come?

+Databases opened for write access with the bsddb module (and often by +the anydbm module, since it will preferentially use bsddb) must +explicitly be closed using the close method of the database. The +underlying libdb package caches database contents which need to be +converted to on-disk form and written, unlike regular open files which +already have the on-disk bits in the kernel's write buffer, where they +can just be dumped by the kernel with the program exits. +

+If you have initialized a new bsddb database but not written anything to +it before the program crashes, you will often wind up with a zero-length +file and encounter an exception the next time the file is opened. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:15:01 2002 by +Neal Norwitz +

+ +

+

4.63. How do I make a Python script executable on Unix?

+You need to do two things: the script file's mode must be executable +(include the 'x' bit), and the first line must begin with #! +followed by the pathname for the Python interpreter. +

+The first is done by executing 'chmod +x scriptfile' or perhaps +'chmod 755 scriptfile'. +

+The second can be done in a number of way. The most straightforward +way is to write +

+

+  #!/usr/local/bin/python
+
+as the very first line of your file - or whatever the pathname is +where the python interpreter is installed on your platform. +

+If you would like the script to be independent of where the python +interpreter lives, you can use the "env" program. On almost all +platforms, the following will work, assuming the python interpreter +is in a directory on the user's $PATH: +

+

+  #! /usr/bin/env python
+
+Note -- *don't* do this for CGI scripts. The $PATH variable for +CGI scripts is often very minimal, so you need to use the actual +absolute pathname of the interpreter. +

+Occasionally, a user's environment is so full that the /usr/bin/env +program fails; or there's no env program at all. +In that case, you can try the following hack (due to Alex Rezinsky): +

+

+  #! /bin/sh
+  """:"
+  exec python $0 ${1+"$@"}
+  """
+
+The disadvantage is that this defines the script's __doc__ string. +However, you can fix that by adding +

+

+  __doc__ = """...Whatever..."""
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 15 09:19:16 2001 by +Neal Norwitz +

+ +

+

4.64. How do you remove duplicates from a list?

+See the Python Cookbook for a long discussion of many cool ways: +

+

+    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52560
+
+Generally, if you don't mind reordering the List +

+

+   if List:
+      List.sort()
+      last = List[-1]
+      for i in range(len(List)-2, -1, -1):
+          if last==List[i]: del List[i]
+          else: last=List[i]
+
+If all elements of the list may be used as +dictionary keys (ie, they are all hashable) +this is often faster +

+

+   d = {}
+   for x in List: d[x]=x
+   List = d.values()
+
+Also, for extremely large lists you might +consider more optimal alternatives to the first one. +The second one is pretty good whenever it can +be used. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 24 21:56:33 2002 by +Tim Peters +

+ +

+

4.65. Are there any known year 2000 problems in Python?

+I am not aware of year 2000 deficiencies in Python 1.5. Python does +very few date calculations and for what it does, it relies on the C +library functions. Python generally represent times either as seconds +since 1970 or as a tuple (year, month, day, ...) where the year is +expressed with four digits, which makes Y2K bugs unlikely. So as long +as your C library is okay, Python should be okay. Of course, I cannot +vouch for your Python code! +

+Given the nature of freely available software, I have to add that this statement is not +legally binding. The Python copyright notice contains the following +disclaimer: +

+

+  STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
+  REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
+  CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+  DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+  PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+
+The good news is that if you encounter a problem, you have full +source available to track it down and fix it! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 10 14:59:31 1998 by +GvR +

+ +

+

4.66. I want a version of map that applies a method to a sequence of objects! Help!

+Get fancy! +

+

+  def method_map(objects, method, arguments):
+       """method_map([a,b], "flog", (1,2)) gives [a.flog(1,2), b.flog(1,2)]"""
+       nobjects = len(objects)
+       methods = map(getattr, objects, [method]*nobjects)
+       return map(apply, methods, [arguments]*nobjects)
+
+It's generally a good idea to get to know the mysteries of map and apply +and getattr and the other dynamic features of Python. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 5 14:21:14 1998 by +Aaron Watters +

+ +

+

4.67. How do I generate random numbers in Python?

+The standard library module "random" implements a random number +generator. Usage is simple: +

+

+    import random
+
+
+    random.random()
+
+This returns a random floating point number in the range [0, 1). +

+There are also many other specialized generators in this module, such +as +

+

+    randrange(a, b) chooses an integer in the range [a, b)
+    uniform(a, b) chooses a floating point number in the range [a, b)
+    normalvariate(mean, sdev) sample from normal (Gaussian) distribution
+
+Some higher-level functions operate on sequences directly, such as +

+

+    choice(S) chooses random element from a given sequence
+    shuffle(L) shuffles a list in-place, i.e. permutes it randomly
+
+There's also a class, Random, which you can instantiate +to create independent multiple random number generators. +

+All this is documented in the library reference manual. Note that +the module "whrandom" is obsolete. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:16:51 2002 by +Neal Norwitz +

+ +

+

4.68. How do I access the serial (RS232) port?

+There's a Windows serial communication module (for communication +over RS 232 serial ports) at +

+

+  ftp://ftp.python.org/pub/python/contrib/sio-151.zip
+  http://www.python.org/ftp/python/contrib/sio-151.zip
+
+For DOS, try Hans Nowak's Python-DX, which supports this, at: +

+

+  http://www.cuci.nl/~hnowak/
+
+For Unix, see a usenet post by Mitch Chapman: +

+

+  http://groups.google.com/groups?selm=34A04430.CF9@ohioee.com
+
+For Win32, POSIX(Linux, BSD, *), Jython, Chris': +

+

+  http://pyserial.sourceforge.net
+
+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jul 2 21:11:07 2002 by +Chris Liechti +

+ +

+

4.69. Images on Tk-Buttons don't work in Py15?

+They do work, but you must keep your own reference to the image +object now. More verbosely, you must make sure that, say, a global +variable or a class attribute refers to the object. +

+Quoting Fredrik Lundh from the mailinglist: +

+

+  Well, the Tk button widget keeps a reference to the internal
+  photoimage object, but Tkinter does not.  So when the last
+  Python reference goes away, Tkinter tells Tk to release the
+  photoimage.  But since the image is in use by a widget, Tk
+  doesn't destroy it.  Not completely.  It just blanks the image,
+  making it completely transparent...
+
+
+  And yes, there was a bug in the keyword argument handling
+  in 1.4 that kept an extra reference around in some cases.  And
+  when Guido fixed that bug in 1.5, he broke quite a few Tkinter
+  programs...
+
+

+ +Edit this entry / +Log info + +/ Last changed on Tue Feb 3 11:31:03 1998 by +Case Roole +

+ +

+

4.70. Where is the math.py (socket.py, regex.py, etc.) source file?

+If you can't find a source file for a module it may be a builtin +or dynamically loaded module implemented in C, C++ or other +compiled language. In this case you may not have the source +file or it may be something like mathmodule.c, somewhere in +a C source directory (not on the Python Path). +

+Fredrik Lundh (fredrik@pythonware.com) explains (on the python-list): +

+There are (at least) three kinds of modules in Python: +1) modules written in Python (.py); +2) modules written in C and dynamically loaded (.dll, .pyd, .so, .sl, etc); +3) modules written in C and linked with the interpreter; to get a list +of these, type: +

+

+    import sys
+    print sys.builtin_module_names
+
+

+ +Edit this entry / +Log info + +/ Last changed on Tue Feb 3 13:55:33 1998 by +Aaron Watters +

+ +

+

4.71. How do I send mail from a Python script?

+The standard library module smtplib does this. +Here's a very simple interactive mail +sender that uses it. This method will work on any host that +supports an SMTP listener. +

+

+    import sys, smtplib
+
+
+    fromaddr = raw_input("From: ")
+    toaddrs  = raw_input("To: ").split(',')
+    print "Enter message, end with ^D:"
+    msg = ''
+    while 1:
+        line = sys.stdin.readline()
+        if not line:
+            break
+        msg = msg + line
+
+
+    # The actual mail send
+    server = smtplib.SMTP('localhost')
+    server.sendmail(fromaddr, toaddrs, msg)
+    server.quit()
+
+If the local host doesn't have an SMTP listener, you need to find one. The simple method is to ask the user. Alternately, you can use the DNS system to find the mail gateway(s) responsible for the source address. +

+A Unix-only alternative uses sendmail. The location of the +sendmail program varies between systems; sometimes it is +/usr/lib/sendmail, sometime /usr/sbin/sendmail. The sendmail manual +page will help you out. Here's some sample code: +

+

+  SENDMAIL = "/usr/sbin/sendmail" # sendmail location
+  import os
+  p = os.popen("%s -t -i" % SENDMAIL, "w")
+  p.write("To: cary@ratatosk.org\n")
+  p.write("Subject: test\n")
+  p.write("\n") # blank line separating headers from body
+  p.write("Some text\n")
+  p.write("some more text\n")
+  sts = p.close()
+  if sts != 0:
+      print "Sendmail exit status", sts
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 07:05:12 2002 by +Matthias Urlichs +

+ +

+

4.72. How do I avoid blocking in connect() of a socket?

+The select module is widely known to help with asynchronous +I/O on sockets once they are connected. However, it is less +than common knowledge how to avoid blocking on the initial +connect() call. Jeremy Hylton has the following advice (slightly +edited): +

+To prevent the TCP connect from blocking, you can set the socket to +non-blocking mode. Then when you do the connect(), you will either +connect immediately (unlikely) or get an exception that contains the +errno. errno.EINPROGRESS indicates that the connection is in +progress, but hasn't finished yet. Different OSes will return +different errnos, so you're going to have to check. I can tell you +that different versions of Solaris return different errno values. +

+In Python 1.5 and later, you can use connect_ex() to avoid +creating an exception. It will just return the errno value. +

+To poll, you can call connect_ex() again later -- 0 or errno.EISCONN +indicate that you're connected -- or you can pass this socket to +select (checking to see if it is writeable). +

+ +Edit this entry / +Log info + +/ Last changed on Tue Feb 24 21:30:45 1998 by +GvR +

+ +

+

4.73. How do I specify hexadecimal and octal integers?

+To specify an octal digit, precede the octal value with a zero. For example, +to set the variable "a" to the octal value "10" (8 in decimal), type: +

+

+    >>> a = 010
+
+To verify that this works, you can type "a" and hit enter while in the +interpreter, which will cause Python to spit out the current value of "a" +in decimal: +

+

+    >>> a
+    8
+
+Hexadecimal is just as easy. Simply precede the hexadecimal number with a +zero, and then a lower or uppercase "x". Hexadecimal digits can be specified +in lower or uppercase. For example, in the Python interpreter: +

+

+    >>> a = 0xa5
+    >>> a
+    165
+    >>> b = 0XB2
+    >>> b
+    178
+
+

+ +Edit this entry / +Log info + +/ Last changed on Tue Mar 3 12:53:16 1998 by +GvR +

+ +

+

4.74. How to get a single keypress at a time?

+For Windows, see question 8.2. Here is an answer for Unix (see also 4.94). +

+There are several solutions; some involve using curses, which is a +pretty big thing to learn. Here's a solution without curses, due +to Andrew Kuchling (adapted from code to do a PGP-style +randomness pool): +

+

+        import termios, sys, os
+        fd = sys.stdin.fileno()
+        old = termios.tcgetattr(fd)
+        new = termios.tcgetattr(fd)
+        new[3] = new[3] & ~termios.ICANON & ~termios.ECHO
+        new[6][termios.VMIN] = 1
+        new[6][termios.VTIME] = 0
+        termios.tcsetattr(fd, termios.TCSANOW, new)
+        s = ''    # We'll save the characters typed and add them to the pool.
+        try:
+            while 1:
+                c = os.read(fd, 1)
+                print "Got character", `c`
+                s = s+c
+        finally:
+            termios.tcsetattr(fd, termios.TCSAFLUSH, old)
+
+You need the termios module for any of this to work, and I've only +tried it on Linux, though it should work elsewhere. It turns off +stdin's echoing and disables canonical mode, and then reads a +character at a time from stdin, noting the time after each keystroke. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Oct 24 00:36:56 2002 by +chris +

+ +

+

4.75. How can I overload constructors (or methods) in Python?

+(This actually applies to all methods, but somehow the question +usually comes up first in the context of constructors.) +

+Where in C++ you'd write +

+

+    class C {
+        C() { cout << "No arguments\n"; }
+        C(int i) { cout << "Argument is " << i << "\n"; }
+    }
+
+in Python you have to write a single constructor that catches all +cases using default arguments. For example: +

+

+    class C:
+        def __init__(self, i=None):
+            if i is None:
+                print "No arguments"
+            else:
+                print "Argument is", i
+
+This is not entirely equivalent, but close enough in practice. +

+You could also try a variable-length argument list, e.g. +

+

+        def __init__(self, *args):
+            ....
+
+The same approach works for all method definitions. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 20 11:55:55 1998 by +GvR +

+ +

+

4.76. How do I pass keyword arguments from one method to another?

+Use apply. For example: +

+

+    class Account:
+        def __init__(self, **kw):
+            self.accountType = kw.get('accountType')
+            self.balance = kw.get('balance')
+
+
+    class CheckingAccount(Account):
+        def __init__(self, **kw):
+            kw['accountType'] = 'checking'
+            apply(Account.__init__, (self,), kw)
+
+
+    myAccount = CheckingAccount(balance=100.00)
+
+In Python 2.0 you can call it directly using the new ** syntax: +

+

+    class CheckingAccount(Account):
+        def __init__(self, **kw):
+            kw['accountType'] = 'checking'
+            Account.__init__(self, **kw)
+
+or more generally: +

+

+ >>> def f(x, *y, **z):
+ ...  print x,y,z
+ ...
+ >>> Y = [1,2,3]
+ >>> Z = {'foo':3,'bar':None}
+ >>> f('hello', *Y, **Z)
+ hello (1, 2, 3) {'foo': 3, 'bar': None}
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 13:04:01 2000 by +Bjorn Pettersen +

+ +

+

4.77. What module should I use to help with generating HTML?

+Check out HTMLgen written by Robin Friedrich. It's a class library +of objects corresponding to all the HTML 3.2 markup tags. It's used +when you are writing in Python and wish to synthesize HTML pages for +generating a web or for CGI forms, etc. +

+It can be found in the FTP contrib area on python.org or on the +Starship. Use the search engines there to locate the latest version. +

+It might also be useful to consider DocumentTemplate, which offers clear +separation between Python code and HTML code. DocumentTemplate is part +of the Bobo objects publishing system (http:/www.digicool.com/releases) +but can be used independantly of course! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 28 09:54:58 1998 by +GvR +

+ +

+

4.78. How do I create documentation from doc strings?

+Use gendoc, by Daniel Larson. See +

+http://starship.python.net/crew/danilo/ +

+It can create HTML from the doc strings in your Python source code. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Oct 7 17:15:51 2002 by +Phil Rittenhouse +

+ +

+

4.79. How do I read (or write) binary data?

+For complex data formats, it's best to use +use the struct module. It's documented in the library reference. +It allows you to take a string read from a file containing binary +data (usually numbers) and convert it to Python objects; and vice +versa. +

+For example, the following code reads two 2-byte integers +and one 4-byte integer in big-endian format from a file: +

+

+  import struct
+
+
+  f = open(filename, "rb")  # Open in binary mode for portability
+  s = f.read(8)
+  x, y, z = struct.unpack(">hhl", s)
+
+The '>' in the format string forces bin-endian data; the letter +'h' reads one "short integer" (2 bytes), and 'l' reads one +"long integer" (4 bytes) from the string. +

+For data that is more regular (e.g. a homogeneous list of ints or +floats), you can also use the array module, also documented +in the library reference. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Oct 7 09:16:45 1998 by +GvR +

+ +

+

4.80. I can't get key bindings to work in Tkinter

+An oft-heard complaint is that event handlers bound to events +with the bind() method don't get handled even when the appropriate +key is pressed. +

+The most common cause is that the widget to which the binding applies +doesn't have "keyboard focus". Check out the Tk documentation +for the focus command. Usually a widget is given the keyboard +focus by clicking in it (but not for labels; see the taketocus +option). +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 12 09:37:33 1998 by +GvR +

+ +

+

4.81. "import crypt" fails

+[Unix] +

+Starting with Python 1.5, the crypt module is disabled by default. +In order to enable it, you must go into the Python source tree and +edit the file Modules/Setup to enable it (remove a '#' sign in +front of the line starting with '#crypt'). Then rebuild. +You may also have to add the string '-lcrypt' to that same line. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 5 08:57:09 1998 by +GvR +

+ +

+

4.82. Are there coding standards or a style guide for Python programs?

+Yes, Guido has written the "Python Style Guide". See +http://www.python.org/doc/essays/styleguide.html +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 29 09:50:27 1998 by +Joseph VanAndel +

+ +

+

4.83. How do I freeze Tkinter applications?

+Freeze is a tool to create stand-alone applications (see 4.28). +

+When freezing Tkinter applications, the applications will not be +truly stand-alone, as the application will still need the tcl and +tk libraries. +

+One solution is to ship the application with the tcl and tk libraries, +and point to them at run-time using the TCL_LIBRARY and TK_LIBRARY +environment variables. +

+To get truly stand-alone applications, the Tcl scripts that form +the library have to be integrated into the application as well. One +tool supporting that is SAM (stand-alone modules), which is part +of the Tix distribution (http://tix.mne.com). Build Tix with SAM +enabled, perform the appropriate call to Tclsam_init etc inside +Python's Modules/tkappinit.c, and link with libtclsam +and libtksam (you might include the Tix libraries as well). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jan 20 17:35:01 1999 by +Martin v. Löwis +

+ +

+

4.84. How do I create static class data and static class methods?

+[Tim Peters, tim_one@email.msn.com] +

+Static data (in the sense of C++ or Java) is easy; static methods (again in the sense of C++ or Java) are not supported directly. +

+STATIC DATA +

+For example, +

+

+    class C:
+        count = 0   # number of times C.__init__ called
+
+
+        def __init__(self):
+            C.count = C.count + 1
+
+
+        def getcount(self):
+            return C.count  # or return self.count
+
+c.count also refers to C.count for any c such that isinstance(c, C) holds, unless overridden by c itself or by some class on the base-class search path from c.__class__ back to C. +

+Caution: within a method of C, +

+

+    self.count = 42
+
+creates a new and unrelated instance vrbl named "count" in self's own dict. So rebinding of a class-static data name needs the +

+

+    C.count = 314
+
+form whether inside a method or not. +

+

+STATIC METHODS +

+Static methods (as opposed to static data) are unnatural in Python, because +

+

+    C.getcount
+
+returns an unbound method object, which can't be invoked without supplying an instance of C as the first argument. +

+The intended way to get the effect of a static method is via a module-level function: +

+

+    def getcount():
+        return C.count
+
+If your code is structured so as to define one class (or tightly related class hierarchy) per module, this supplies the desired encapsulation. +

+Several tortured schemes for faking static methods can be found by searching DejaNews. Most people feel such cures are worse than the disease. Perhaps the least obnoxious is due to Pekka Pessi (mailto:ppessi@hut.fi): +

+

+    # helper class to disguise function objects
+    class _static:
+        def __init__(self, f):
+            self.__call__ = f
+
+
+    class C:
+        count = 0
+
+
+        def __init__(self):
+            C.count = C.count + 1
+
+
+        def getcount():
+            return C.count
+        getcount = _static(getcount)
+
+
+        def sum(x, y):
+            return x + y
+        sum = _static(sum)
+
+
+    C(); C()
+    c = C()
+    print C.getcount()  # prints 3
+    print c.getcount()  # prints 3
+    print C.sum(27, 15) # prints 42
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Jan 21 21:35:38 1999 by +Tim Peters +

+ +

+

4.85. __import__('x.y.z') returns <module 'x'>; how do I get z?

+Try +

+

+   __import__('x.y.z').y.z
+
+For more realistic situations, you may have to do something like +

+

+   m = __import__(s)
+   for i in string.split(s, ".")[1:]:
+       m = getattr(m, i)
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Jan 28 11:01:43 1999 by +GvR +

+ +

+

4.86. Basic thread wisdom

+Please note that there is no way to take advantage of +multiprocessor hardware using the Python thread model. The interpreter +uses a global interpreter lock (GIL), +which does not allow multiple threads to be concurrently active. +

+If you write a simple test program like this: +

+

+  import thread
+  def run(name, n):
+      for i in range(n): print name, i
+  for i in range(10):
+      thread.start_new(run, (i, 100))
+
+none of the threads seem to run! The reason is that as soon as +the main thread exits, all threads are killed. +

+A simple fix is to add a sleep to the end of the program, +sufficiently long for all threads to finish: +

+

+  import thread, time
+  def run(name, n):
+      for i in range(n): print name, i
+  for i in range(10):
+      thread.start_new(run, (i, 100))
+  time.sleep(10) # <----------------------------!
+
+But now (on many platforms) the threads don't run in parallel, +but appear to run sequentially, one at a time! The reason is +that the OS thread scheduler doesn't start a new thread until +the previous thread is blocked. +

+A simple fix is to add a tiny sleep to the start of the run +function: +

+

+  import thread, time
+  def run(name, n):
+      time.sleep(0.001) # <---------------------!
+      for i in range(n): print name, i
+  for i in range(10):
+      thread.start_new(run, (i, 100))
+  time.sleep(10)
+
+Some more hints: +

+Instead of using a time.sleep() call at the end, it's +better to use some kind of semaphore mechanism. One idea is to +use a the Queue module to create a queue object, let each thread +append a token to the queue when it finishes, and let the main +thread read as many tokens from the queue as there are threads. +

+Use the threading module instead of the thread module. It's part +of Python since version 1.5.1. It takes care of all these details, +and has many other nice features too! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Feb 7 16:21:55 2003 by +GvR +

+ +

+

4.87. Why doesn't closing sys.stdout (stdin, stderr) really close it?

+Python file objects are a high-level layer of abstraction on top of C streams, which in turn are a medium-level layer of abstraction on top of (among other things) low-level C file descriptors. +

+For most file objects f you create in Python via the builtin "open" function, f.close() marks the Python file object as being closed from Python's point of view, and also arranges to close the underlying C stream. This happens automatically too, in f's destructor, when f becomes garbage. +

+But stdin, stdout and stderr are treated specially by Python, because of the special status also given to them by C: doing +

+

+    sys.stdout.close() # ditto for stdin and stderr
+
+marks the Python-level file object as being closed, but does not close the associated C stream (provided sys.stdout is still bound to its default value, which is the stream C also calls "stdout"). +

+To close the underlying C stream for one of these three, you should first be sure that's what you really want to do (e.g., you may confuse the heck out of extension modules trying to do I/O). If it is, use os.close: +

+

+    os.close(0)   # close C's stdin stream
+    os.close(1)   # close C's stdout stream
+    os.close(2)   # close C's stderr stream
+
+

+ +Edit this entry / +Log info + +/ Last changed on Sat Apr 17 02:22:35 1999 by +Tim Peters +

+ +

+

4.88. What kinds of global value mutation are thread-safe?

+[adapted from c.l.py responses by Gordon McMillan & GvR] +

+A global interpreter lock (GIL) is used internally to ensure that only one thread runs in the Python VM at a time. In general, Python offers to switch among threads only between bytecode instructions (how frequently it offers to switch can be set via sys.setcheckinterval). Each bytecode instruction-- and all the C implementation code reached from it --is therefore atomic. +

+In theory, this means an exact accounting requires an exact understanding of the PVM bytecode implementation. In practice, it means that operations on shared vrbls of builtin data types (ints, lists, dicts, etc) that "look atomic" really are. +

+For example, these are atomic (L, L1, L2 are lists, D, D1, D2 are dicts, x, y +are objects, i, j are ints): +

+

+    L.append(x)
+    L1.extend(L2)
+    x = L[i]
+    x = L.pop()
+    L1[i:j] = L2
+    L.sort()
+    x = y
+    x.field = y
+    D[x] = y
+    D1.update(D2)
+    D.keys()
+
+These aren't: +

+

+    i = i+1
+    L.append(L[-1])
+    L[i] = L[j]
+    D[x] = D[x] + 1
+
+Note: operations that replace other objects may invoke those other objects' __del__ method when their reference count reaches zero, and that can affect things. This is especially true for the mass updates to dictionaries and lists. When in doubt, use a mutex! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Feb 7 16:21:03 2003 by +GvR +

+ +

+

4.89. How do I modify a string in place?

+Strings are immutable (see question 6.2) so you cannot modify a string +directly. If you need an object with this ability, try converting the +string to a list or take a look at the array module. +

+

+    >>> s = "Hello, world"
+    >>> a = list(s)
+    >>> print a
+    ['H', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd']
+    >>> a[7:] = list("there!")
+    >>> import string
+    >>> print string.join(a, '')
+    'Hello, there!'
+
+
+    >>> import array
+    >>> a = array.array('c', s)
+    >>> print a
+    array('c', 'Hello, world')
+    >>> a[0] = 'y' ; print a
+    array('c', 'yello world')
+    >>> a.tostring()
+    'yello, world'
+
+

+ +Edit this entry / +Log info + +/ Last changed on Tue May 18 01:22:47 1999 by +Andrew Dalke +

+ +

+

4.90. How to pass on keyword/optional parameters/arguments

+Q: How can I pass on optional or keyword parameters from one function to another? +

+

+	def f1(a, *b, **c):
+		...
+
+A: In Python 2.0 and above: +

+

+	def f2(x, *y, **z):
+		...
+		z['width']='14.3c'
+		...
+		f1(x, *y, **z)
+
+
+   Note: y can be any sequence (e.g., list or tuple) and z must be a dict.
+
+

+A: For versions prior to 2.0, use 'apply', like: +

+

+	def f2(x, *y, **z):
+		...
+		z['width']='14.3c'
+		...
+		apply(f1, (x,)+y, z)
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 07:20:56 2002 by +Matthias Urlichs +

+ +

+

4.91. How can I get a dictionary to display its keys in a consistent order?

+In general, dictionaries store their keys in an unpredictable order, +so the display order of a dictionary's elements will be similarly +unpredictable. +(See +Question 6.12 +to understand why this is so.) +

+This can be frustrating if you want to save a printable version to a +file, make some changes and then compare it with some other printed +dictionary. If you have such needs you can subclass UserDict.UserDict +to create a SortedDict class that prints itself in a predictable order. +Here's one simpleminded implementation of such a class: +

+

+  import UserDict, string
+
+
+  class SortedDict(UserDict.UserDict):
+    def __repr__(self):
+      result = []
+      append = result.append
+      keys = self.data.keys()
+      keys.sort()
+      for k in keys:
+        append("%s: %s" % (`k`, `self.data[k]`))
+      return "{%s}" % string.join(result, ", ")
+
+
+    ___str__ = __repr__
+
+

+This will work for many common situations you might encounter, though +it's far from a perfect solution. (It won't have any effect on the +pprint module and does not transparently handle values that are or +contain dictionaries. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Sep 16 17:31:06 1999 by +Skip Montanaro +

+ +

+

4.92. Is there a Python tutorial?

+Yes. See question 1.20 at +http://www.python.org/doc/FAQ.html#1.20 +

+ +Edit this entry / +Log info + +/ Last changed on Sat Dec 4 16:04:00 1999 by +TAB +

+ +

+

4.93. Deleted

+See 4.28 +

+ +Edit this entry / +Log info + +/ Last changed on Tue May 28 20:40:37 2002 by +GvR +

+ +

+

4.94. How do I get a single keypress without blocking?

+There are several solutions; some involve using curses, which is a +pretty big thing to learn. Here's a solution without curses. (see also 4.74, for Windows, see question 8.2) +

+

+  import termios, fcntl, sys, os
+  fd = sys.stdin.fileno()
+
+
+  oldterm = termios.tcgetattr(fd)
+  newattr = termios.tcgetattr(fd)
+  newattr[3] = newattr[3] & ~termios.ICANON & ~termios.ECHO
+  termios.tcsetattr(fd, termios.TCSANOW, newattr)
+
+
+  oldflags = fcntl.fcntl(fd, fcntl.F_GETFL)
+  fcntl.fcntl(fd, fcntl.F_SETFL, oldflags | os.O_NONBLOCK)
+
+
+  try:
+      while 1:
+          try:
+              c = sys.stdin.read(1)
+              print "Got character", `c`
+          except IOError: pass
+  finally:
+      termios.tcsetattr(fd, termios.TCSAFLUSH, oldterm)
+      fcntl.fcntl(fd, fcntl.F_SETFL, oldflags)
+
+

+You need the termios and the fcntl module for any of this to work, +and I've only tried it on Linux, though it should work elsewhere. +

+In this code, characters are read and printed one at a time. +

+termios.tcsetattr() turns off stdin's echoing and disables canonical +mode. fcntl.fnctl() is used to obtain stdin's file descriptor flags +and modify them for non-blocking mode. Since reading stdin when it is +empty results in an IOError, this error is caught and ignored. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Oct 24 00:39:06 2002 by +chris +

+ +

+

4.95. Is there an equivalent to Perl chomp()? (Remove trailing newline from string)

+There are two partial substitutes. If you want to remove all trailing +whitespace, use the method string.rstrip(). Otherwise, if there is only +one line in the string, use string.splitlines()[0]. +

+

+ -----------------------------------------------------------------------
+
+
+ rstrip() is too greedy, it strips all trailing white spaces.
+ splitlines() takes ControlM as line boundary.
+ Consider these strings as input:
+   "python python    \r\n"
+   "python\rpython\r\n"
+   "python python   \r\r\r\n"
+ The results from rstrip()/splitlines() are perhaps not what we want.
+
+
+ It seems re can perform this task.
+
+

+

+ #!/usr/bin/python 
+ # requires python2                                                             
+
+
+ import re, os, StringIO
+
+
+ lines=StringIO.StringIO(
+   "The Python Programming Language\r\n"
+   "The Python Programming Language \r \r \r\r\n"
+   "The\rProgramming\rLanguage\r\n"
+   "The\rProgramming\rLanguage\r\r\r\r\n"
+   "The\r\rProgramming\r\rLanguage\r\r\r\r\n"
+ )
+
+
+ ln=re.compile("(?:[\r]?\n|\r)$") # dos:\r\n, unix:\n, mac:\r, others: unknown
+ # os.linesep does not work if someone ftps(in binary mode) a dos/mac text file
+ # to your unix box
+ #ln=re.compile(os.linesep + "$")
+
+
+ while 1:
+   s=lines.readline()
+   if not s: break
+   print "1.(%s)" % `s.rstrip()`
+   print "2.(%s)" % `ln.sub( "", s, 1)`
+   print "3.(%s)" % `s.splitlines()[0]`
+   print "4.(%s)" % `s.splitlines()`
+   print
+
+
+ lines.close()
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 8 09:51:34 2001 by +Crystal +

+ +

+

4.96. Why is join() a string method when I'm really joining the elements of a (list, tuple, sequence)?

+Strings became much more like other standard types starting in release 1.6, when methods were added which give the same functionality that has always been available using the functions of the string module. These new methods have been widely accepted, but the one which appears to make (some) programmers feel uncomfortable is: +

+

+    ", ".join(['1', '2', '4', '8', '16'])
+
+which gives the result +

+

+    "1, 2, 4, 8, 16"
+
+There are two usual arguments against this usage. +

+The first runs along the lines of: "It looks really ugly using a method of a string literal (string constant)", to which the answer is that it might, but a string literal is just a fixed value. If the methods are to be allowed on names bound to strings there is no logical reason to make them unavailable on literals. Get over it! +

+The second objection is typically cast as: "I am really telling a sequence to join its members together with a string constant". Sadly, you aren't. For some reason there seems to be much less difficulty with having split() as a string method, since in that case it is easy to see that +

+

+    "1, 2, 4, 8, 16".split(", ")
+
+is an instruction to a string literal to return the substrings delimited by the given separator (or, by default, arbitrary runs of white space). In this case a Unicode string returns a list of Unicode strings, an ASCII string returns a list of ASCII strings, and everyone is happy. +

+join() is a string method because in using it you are telling the separator string to iterate over an arbitrary sequence, forming string representations of each of the elements, and inserting itself between the elements' representations. This method can be used with any argument which obeys the rules for sequence objects, inluding any new classes you might define yourself. +

+Because this is a string method it can work for Unicode strings as well as plain ASCII strings. If join() were a method of the sequence types then the sequence types would have to decide which type of string to return depending on the type of the separator. +

+If none of these arguments persuade you, then for the moment you can continue to use the join() function from the string module, which allows you to write +

+

+    string.join(['1', '2', '4', '8', '16'], ", ")
+
+You will just have to try and forget that the string module actually uses the syntax you are compaining about to implement the syntax you prefer! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 2 15:51:58 2002 by +Steve Holden +

+ +

+

4.97. How can my code discover the name of an object?

+Generally speaking, it can't, because objects don't really have names. The assignment statement does not store the assigned value in the name but a reference to it. Essentially, assignment creates a binding of a name to a value. The same is true of def and class statements, but in that case the value is a callable. Consider the following code: +

+

+    class A:
+        pass
+
+
+    B = A
+
+
+    a = B()
+    b = a
+    print b
+    <__main__.A instance at 016D07CC>
+    print a
+    <__main__.A instance at 016D07CC>
+
+

+Arguably the class has a name: even though it is bound to two names and invoked through the name B the created instance is still reported as an instance of class A. However, it is impossible to say whether the instance's name is a or b, since both names are bound to the same value. +

+Generally speaking it should not be necessary for your code to "know the names" of particular values. Unless you are deliberately writing introspective programs, this is usually an indication that a change of approach might be beneficial. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 8 03:53:39 2001 by +Steve Holden +

+ +

+

4.98. Why are floating point calculations so inaccurate?

+The development version of the Python Tutorial now contains an Appendix with more info: +
+    http://www.python.org/doc/current/tut/node14.html
+
+People are often very surprised by results like this: +

+

+ >>> 1.2-1.0
+ 0.199999999999999996
+
+And think it is a bug in Python. It's not. It's a problem caused by +the internal representation of a floating point number. A floating point +number is stored as a fixed number of binary digits. +

+In decimal math, there are many numbers that can't be represented +with a fixed number of decimal digits, i.e. +1/3 = 0.3333333333....... +

+In the binary case, 1/2 = 0.1, 1/4 = 0.01, 1/8 = 0.001, etc. There are +a lot of numbers that can't be represented. The digits are cut off at +some point. +

+Since Python 1.6, a floating point's repr() function prints as many +digits are necessary to make eval(repr(f)) == f true for any float f. +The str() function prints the more sensible number that was probably +intended: +

+

+ >>> 0.2
+ 0.20000000000000001
+ >>> print 0.2
+ 0.2
+
+Again, this has nothing to do with Python, but with the way the +underlying C platform handles floating points, and ultimately with +the inaccuracy you'll always have when writing down numbers of fixed +number of digit strings. +

+One of the consequences of this is that it is dangerous to compare +the result of some computation to a float with == ! +Tiny inaccuracies may mean that == fails. +

+Instead try something like this: +

+

+ epsilon = 0.0000000000001 # Tiny allowed error
+ expected_result = 0.4
+
+
+ if expected_result-epsilon <= computation() <= expected_result+epsilon:
+    ...
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 1 22:18:47 2002 by +Fred Drake +

+ +

+

4.99. I tried to open Berkeley DB file, but bsddb produces bsddb.error: (22, 'Invalid argument'). Help! How can I restore my data?

+Don't panic! Your data are probably intact. The most frequent cause +for the error is that you tried to open an earlier Berkeley DB file +with a later version of the Berkeley DB library. +

+Many Linux systems now have all three versions of Berkeley DB +available. If you are migrating from version 1 to a newer version use +db_dump185 to dump a plain text version of the database. +If you are migrating from version 2 to version 3 use db2_dump to create +a plain text version of the database. In either case, use db_load to +create a new native database for the latest version installed on your +computer. If you have version 3 of Berkeley DB installed, you should +be able to use db2_load to create a native version 2 database. +

+You should probably move away from Berkeley DB version 1 files because +the hash file code contains known bugs that can corrupt your data. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 29 16:04:29 2001 by +Skip Montanaro +

+ +

+

4.100. What are the "best practices" for using import in a module?

+First, the standard modules are great. Use them! The standard Python library is large and varied. Using modules can save you time and effort and will reduce maintainenance cost of your code. (Other programs are dedicated to supporting and fixing bugs in the standard Python modules. Coworkers may also be familiar with themodules that you use, reducing the amount of time it takes them to understand your code.) +

+The rest of this answer is largely a matter of personal preference, but here's what some newsgroup posters said (thanks to all who responded) +

+In general, don't use +

+ from modulename import *
+
+Doing so clutters the importer's namespace. Some avoid this idiom even with the few modules that were designed to be imported in this manner. (Modules designed in this manner include Tkinter, thread, and wxPython.) +

+Import modules at the top of a file, one module per line. Doing so makes it clear what other modules your code requires and avoids questions of whether the module name is in scope. Using one import per line makes it easy to add and delete module imports. +

+Move imports into a local scope (such as at the top of a function definition) if there are a lot of imports, and you're trying to avoid the cost (lots of initialization time) of many imports. This technique is especially helpful if many of the imports are unnecessary depending on how the program executes. You may also want to move imports into a function if the modules are only ever used in that function. Note that loading a module the first time may be expensive (because of the one time initialization of the module) but that loading a module multiple times is virtually free (a couple of dictionary lookups). Even if the module name has gone out of scope, the module is probably available in sys.modules. Thus, there isn't really anything wrong with putting no imports at the module level (if they aren't needed) and putting all of the imports at the function level. +

+It is sometimes necessary to move imports to a function or class to avoid problems with circular imports. Gordon says: +

+ Circular imports are fine where both modules use the "import <module>"
+ form of import. They fail when the 2nd module wants to grab a name
+ out of the first ("from module import name") and the import is at
+ the top level. That's because names in the 1st are not yet available,
+ (the first module is busy importing the 2nd).  
+
+In this case, if the 2nd module is only used in one function, then the import can easily be moved into that function. By the time the import is called, the first module will have finished initializing, and the second module can do its import. +

+It may also be necessary to move imports out of the top level of code +if some of the modules are platform-specific. In that case, it may not even be possible to import all of the modules at the top of the file. In this case, importing the correct modules in the corresponding platform-specific code is a good option. +

+If only instances of a specific class uses a module, then it is reasonable to import the module in the class's __init__ method and then assign the module to an instance variable so that the module is always available (via that instance variable) during the life of the object. Note that to delay an import until the class is instantiated, the import must be inside a method. Putting the import inside the class but outside of any method still causes the import to occur when the module is initialized. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Aug 4 04:44:47 2001 by +TAB +

+ +

+

4.101. Is there a tool to help find bugs or perform static analysis?

+Yes. PyChecker is a static analysis tool for finding bugs +in Python source code as well as warning about code complexity +and style. +

+You can get PyChecker from: http://pychecker.sf.net. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 10 15:42:11 2001 by +Neal +

+ +

+

4.102. UnicodeError: ASCII [decoding,encoding] error: ordinal not in range(128)

+This error indicates that your Python installation can handle +only 7-bit ASCII strings. There are a couple ways to fix or +workaround the problem. +

+If your programs must handle data in arbitary character set encodings, the environment the application runs in will generally identify the encoding of the data it is handing you. You need to convert the input to Unicode data using that encoding. For instance, a program that handles email or web input will typically find character set encoding information in Content-Type headers. This can then be used to properly convert input data to Unicode. Assuming the string referred to by "value" is encoded as UTF-8: +

+

+    value = unicode(value, "utf-8")
+
+will return a Unicode object. If the data is not correctly encoded as UTF-8, the above call will raise a UnicodeError. +

+If you only want strings coverted to Unicode which have non-ASCII data, you can try converting them first assuming an ASCII encoding, and then generate Unicode objects if that fails: +

+

+    try:
+        x = unicode(value, "ascii")
+    except UnicodeError:
+        value = unicode(value, "utf-8")
+    else:
+        # value was valid ASCII data
+        pass
+
+

+If you normally use a character set encoding other than US-ASCII and only need to handle data in that encoding, the simplest way to fix the problem may be simply to set the encoding in sitecustomize.py. The following code is just a modified version of the encoding setup code from site.py with the relevant lines uncommented. +

+

+    # Set the string encoding used by the Unicode implementation.
+    # The default is 'ascii'
+    encoding = "ascii" # <= CHANGE THIS if you wish
+
+
+    # Enable to support locale aware default string encodings.
+    import locale
+    loc = locale.getdefaultlocale()
+    if loc[1]:
+        encoding = loc[1]
+    if encoding != "ascii":
+        import sys
+        sys.setdefaultencoding(encoding)
+
+

+Also note that on Windows, there is an encoding known as "mbcs", which uses an encoding specific to your current locale. In many cases, and particularly when working with COM, this may be an appropriate default encoding to use. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Apr 13 04:45:41 2002 by +Skip Montanaro +

+ +

+

4.103. Using strings to call functions/methods

+There are various techniques: +

+* Use a dictionary pre-loaded with strings and functions. The primary +advantage of this technique is that the strings do not need to match the +names of the functions. This is also the primary technique used to +emulate a case construct: +

+

+    def a():
+        pass
+
+
+    def b():
+        pass
+
+
+    dispatch = {'go': a, 'stop': b}  # Note lack of parens for funcs
+
+
+    dispatch[get_input()]()  # Note trailing parens to call function
+
+* Use the built-in function getattr(): +

+

+    import foo
+    getattr(foo, 'bar')()
+
+Note that getattr() works on any object, including classes, class +instances, modules, and so on. +

+This is used in several places in the standard library, like +this: +

+

+    class Foo:
+        def do_foo(self):
+            ...
+
+
+        def do_bar(self):
+            ...
+
+
+     f = getattr(foo_instance, 'do_' + opname)
+     f()
+
+

+* Use locals() or eval() to resolve the function name: +

+def myFunc(): +

+    print "hello"
+
+fname = "myFunc" +

+f = locals()[fname] +f() +

+f = eval(fname) +f() +

+Note: Using eval() can be dangerous. If you don't have absolute control +over the contents of the string, all sorts of things could happen... +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 08:14:58 2002 by +Erno Kuusela +

+ +

+

4.104. How fast are exceptions?

+A try/except block is extremely efficient. Actually executing an +exception is expensive. In older versions of Python (prior to 2.0), it +was common to code this idiom: +

+

+    try:
+        value = dict[key]
+    except KeyError:
+        dict[key] = getvalue(key)
+        value = dict[key]
+
+This idiom only made sense when you expected the dict to have the key +95% of the time or more; other times, you coded it like this: +

+

+    if dict.has_key(key):
+        value = dict[key]
+    else:
+        dict[key] = getvalue(key)
+        value = dict[key]
+
+In Python 2.0 and higher, of course, you can code this as +

+

+    value = dict.setdefault(key, getvalue(key))
+
+However this evaluates getvalue(key) always, regardless of whether it's needed or not. So if it's slow or has a side effect you should use one of the above variants. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Dec 9 10:12:30 2002 by +Yeti +

+ +

+

4.105. Sharing global variables across modules

+The canonical way to share information across modules within a single +program is to create a special module (often called config or cfg). +Just import the config module in all modules of your application; the +module then becomes available as a global name. Because there is only +one instance of each module, any changes made to the module object get +reflected everywhere. For example: +

+config.py: +

+

+    pass
+
+mod.py: +

+

+    import config
+    config.x = 1
+
+main.py: +

+

+    import config
+    import mod
+    print config.x
+
+Note that using a module is also the basis for implementing the +Singleton design pattern, for the same reason. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Apr 23 23:07:19 2002 by +Aahz +

+ +

+

4.106. Why is cPickle so slow?

+Use the binary option. We'd like to make that the default, but it would +break backward compatibility: +

+

+    largeString = 'z' * (100 * 1024)
+    myPickle = cPickle.dumps(largeString, 1)
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Aug 22 19:54:25 2002 by +Aahz +

+ +

+

4.107. When importing module XXX, why do I get "undefined symbol: PyUnicodeUCS2_..." ?

+You are using a version of Python that uses a 4-byte representation for +Unicode characters, but the extension module you are importing (possibly +indirectly) was compiled using a Python that uses a 2-byte representation +for Unicode characters (the default). +

+If instead the name of the undefined symbol starts with PyUnicodeUCS4_, +the problem is the same by the relationship is reversed: Python was +built using 2-byte Unicode characters, and the extension module was +compiled using a Python with 4-byte Unicode characters. +

+This can easily occur when using pre-built extension packages. RedHat +Linux 7.x, in particular, provides a "python2" binary that is compiled +with 4-byte Unicode. This only causes the link failure if the extension +uses any of the PyUnicode_*() functions. It is also a problem if if an +extension uses any of the Unicode-related format specifiers for +Py_BuildValue (or similar) or parameter-specifications for +PyArg_ParseTuple(). +

+You can check the size of the Unicode character a Python interpreter is +using by checking the value of sys.maxunicode: +

+

+  >>> import sys
+  >>> if sys.maxunicode > 65535:
+  ...     print 'UCS4 build'
+  ... else:
+  ...     print 'UCS2 build'
+
+The only way to solve this problem is to use extension modules compiled +with a Python binary built using the same size for Unicode characters. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Aug 27 15:00:17 2002 by +Fred Drake +

+ +

+

4.108. How do I create a .pyc file?

+QUESTION: +

+I have a module and I wish to generate a .pyc file. +How do I do it? Everything I read says that generation of a .pyc file is +"automatic", but I'm not getting anywhere. +

+

+ANSWER: +

+When a module is imported for the first time (or when the source is more +recent than the current compiled file) a .pyc file containing the compiled code should be created in the +same directory as the .py file. +

+One reason that a .pyc file may not be created is permissions problems with the directory. This can happen, for example, if you develop as one user but run as another, such as if you are testing with a web server. +

+However, in most cases, that's not the problem. +

+Creation of a .pyc file is "automatic" if you are importing a module and Python has the +ability (permissions, free space, etc...) to write the compiled module +back to the directory. But note that running Python on a top level script is not considered an +import and so no .pyc will be created automatically. For example, if you have a top-level module abc.py that imports another module xyz.py, when you run abc, xyz.pyc will be created since xyz is imported, but no abc.pyc file will be created since abc isn't imported. +

+If you need to create abc.pyc -- that is, to create a .pyc file for a +module that is not imported -- you can. (Look up +the py_compile and compileall modules in the Library Reference.) +

+You can manually compile any module using the "py_compile" module. One +way is to use the compile() function in that module interactively: +

+

+    >>> import py_compile
+    >>> py_compile.compile('abc.py')
+
+This will write the .pyc to the same location as abc.py (or you +can override that with the optional parameter cfile). +

+You can also automatically compile all files in a directory or +directories using the "compileall" module, which can also be run +straight from the command line. +

+You can do it from the shell (or DOS) prompt by entering: +

+       python compile.py abc.py
+
+or +
+       python compile.py *
+
+Or you can write a script to do it on a list of filenames that you enter. +

+

+     import sys
+     from py_compile import compile
+
+
+     if len(sys.argv) <= 1:
+        sys.exit(1)
+
+
+     for file in sys.argv[1:]:
+        compile(file)
+
+ACKNOWLEDGMENTS: +

+Steve Holden, David Bolen, Rich Somerfield, Oleg Broytmann, Steve Ferg +

+ +Edit this entry / +Log info + +/ Last changed on Wed Feb 12 15:58:25 2003 by +Stephen Ferg +

+ +

+

5. Extending Python

+ +
+

5.1. Can I create my own functions in C?

+Yes, you can create built-in modules containing functions, +variables, exceptions and even new types in C. This is explained in +the document "Extending and Embedding the Python Interpreter" (http://www.python.org/doc/current/ext/ext.html). Also read the chapter +on dynamic loading. +

+There's more information on this in each of the Python books: +Programming Python, Internet Programming with Python, and Das Python-Buch +(in German). +

+ +Edit this entry / +Log info + +/ Last changed on Mon Dec 10 05:18:57 2001 by +Fred L. Drake, Jr. +

+ +

+

5.2. Can I create my own functions in C++?

+Yes, using the C-compatibility features found in C++. Basically +you place extern "C" { ... } around the Python include files and put +extern "C" before each function that is going to be called by the +Python interpreter. Global or static C++ objects with constructors +are probably not a good idea. +

+ +Edit this entry / +Log info +

+ +

+

5.3. How can I execute arbitrary Python statements from C?

+The highest-level function to do this is PyRun_SimpleString() which takes +a single string argument which is executed in the context of module +__main__ and returns 0 for success and -1 when an exception occurred +(including SyntaxError). If you want more control, use PyRun_String(); +see the source for PyRun_SimpleString() in Python/pythonrun.c. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 20:08:14 1997 by +Bill Tutt +

+ +

+

5.4. How can I evaluate an arbitrary Python expression from C?

+Call the function PyRun_String() from the previous question with the +start symbol eval_input (Py_eval_input starting with 1.5a1); it +parses an expression, evaluates it and returns its value. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 22:23:18 1997 by +David Ascher +

+ +

+

5.5. How do I extract C values from a Python object?

+That depends on the object's type. If it's a tuple, +PyTupleSize(o) returns its length and PyTuple_GetItem(o, i) +returns its i'th item; similar for lists with PyListSize(o) +and PyList_GetItem(o, i). For strings, PyString_Size(o) returns +its length and PyString_AsString(o) a pointer to its value +(note that Python strings may contain null bytes so strlen() +is not safe). To test which type an object is, first make sure +it isn't NULL, and then use PyString_Check(o), PyTuple_Check(o), +PyList_Check(o), etc. +

+There is also a high-level API to Python objects which is +provided by the so-called 'abstract' interface -- read +Include/abstract.h for further details. It allows for example +interfacing with any kind of Python sequence (e.g. lists and tuples) +using calls like PySequence_Length(), PySequence_GetItem(), etc.) +as well as many other useful protocols. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 22:34:20 1997 by +David Ascher +

+ +

+

5.6. How do I use Py_BuildValue() to create a tuple of arbitrary length?

+You can't. Use t = PyTuple_New(n) instead, and fill it with +objects using PyTuple_SetItem(t, i, o) -- note that this "eats" a +reference count of o. Similar for lists with PyList_New(n) and +PyList_SetItem(l, i, o). Note that you must set all the tuple items to +some value before you pass the tuple to Python code -- +PyTuple_New(n) initializes them to NULL, which isn't a valid Python +value. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 31 18:15:29 1997 by +Guido van Rossum +

+ +

+

5.7. How do I call an object's method from C?

+The PyObject_CallMethod() function can be used to call an arbitrary +method of an object. The parameters are the object, the name of the +method to call, a format string like that used with Py_BuildValue(), and the argument values: +

+

+    PyObject *
+    PyObject_CallMethod(PyObject *object, char *method_name,
+                        char *arg_format, ...);
+
+This works for any object that has methods -- whether built-in or +user-defined. You are responsible for eventually DECREF'ing the +return value. +

+To call, e.g., a file object's "seek" method with arguments 10, 0 +(assuming the file object pointer is "f"): +

+

+        res = PyObject_CallMethod(f, "seek", "(ii)", 10, 0);
+        if (res == NULL) {
+                ... an exception occurred ...
+        }
+        else {
+                Py_DECREF(res);
+        }
+
+Note that since PyObject_CallObject() always wants a tuple for the +argument list, to call a function without arguments, pass "()" for the +format, and to call a function with one argument, surround the argument +in parentheses, e.g. "(i)". +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jun 6 16:15:46 2002 by +Neal Norwitz +

+ +

+

5.8. How do I catch the output from PyErr_Print() (or anything that prints to stdout/stderr)?

+(Due to Mark Hammond): +

+In Python code, define an object that supports the "write()" method. +Redirect sys.stdout and sys.stderr to this object. +Call print_error, or just allow the standard traceback mechanism to +work. Then, the output will go wherever your write() method sends it. +

+The easiest way to do this is to use the StringIO class in the standard +library. +

+Sample code and use for catching stdout: +

+	>>> class StdoutCatcher:
+	...  def __init__(self):
+	...   self.data = ''
+	...  def write(self, stuff):
+	...   self.data = self.data + stuff
+	...  
+	>>> import sys
+	>>> sys.stdout = StdoutCatcher()
+	>>> print 'foo'
+	>>> print 'hello world!'
+	>>> sys.stderr.write(sys.stdout.data)
+	foo
+	hello world!
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed Dec 16 18:34:25 1998 by +Richard Jones +

+ +

+

5.9. How do I access a module written in Python from C?

+You can get a pointer to the module object as follows: +

+

+        module = PyImport_ImportModule("<modulename>");
+
+If the module hasn't been imported yet (i.e. it is not yet present in +sys.modules), this initializes the module; otherwise it simply returns +the value of sys.modules["<modulename>"]. Note that it doesn't enter +the module into any namespace -- it only ensures it has been +initialized and is stored in sys.modules. +

+You can then access the module's attributes (i.e. any name defined in +the module) as follows: +

+

+        attr = PyObject_GetAttrString(module, "<attrname>");
+
+Calling PyObject_SetAttrString(), to assign to variables in the module, also works. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 22:56:40 1997 by +david ascher +

+ +

+

5.10. How do I interface to C++ objects from Python?

+Depending on your requirements, there are many approaches. To do +this manually, begin by reading the "Extending and Embedding" document +(Doc/ext.tex, see also http://www.python.org/doc/). Realize +that for the Python run-time system, there isn't a whole lot of +difference between C and C++ -- so the strategy to build a new Python +type around a C structure (pointer) type will also work for C++ +objects. +

+A useful automated approach (which also works for C) is SWIG: +http://www.swig.org/. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Oct 15 05:14:01 1999 by +Sjoerd Mullender +

+ +

+

5.11. mSQLmodule (or other old module) won't build with Python 1.5 (or later)

+Since python-1.4 "Python.h" will have the file includes needed in an +extension module. +Backward compatibility is dropped after version 1.4 and therefore +mSQLmodule.c will not build as "allobjects.h" cannot be found. +The following change in mSQLmodule.c is harmless when building it with +1.4 and necessary when doing so for later python versions: +

+Remove lines: +

+

+	#include "allobjects.h"
+	#include "modsupport.h"
+
+And insert instead: +

+

+	#include "Python.h"
+
+You may also need to add +

+

+                #include "rename2.h"
+
+if the module uses "old names". +

+This may happen with other ancient python modules as well, +and the same fix applies. +

+ +Edit this entry / +Log info + +/ Last changed on Sun Dec 21 02:03:35 1997 by +GvR +

+ +

+

5.12. I added a module using the Setup file and the make fails! Huh?

+Setup must end in a newline, if there is no newline there it gets +very sad. Aside from this possibility, maybe you have other +non-Python-specific linkage problems. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jun 24 15:54:01 1997 by +aaron watters +

+ +

+

5.13. I want to compile a Python module on my Red Hat Linux system, but some files are missing.

+Red Hat's RPM for Python doesn't include the +/usr/lib/python1.x/config/ directory, which contains various files required +for compiling Python extensions. +Install the python-devel RPM to get the necessary files. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 26 13:44:04 1999 by +A.M. Kuchling +

+ +

+

5.14. What does "SystemError: _PyImport_FixupExtension: module yourmodule not loaded" mean?

+This means that you have created an extension module named "yourmodule", but your module init function does not initialize with that name. +

+Every module init function will have a line similar to: +

+

+  module = Py_InitModule("yourmodule", yourmodule_functions);
+
+If the string passed to this function is not the same name as your extenion module, the SystemError will be raised. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 25 07:16:08 1999 by +Mark Hammond +

+ +

+

5.15. How to tell "incomplete input" from "invalid input"?

+Sometimes you want to emulate the Python interactive interpreter's +behavior, where it gives you a continuation prompt when the input +is incomplete (e.g. you typed the start of an "if" statement +or you didn't close your parentheses or triple string quotes), +but it gives you a syntax error message immediately when the input +is invalid. +

+In Python you can use the codeop module, which approximates the +parser's behavior sufficiently. IDLE uses this, for example. +

+The easiest way to do it in C is to call PyRun_InteractiveLoop() +(in a separate thread maybe) and let the Python interpreter handle +the input for you. You can also set the PyOS_ReadlineFunctionPointer +to point at your custom input function. See Modules/readline.c and +Parser/myreadline.c for more hints. +

+However sometimes you have to run the embedded Python interpreter +in the same thread as your rest application and you can't allow the +PyRun_InteractiveLoop() to stop while waiting for user input. +The one solution then is to call PyParser_ParseString() +and test for e.error equal to E_EOF (then the input is incomplete). +Sample code fragment, untested, inspired by code from Alex Farber: +

+

+  #include <Python.h>
+  #include <node.h>
+  #include <errcode.h>
+  #include <grammar.h>
+  #include <parsetok.h>
+  #include <compile.h>
+
+
+  int testcomplete(char *code)
+    /* code should end in \n */
+    /* return -1 for error, 0 for incomplete, 1 for complete */
+  {
+    node *n;
+    perrdetail e;
+
+
+    n = PyParser_ParseString(code, &_PyParser_Grammar,
+                             Py_file_input, &e);
+    if (n == NULL) {
+      if (e.error == E_EOF) 
+        return 0;
+      return -1;
+    }
+
+
+    PyNode_Free(n);
+    return 1;
+  }
+
+Another solution is trying to compile the received string with +Py_CompileString(). If it compiles fine - try to execute the returned +code object by calling PyEval_EvalCode(). Otherwise save the input for +later. If the compilation fails, find out if it's an error or just +more input is required - by extracting the message string from the +exception tuple and comparing it to the "unexpected EOF while parsing". +Here is a complete example using the GNU readline library (you may +want to ignore SIGINT while calling readline()): +

+

+  #include <stdio.h>
+  #include <readline.h>
+
+
+  #include <Python.h>
+  #include <object.h>
+  #include <compile.h>
+  #include <eval.h>
+
+
+  int main (int argc, char* argv[])
+  {
+    int i, j, done = 0;                          /* lengths of line, code */
+    char ps1[] = ">>> ";
+    char ps2[] = "... ";
+    char *prompt = ps1;
+    char *msg, *line, *code = NULL;
+    PyObject *src, *glb, *loc;
+    PyObject *exc, *val, *trb, *obj, *dum;
+
+
+    Py_Initialize ();
+    loc = PyDict_New ();
+    glb = PyDict_New ();
+    PyDict_SetItemString (glb, "__builtins__", PyEval_GetBuiltins ());
+
+
+    while (!done)
+    {
+      line = readline (prompt);
+
+
+      if (NULL == line)                          /* CTRL-D pressed */
+      {
+        done = 1;
+      }
+      else
+      {
+        i = strlen (line);
+
+
+        if (i > 0)
+          add_history (line);                    /* save non-empty lines */
+
+
+        if (NULL == code)                        /* nothing in code yet */
+          j = 0;
+        else
+          j = strlen (code);
+
+
+        code = realloc (code, i + j + 2);
+        if (NULL == code)                        /* out of memory */
+          exit (1);
+
+
+        if (0 == j)                              /* code was empty, so */
+          code[0] = '\0';                        /* keep strncat happy */
+
+
+        strncat (code, line, i);                 /* append line to code */
+        code[i + j] = '\n';                      /* append '\n' to code */
+        code[i + j + 1] = '\0';
+
+
+        src = Py_CompileString (code, "<stdin>", Py_single_input);       
+
+
+        if (NULL != src)                         /* compiled just fine - */
+        {
+          if (ps1  == prompt ||                  /* ">>> " or */
+              '\n' == code[i + j - 1])           /* "... " and double '\n' */
+          {                                               /* so execute it */
+            dum = PyEval_EvalCode ((PyCodeObject *)src, glb, loc);
+            Py_XDECREF (dum);
+            Py_XDECREF (src);
+            free (code);
+            code = NULL;
+            if (PyErr_Occurred ())
+              PyErr_Print ();
+            prompt = ps1;
+          }
+        }                                        /* syntax error or E_EOF? */
+        else if (PyErr_ExceptionMatches (PyExc_SyntaxError))           
+        {
+          PyErr_Fetch (&exc, &val, &trb);        /* clears exception! */
+
+
+          if (PyArg_ParseTuple (val, "sO", &msg, &obj) &&
+              !strcmp (msg, "unexpected EOF while parsing")) /* E_EOF */
+          {
+            Py_XDECREF (exc);
+            Py_XDECREF (val);
+            Py_XDECREF (trb);
+            prompt = ps2;
+          }
+          else                                   /* some other syntax error */
+          {
+            PyErr_Restore (exc, val, trb);
+            PyErr_Print ();
+            free (code);
+            code = NULL;
+            prompt = ps1;
+          }
+        }
+        else                                     /* some non-syntax error */
+        {
+          PyErr_Print ();
+          free (code);
+          code = NULL;
+          prompt = ps1;
+        }
+
+
+        free (line);
+      }
+    }
+
+
+    Py_XDECREF(glb);
+    Py_XDECREF(loc);
+    Py_Finalize();
+    exit(0);
+  }
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed Mar 15 09:47:24 2000 by +Alex Farber +

+ +

+

5.16. How do I debug an extension?

+When using gdb with dynamically loaded extensions, you can't set a +breakpoint in your extension until your extension is loaded. +

+In your .gdbinit file (or interactively), add the command +

+br _PyImport_LoadDynamicModule +

+

+$ gdb /local/bin/python +

+gdb) run myscript.py +

+gdb) continue # repeat until your extension is loaded +

+gdb) finish # so that your extension is loaded +

+gdb) br myfunction.c:50 +

+gdb) continue +

+ +Edit this entry / +Log info + +/ Last changed on Fri Oct 20 11:10:32 2000 by +Joe VanAndel +

+ +

+

5.17. How do I find undefined Linux g++ symbols, __builtin_new or __pure_virtural

+To dynamically load g++ extension modules, you must recompile python, relink python using g++ (change LINKCC in the python Modules Makefile), and link your extension module using g++ (e.g., "g++ -shared -o mymodule.so mymodule.o"). +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jan 14 18:03:51 2001 by +douglas orr +

+ +

+

5.18. How do I define and create objects corresponding to built-in/extension types

+Usually you would like to be able to inherit from a Python type when +you ask this question. The bottom line for Python 2.2 is: types and classes are miscible. You build instances by calling classes, and you can build subclasses to your heart's desire. +

+You need to be careful when instantiating immutable types like integers or strings. See http://www.amk.ca/python/2.2/, section 2, for details. +

+Prior to version 2.2, Python (like Java) insisted that there are first-class and second-class objects (the former are types, the latter classes), and never the twain shall meet. +

+The library has, however, done a good job of providing class wrappers for the more commonly desired objects (see UserDict, UserList and UserString for examples), and more are always welcome if you happen to be in the mood to write code. These wrappers still exist in Python 2.2. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 10 15:14:07 2002 by +Matthias Urlichs +

+ +

+

6. Python's design

+ +
+

6.1. Why isn't there a switch or case statement in Python?

+You can do this easily enough with a sequence of +if... elif... elif... else. There have been some proposals for switch +statement syntax, but there is no consensus (yet) on whether and how +to do range tests. +

+ +Edit this entry / +Log info +

+ +

+

6.2. Why does Python use indentation for grouping of statements?

+Basically I believe that using indentation for grouping is +extremely elegant and contributes a lot to the clarity of the average +Python program. Most people learn to love this feature after a while. +Some arguments for it: +

+Since there are no begin/end brackets there cannot be a disagreement +between grouping perceived by the parser and the human reader. I +remember long ago seeing a C fragment like this: +

+

+        if (x <= y)
+                x++;
+                y--;
+        z++;
+
+and staring a long time at it wondering why y was being decremented +even for x > y... (And I wasn't a C newbie then either.) +

+Since there are no begin/end brackets, Python is much less prone to +coding-style conflicts. In C there are loads of different ways to +place the braces (including the choice whether to place braces around +single statements in certain cases, for consistency). If you're used +to reading (and writing) code that uses one style, you will feel at +least slightly uneasy when reading (or being required to write) +another style. +Many coding styles place begin/end brackets on a line by themself. +This makes programs considerably longer and wastes valuable screen +space, making it harder to get a good overview over a program. +Ideally, a function should fit on one basic tty screen (say, 20 +lines). 20 lines of Python are worth a LOT more than 20 lines of C. +This is not solely due to the lack of begin/end brackets (the lack of +declarations also helps, and the powerful operations of course), but +it certainly helps! +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 16:00:15 1997 by +GvR +

+ +

+

6.3. Why are Python strings immutable?

+There are two advantages. One is performance: knowing that a +string is immutable makes it easy to lay it out at construction time +-- fixed and unchanging storage requirements. (This is also one of +the reasons for the distinction between tuples and lists.) The +other is that strings in Python are considered as "elemental" as +numbers. No amount of activity will change the value 8 to anything +else, and in Python, no amount of activity will change the string +"eight" to anything else. (Adapted from Jim Roskind) +

+ +Edit this entry / +Log info +

+ +

+

6.4. Delete

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 03:05:25 2001 by +Moshe Zadka +

+ +

+

6.5. Why does Python use methods for some functionality (e.g. list.index()) but functions for other (e.g. len(list))?

+The major reason is history. Functions were used for those +operations that were generic for a group of types and which +were intended to work even for objects that didn't have +methods at all (e.g. numbers before type/class unification +began, or tuples). +

+It is also convenient to have a function that can readily be applied +to an amorphous collection of objects when you use the functional features of Python (map(), apply() et al). +

+In fact, implementing len(), max(), min() as a built-in function is +actually less code than implementing them as methods for each type. +One can quibble about individual cases but it's a part of Python, +and it's too late to change such things fundamentally now. The +functions have to remain to avoid massive code breakage. +

+Note that for string operations Python has moved from external functions +(the string module) to methods. However, len() is still a function. +

+ +Edit this entry / +Log info + +/ Last changed on Thu May 30 14:08:58 2002 by +Steve Holden +

+ +

+

6.6. Why can't I derive a class from built-in types (e.g. lists or files)?

+As of Python 2.2, you can derive from built-in types. For previous versions, the answer is: +

+This is caused by the relatively late addition of (user-defined) +classes to the language -- the implementation framework doesn't easily +allow it. See the answer to question 4.2 for a work-around. This +may be fixed in the (distant) future. +

+ +Edit this entry / +Log info + +/ Last changed on Thu May 23 02:53:22 2002 by +Neal Norwitz +

+ +

+

6.7. Why must 'self' be declared and used explicitly in method definitions and calls?

+So, is your current programming language C++ or Java? :-) +When classes were added to Python, this was (again) the simplest way of +implementing methods without too many changes to the interpreter. The +idea was borrowed from Modula-3. It turns out to be very useful, for +a variety of reasons. +

+First, it makes it more obvious that you are using a method or +instance attribute instead of a local variable. Reading "self.x" or +"self.meth()" makes it absolutely clear that an instance variable or +method is used even if you don't know the class definition by heart. +In C++, you can sort of tell by the lack of a local variable +declaration (assuming globals are rare or easily recognizable) -- but +in Python, there are no local variable declarations, so you'd have to +look up the class definition to be sure. +

+Second, it means that no special syntax is necessary if you want to +explicitly reference or call the method from a particular class. In +C++, if you want to use a method from base class that is overridden in +a derived class, you have to use the :: operator -- in Python you can +write baseclass.methodname(self, <argument list>). This is +particularly useful for __init__() methods, and in general in cases +where a derived class method wants to extend the base class method of +the same name and thus has to call the base class method somehow. +

+Lastly, for instance variables, it solves a syntactic problem with +assignment: since local variables in Python are (by definition!) those +variables to which a value assigned in a function body (and that +aren't explicitly declared global), there has to be some way to tell +the interpreter that an assignment was meant to assign to an instance +variable instead of to a local variable, and it should preferably be +syntactic (for efficiency reasons). C++ does this through +declarations, but Python doesn't have declarations and it would be a +pity having to introduce them just for this purpose. Using the +explicit "self.var" solves this nicely. Similarly, for using instance +variables, having to write "self.var" means that references to +unqualified names inside a method don't have to search the instance's +directories. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jan 12 08:01:50 2001 by +Steve Holden +

+ +

+

6.8. Can't you emulate threads in the interpreter instead of relying on an OS-specific thread implementation?

+Answer 1: Unfortunately, the interpreter pushes at least one C stack +frame for each Python stack frame. Also, extensions can call back into +Python at almost random moments. Therefore a complete threads +implementation requires thread support for C. +

+Answer 2: Fortunately, there is Stackless Python, which has a completely redesigned interpreter loop that avoids the C stack. It's still experimental but looks very promising. Although it is binary compatible with standard Python, it's still unclear whether Stackless will make it into the core -- maybe it's just too revolutionary. Stackless Python currently lives here: http://www.stackless.com. A microthread implementation that uses it can be found here: http://world.std.com/~wware/uthread.html. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Apr 15 08:18:16 2000 by +Just van Rossum +

+ +

+

6.9. Why can't lambda forms contain statements?

+Python lambda forms cannot contain statements because Python's +syntactic framework can't handle statements nested inside expressions. +

+However, in Python, this is not a serious problem. Unlike lambda +forms in other languages, where they add functionality, Python lambdas +are only a shorthand notation if you're too lazy to define a function. +

+Functions are already first class objects in Python, and can be +declared in a local scope. Therefore the only advantage of using a +lambda form instead of a locally-defined function is that you don't need to invent a name for the function -- but that's just a local variable to which the function object (which is exactly the same type of object that a lambda form yields) is assigned! +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 14 14:15:17 1998 by +Tim Peters +

+ +

+

6.10. [deleted]

+[lambda vs non-nested scopes used to be here] +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:20:56 2002 by +Erno Kuusela +

+ +

+

6.11. [deleted]

+[recursive functions vs non-nested scopes used to be here] +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:22:04 2002 by +Erno Kuusela +

+ +

+

6.12. Why is there no more efficient way of iterating over a dictionary than first constructing the list of keys()?

+As of Python 2.2, you can now iterate over a dictionary directly, +using the new implied dictionary iterator: +

+

+    for k in d: ...
+
+There are also methods returning iterators over the values and items: +

+

+    for k in d.iterkeys(): # same as above
+    for v in d.itervalues(): # iterate over values
+    for k, v in d.iteritems(): # iterate over items
+
+All these require that you do not modify the dictionary during the loop. +

+For previous Python versions, the following defense should do: +

+Have you tried it? I bet it's fast enough for your purposes! In +most cases such a list takes only a few percent of the space occupied +by the dictionary. Apart from the fixed header, +the list needs only 4 bytes (the size of a pointer) per +key. A dictionary uses 12 bytes per key plus between 30 and 70 +percent hash table overhead, plus the space for the keys and values. +By necessity, all keys are distinct objects, and a string object (the most +common key type) costs at least 20 bytes plus the length of the +string. Add to that the values contained in the dictionary, and you +see that 4 bytes more per item really isn't that much more memory... +

+A call to dict.keys() makes one fast scan over the dictionary +(internally, the iteration function does exist) copying the pointers +to the key objects into a pre-allocated list object of the right size. +The iteration time isn't lost (since you'll have to iterate anyway -- +unless in the majority of cases your loop terminates very prematurely +(which I doubt since you're getting the keys in random order). +

+I don't expose the dictionary iteration operation to Python +programmers because the dictionary shouldn't be modified during the +entire iteration -- if it is, there's a small chance that the +dictionary is reorganized because the hash table becomes too full, and +then the iteration may miss some items and see others twice. Exactly +because this only occurs rarely, it would lead to hidden bugs in +programs: it's easy never to have it happen during test runs if you +only insert or delete a few items per iteration -- but your users will +surely hit upon it sooner or later. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 24 21:24:08 2002 by +GvR +

+ +

+

6.13. Can Python be compiled to machine code, C or some other language?

+Not easily. Python's high level data types, dynamic typing of +objects and run-time invocation of the interpreter (using eval() or +exec) together mean that a "compiled" Python program would probably +consist mostly of calls into the Python run-time system, even for +seemingly simple operations like "x+1". +

+Several projects described in the Python newsgroup or at past +Python conferences have shown that this approach is feasible, +although the speedups reached so far are only modest (e.g. 2x). +JPython uses the same strategy for compiling to Java bytecode. +(Jim Hugunin has demonstrated that in combination with whole-program +analysis, speedups of 1000x are feasible for small demo programs. +See the website for the 1997 Python conference.) +

+Internally, Python source code is always translated into a "virtual +machine code" or "byte code" representation before it is interpreted +(by the "Python virtual machine" or "bytecode interpreter"). In order +to avoid the overhead of parsing and translating modules that rarely +change over and over again, this byte code is written on a file whose +name ends in ".pyc" whenever a module is parsed (from a file whose +name ends in ".py"). When the corresponding .py file is changed, it +is parsed and translated again and the .pyc file is rewritten. +

+There is no performance difference once the .pyc file has been loaded +(the bytecode read from the .pyc file is exactly the same as the bytecode +created by direct translation). The only difference is that loading +code from a .pyc file is faster than parsing and translating a .py +file, so the presence of precompiled .pyc files will generally improve +start-up time of Python scripts. If desired, the Lib/compileall.py +module/script can be used to force creation of valid .pyc files for a +given set of modules. +

+Note that the main script executed by Python, even if its filename +ends in .py, is not compiled to a .pyc file. It is compiled to +bytecode, but the bytecode is not saved to a file. +

+If you are looking for a way to translate Python programs in order to +distribute them in binary form, without the need to distribute the +interpreter and library as well, have a look at the freeze.py script +in the Tools/freeze directory. This creates a single binary file +incorporating your program, the Python interpreter, and those parts of +the Python library that are needed by your program. Of course, the +resulting binary will only run on the same type of platform as that +used to create it. +

+Newsflash: there are now several programs that do this, to some extent. +Look for Psyco, Pyrex, PyInline, Py2Cmod, and Weave. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 24 21:26:19 2002 by +GvR +

+ +

+

6.14. How does Python manage memory?

+The details of Python memory management depend on the implementation. +The standard Python implementation (the C implementation) uses reference +counting and another mechanism to collect reference cycles. +

+Jython relies on the Java runtime; so it uses +the JVM's garbage collector. This difference can cause some subtle +porting problems if your Python code depends on the behavior of +the reference counting implementation. +

+The reference cycle collector was added in CPython 2.0. It +periodically executes a cycle detection algorithm which looks for inaccessible cycles and deletes the objects involved. A new gc module provides functions to perform a garbage collection, obtain debugging statistics, and tuning the collector's parameters. +

+The detection of cycles can be disabled when Python is compiled, if you can't afford even a tiny speed penalty or suspect that the cycle collection is buggy, by specifying the "--without-cycle-gc" switch when running the configure script. +

+Sometimes objects get stuck in "tracebacks" temporarily and hence are not deallocated when you might expect. Clear the tracebacks via +

+

+       import sys
+       sys.exc_traceback = sys.last_traceback = None
+
+Tracebacks are used for reporting errors and implementing debuggers and related things. They contain a portion of the program state extracted during the handling of an exception (usually the most recent exception). +

+In the absence of circularities and modulo tracebacks, Python programs need not explicitly manage memory. +

+Why python doesn't use a more traditional garbage collection +scheme? For one thing, unless this were +added to C as a standard feature, it's a portability pain in the ass. +And yes, I know about the Xerox library. It has bits of assembler +code for most common platforms. Not for all. And although it is +mostly transparent, it isn't completely transparent (when I once +linked Python with it, it dumped core). +

+Traditional GC also becomes a problem when Python gets embedded into +other applications. While in a stand-alone Python it may be fine to +replace the standard malloc() and free() with versions provided by the +GC library, an application embedding Python may want to have its own +substitute for malloc() and free(), and may not want Python's. Right +now, Python works with anything that implements malloc() and free() +properly. +

+In Jython, the following code (which is +fine in C Python) will probably run out of file descriptors long before +it runs out of memory: +

+

+        for file in <very long list of files>:
+                f = open(file)
+                c = f.read(1)
+
+Using the current reference counting and destructor scheme, each new +assignment to f closes the previous file. Using GC, this is not +guaranteed. Sure, you can think of ways to fix this. But it's not +off-the-shelf technology. If you want to write code that will +work with any Python implementation, you should explicitly close +the file; this will work regardless of GC: +

+

+       for file in <very long list of files>:
+                f = open(file)
+                c = f.read(1)
+                f.close()
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:35:38 2002 by +Erno Kuusela +

+ +

+

6.15. Why are there separate tuple and list data types?

+This is done so that tuples can be immutable while lists are mutable. +

+Immutable tuples are useful in situations where you need to pass a few +items to a function and don't want the function to modify the tuple; +for example, +

+

+	point1 = (120, 140)
+	point2 = (200, 300)
+	record(point1, point2)
+	draw(point1, point2)
+
+You don't want to have to think about what would happen if record() +changed the coordinates -- it can't, because the tuples are immutable. +

+On the other hand, when creating large lists dynamically, it is +absolutely crucial that they are mutable -- adding elements to a tuple +one by one requires using the concatenation operator, which makes it +quadratic in time. +

+As a general guideline, use tuples like you would use structs in C or +records in Pascal, use lists like (variable length) arrays. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 15:26:03 1997 by +GvR +

+ +

+

6.16. How are lists implemented?

+Despite what a Lisper might think, Python's lists are really +variable-length arrays. The implementation uses a contiguous +array of references to other objects, and keeps a pointer +to this array (as well as its length) in a list head structure. +

+This makes indexing a list (a[i]) an operation whose cost is +independent of the size of the list or the value of the index. +

+When items are appended or inserted, the array of references is resized. +Some cleverness is applied to improve the performance of appending +items repeatedly; when the array must be grown, some extra space +is allocated so the next few times don't require an actual resize. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 15:32:24 1997 by +GvR +

+ +

+

6.17. How are dictionaries implemented?

+Python's dictionaries are implemented as resizable hash tables. +

+Compared to B-trees, this gives better performance for lookup +(the most common operation by far) under most circumstances, +and the implementation is simpler. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 23:51:14 1997 by +Vladimir Marangozov +

+ +

+

6.18. Why must dictionary keys be immutable?

+The hash table implementation of dictionaries uses a hash value +calculated from the key value to find the key. If the key were +a mutable object, its value could change, and thus its hash could +change. But since whoever changes the key object can't tell that +is incorporated in a dictionary, it can't move the entry around in +the dictionary. Then, when you try to look up the same object +in the dictionary, it won't be found, since its hash value is different; +and if you try to look up the old value, it won't be found either, +since the value of the object found in that hash bin differs. +

+If you think you need to have a dictionary indexed with a list, +try to use a tuple instead. The function tuple(l) creates a tuple +with the same entries as the list l. +

+Some unacceptable solutions that have been proposed: +

+- Hash lists by their address (object ID). This doesn't work because +if you construct a new list with the same value it won't be found; +e.g., +

+

+  d = {[1,2]: '12'}
+  print d[[1,2]]
+
+will raise a KeyError exception because the id of the [1,2] used +in the second line differs from that in the first line. +In other words, dictionary keys should be compared using '==', not using 'is'. +

+- Make a copy when using a list as a key. This doesn't work because +the list (being a mutable object) could contain a reference to itself, +and then the copying code would run into an infinite loop. +

+- Allow lists as keys but tell the user not to modify them. This would +allow a class of hard-to-track bugs in programs that I'd rather not see; +it invalidates an important invariant of dictionaries (every value in +d.keys() is usable as a key of the dictionary). +

+- Mark lists as read-only once they are used as a dictionary key. +The problem is that it's not just the top-level object that could change +its value; you could use a tuple containing a list as a key. Entering +anything as a key into a dictionary would require marking all objects +reachable from there as read-only -- and again, self-referential objects +could cause an infinite loop again (and again and again). +

+There is a trick to get around this if you need to, but +use it at your own risk: You +can wrap a mutable structure inside a class instance which +has both a __cmp__ and a __hash__ method. +

+

+   class listwrapper:
+        def __init__(self, the_list):
+              self.the_list = the_list
+        def __cmp__(self, other):
+              return self.the_list == other.the_list
+        def __hash__(self):
+              l = self.the_list
+              result = 98767 - len(l)*555
+              for i in range(len(l)):
+                   try:
+                        result = result + (hash(l[i]) % 9999999) * 1001 + i
+                   except:
+                        result = (result % 7777777) + i * 333
+              return result
+
+Note that the hash computation is complicated by the +possibility that some members of the list may be unhashable +and also by the possibility of arithmetic overflow. +

+You must make +sure that the hash value for all such wrapper objects that reside in a +dictionary (or other hash based structure), remain fixed while +the object is in the dictionary (or other structure). +

+Furthermore it must always be the case that if +o1 == o2 (ie o1.__cmp__(o2)==0) then hash(o1)==hash(o2) +(ie, o1.__hash__() == o2.__hash__()), regardless of whether +the object is in a dictionary or not. +If you fail to meet these restrictions dictionaries and other +hash based structures may misbehave! +

+In the case of listwrapper above whenever the wrapper +object is in a dictionary the wrapped list must not change +to avoid anomalies. Don't do this unless you are prepared +to think hard about the requirements and the consequences +of not meeting them correctly. You've been warned! +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 10 10:08:40 1997 by +aaron watters +

+ +

+

6.19. How the heck do you make an array in Python?

+["this", 1, "is", "an", "array"] +

+Lists are arrays in the C or Pascal sense of the word (see question +6.16). The array module also provides methods for creating arrays +of fixed types with compact representations (but they are slower to +index than lists). Also note that the Numerics extensions and others +define array-like structures with various characteristics as well. +

+To get Lisp-like lists, emulate cons cells +

+

+    lisp_list = ("like",  ("this",  ("example", None) ) )
+
+using tuples (or lists, if you want mutability). Here the analogue +of lisp car is lisp_list[0] and the analogue of cdr is lisp_list[1]. +Only do this if you're sure you really need to (it's usually a lot +slower than using Python lists). +

+Think of Python lists as mutable heterogeneous arrays of +Python objects (say that 10 times fast :) ). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 13 07:08:27 1997 by +aaron watters +

+ +

+

6.20. Why doesn't list.sort() return the sorted list?

+In situations where performance matters, making a copy of the list +just to sort it would be wasteful. Therefore, list.sort() sorts +the list in place. In order to remind you of that fact, it does +not return the sorted list. This way, you won't be fooled into +accidentally overwriting a list when you need a sorted copy but also +need to keep the unsorted version around. +

+As a result, here's the idiom to iterate over the keys of a dictionary +in sorted order: +

+

+	keys = dict.keys()
+	keys.sort()
+	for key in keys:
+		...do whatever with dict[key]...
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 2 17:01:52 1999 by +Fred L. Drake, Jr. +

+ +

+

6.21. How do you specify and enforce an interface spec in Python?

+An interfaces specification for a module as provided +by languages such as C++ and java describes the prototypes +for the methods and functions of the module. Many feel +that compile time enforcement of interface specifications +help aid in the construction of large programs. Python +does not support interface specifications directly, but many +of their advantages can be obtained by an appropriate +test discipline for components, which can often be very +easily accomplished in Python. There is also a tool, PyChecker, +which can be used to find problems due to subclassing. +

+A good test suite for a module can at +once provide a regression test and serve as a module interface +specification (even better since it also gives example usage). Look to +many of the standard libraries which often have a "script +interpretation" which provides a simple "self test." Even +modules which use complex external interfaces can often +be tested in isolation using trivial "stub" emulations of the +external interface. +

+An appropriate testing discipline (if enforced) can help +build large complex applications in Python as well as having interface +specifications would do (or better). Of course Python allows you +to get sloppy and not do it. Also you might want to design +your code with an eye to make it easily tested. +

+ +Edit this entry / +Log info + +/ Last changed on Thu May 23 03:05:29 2002 by +Neal Norwitz +

+ +

+

6.22. Why do all classes have the same type? Why do instances all have the same type?

+The Pythonic use of the word "type" is quite different from +common usage in much of the rest of the programming language +world. A "type" in Python is a description for an object's operations +as implemented in C. All classes have the same operations +implemented in C which sometimes "call back" to differing program +fragments implemented in Python, and hence all classes have the +same type. Similarly at the C level all class instances have the +same C implementation, and hence all instances have the same +type. +

+Remember that in Python usage "type" refers to a C implementation +of an object. To distinguish among instances of different classes +use Instance.__class__, and also look to 4.47. Sorry for the +terminological confusion, but at this point in Python's development +nothing can be done! +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jul 1 12:35:47 1997 by +aaron watters +

+ +

+

6.23. Why isn't all memory freed when Python exits?

+Objects referenced from Python module global name spaces are +not always deallocated when Python exits. +

+This may happen if there are circular references (see question +4.17). There are also certain bits of memory that are allocated +by the C library that are impossible to free (e.g. a tool +like Purify will complain about these). +

+But in general, Python 1.5 and beyond +(in contrast with earlier versions) is quite agressive about +cleaning up memory on exit. +

+If you want to force Python to delete certain things on deallocation +use the sys.exitfunc hook to force those deletions. For example +if you are debugging an extension module using a memory analysis +tool and you wish to make Python deallocate almost everything +you might use an exitfunc like this one: +

+

+  import sys
+
+
+  def my_exitfunc():
+       print "cleaning up"
+       import sys
+       # do order dependant deletions here
+       ...
+       # now delete everything else in arbitrary order
+       for x in sys.modules.values():
+            d = x.__dict__
+            for name in d.keys():
+                 del d[name]
+
+
+  sys.exitfunc = my_exitfunc
+
+Other exitfuncs can be less drastic, of course. +

+(In fact, this one just does what Python now already does itself; +but the example of using sys.exitfunc to force cleanups is still +useful.) +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 29 09:46:26 1998 by +GvR +

+ +

+

6.24. Why no class methods or mutable class variables?

+The notation +

+

+    instance.attribute(arg1, arg2)
+
+usually translates to the equivalent of +

+

+    Class.attribute(instance, arg1, arg2)
+
+where Class is a (super)class of instance. Similarly +

+

+    instance.attribute = value
+
+sets an attribute of an instance (overriding any attribute of a class +that instance inherits). +

+Sometimes programmers want to have +different behaviours -- they want a method which does not bind +to the instance and a class attribute which changes in place. +Python does not preclude these behaviours, but you have to +adopt a convention to implement them. One way to accomplish +this is to use "list wrappers" and global functions. +

+

+   def C_hello():
+         print "hello"
+
+
+   class C:
+        hello = [C_hello]
+        counter = [0]
+
+
+    I = C()
+
+Here I.hello[0]() acts very much like a "class method" and +I.counter[0] = 2 alters C.counter (and doesn't override it). +If you don't understand why you'd ever want to do this, that's +because you are pure of mind, and you probably never will +want to do it! This is dangerous trickery, not recommended +when avoidable. (Inspired by Tim Peter's discussion.) +

+In Python 2.2, you can do this using the new built-in operations +classmethod and staticmethod. +See http://www.python.org/2.2/descrintro.html#staticmethods +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 11 15:59:37 2001 by +GvR +

+ +

+

6.25. Why are default values sometimes shared between objects?

+It is often expected that a function CALL creates new objects for default +values. This is not what happens. Default values are created when the +function is DEFINED, that is, there is only one such object that all +functions refer to. If that object is changed, subsequent calls to the +function will refer to this changed object. By definition, immutable objects +(like numbers, strings, tuples, None) are safe from change. Changes to mutable +objects (like dictionaries, lists, class instances) is what causes the +confusion. +

+Because of this feature it is good programming practice not to use mutable +objects as default values, but to introduce them in the function. +Don't write: +

+

+	def foo(dict={}):  # XXX shared reference to one dict for all calls
+	    ...
+
+but: +
+	def foo(dict=None):
+		if dict is None:
+			dict = {} # create a new dict for local namespace
+
+See page 182 of "Internet Programming with Python" for one discussion +of this feature. Or see the top of page 144 or bottom of page 277 in +"Programming Python" for another discussion. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Aug 16 07:03:35 1997 by +Case Roole +

+ +

+

6.26. Why no goto?

+Actually, you can use exceptions to provide a "structured goto" +that even works across function calls. Many feel that exceptions +can conveniently emulate all reasonable uses of the "go" or "goto" +constructs of C, Fortran, and other languages. For example: +

+

+   class label: pass # declare a label
+   try:
+        ...
+        if (condition): raise label() # goto label
+        ...
+   except label: # where to goto
+        pass
+   ...
+
+This doesn't allow you to jump into the middle of a loop, but +that's usually considered an abuse of goto anyway. Use sparingly. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Sep 10 07:16:44 1997 by +aaron watters +

+ +

+

6.27. How do you make a higher order function in Python?

+You have two choices: you can use default arguments and override +them or you can use "callable objects." For example suppose you +wanted to define linear(a,b) which returns a function f where f(x) +computes the value a*x+b. Using default arguments: +

+

+     def linear(a,b):
+         def result(x, a=a, b=b):
+             return a*x + b
+         return result
+
+Or using callable objects: +

+

+     class linear:
+        def __init__(self, a, b):
+            self.a, self.b = a,b
+        def __call__(self, x):
+            return self.a * x + self.b
+
+In both cases: +

+

+     taxes = linear(0.3,2)
+
+gives a callable object where taxes(10e6) == 0.3 * 10e6 + 2. +

+The defaults strategy has the disadvantage that the default arguments +could be accidentally or maliciously overridden. The callable objects +approach has the disadvantage that it is a bit slower and a bit +longer. Note however that a collection of callables can share +their signature via inheritance. EG +

+

+      class exponential(linear):
+         # __init__ inherited
+         def __call__(self, x):
+             return self.a * (x ** self.b)
+
+On comp.lang.python, zenin@bawdycaste.org points out that +an object can encapsulate state for several methods in order +to emulate the "closure" concept from functional programming +languages, for example: +

+

+    class counter:
+        value = 0
+        def set(self, x): self.value = x
+        def up(self): self.value=self.value+1
+        def down(self): self.value=self.value-1
+
+
+    count = counter()
+    inc, dec, reset = count.up, count.down, count.set
+
+Here inc, dec and reset act like "functions which share the +same closure containing the variable count.value" (if you +like that way of thinking). +

+ +Edit this entry / +Log info + +/ Last changed on Fri Sep 25 08:38:35 1998 by +Aaron Watters +

+ +

+

6.28. Why do I get a SyntaxError for a 'continue' inside a 'try'?

+This is an implementation limitation, +caused by the extremely simple-minded +way Python generates bytecode. The try block pushes something on the +"block stack" which the continue would have to pop off again. The +current code generator doesn't have the data structures around so that +'continue' can generate the right code. +

+Note that JPython doesn't have this restriction! +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 22 15:01:07 1998 by +GvR +

+ +

+

6.29. Why can't raw strings (r-strings) end with a backslash?

+More precisely, they can't end with an odd number of backslashes: +the unpaired backslash at the end escapes the closing quote character, +leaving an unterminated string. +

+Raw strings were designed to ease creating input for processors (chiefly +regular expression engines) that want to do their own backslash escape processing. Such processors consider an unmatched trailing backslash to be an error anyway, so raw strings disallow that. In return, they allow you to pass on the string quote character by escaping it with a backslash. These rules work well when r-strings are used for their intended purpose. +

+If you're trying to build Windows pathnames, note that all Windows system calls accept forward slashes too: +

+

+    f = open("/mydir/file.txt") # works fine!
+
+If you're trying to build a pathname for a DOS command, try e.g. one of +

+

+    dir = r"\this\is\my\dos\dir" "\\"
+    dir = r"\this\is\my\dos\dir\ "[:-1]
+    dir = "\\this\\is\\my\\dos\\dir\\"
+
+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jul 13 20:50:20 1998 by +Tim Peters +

+ +

+

6.30. Why can't I use an assignment in an expression?

+Many people used to C or Perl complain that they want to be able to +use e.g. this C idiom: +

+

+    while (line = readline(f)) {
+        ...do something with line...
+    }
+
+where in Python you're forced to write this: +

+

+    while 1:
+        line = f.readline()
+        if not line:
+            break
+        ...do something with line...
+
+This issue comes up in the Python newsgroup with alarming frequency +-- search Deja News for past messages about assignment expression. +The reason for not allowing assignment in Python expressions +is a common, hard-to-find bug in those other languages, +caused by this construct: +

+

+    if (x = 0) {
+        ...error handling...
+    }
+    else {
+        ...code that only works for nonzero x...
+    }
+
+Many alternatives have been proposed. Most are hacks that save some +typing but use arbitrary or cryptic syntax or keywords, +and fail the simple criterion that I use for language change proposals: +it should intuitively suggest the proper meaning to a human reader +who has not yet been introduced with the construct. +

+The earliest time something can be done about this will be with +Python 2.0 -- if it is decided that it is worth fixing. +An interesting phenomenon is that most experienced Python programmers +recognize the "while 1" idiom and don't seem to be missing the +assignment in expression construct much; it's only the newcomers +who express a strong desire to add this to the language. +

+One fairly elegant solution would be to introduce a new operator +for assignment in expressions spelled ":=" -- this avoids the "=" +instead of "==" problem. It would have the same precedence +as comparison operators but the parser would flag combination with +other comparisons (without disambiguating parentheses) as an error. +

+Finally -- there's an alternative way of spelling this that seems +attractive but is generally less robust than the "while 1" solution: +

+

+    line = f.readline()
+    while line:
+        ...do something with line...
+        line = f.readline()
+
+The problem with this is that if you change your mind about exactly +how you get the next line (e.g. you want to change it into +sys.stdin.readline()) you have to remember to change two places +in your program -- the second one hidden at the bottom of the loop. +

+ +Edit this entry / +Log info + +/ Last changed on Tue May 18 00:57:41 1999 by +Andrew Dalke +

+ +

+

6.31. Why doesn't Python have a "with" statement like some other languages?

+Basically, because such a construct would be terribly ambiguous. Thanks to Carlos Ribeiro for the following remarks: +

+Some languages, such as Object Pascal, Delphi, and C++, use static types. So it is possible to know, in an unambiguous way, what member is being assigned in a "with" clause. This is the main point - the compiler always knows the scope of every variable at compile time. +

+Python uses dynamic types. It is impossible to know in advance which +attribute will be referenced at runtime. Member attributes may be added or removed from objects on the fly. This would make it impossible to know, from a simple reading, what attribute is being referenced - a local one, a global one, or a member attribute. +

+For instance, take the following snippet (it is incomplete btw, just to +give you the idea): +

+

+   def with_is_broken(a):
+      with a:
+         print x
+
+The snippet assumes that "a" must have a member attribute called "x". +However, there is nothing in Python that guarantees that. What should +happen if "a" is, let us say, an integer? And if I have a global variable named "x", will it end up being used inside the with block? As you see, the dynamic nature of Python makes such choices much harder. +

+The primary benefit of "with" and similar language features (reduction of code volume) can, however, easily be achieved in Python by assignment. Instead of: +

+

+    function(args).dict[index][index].a = 21
+    function(args).dict[index][index].b = 42
+    function(args).dict[index][index].c = 63
+
+would become: +

+

+    ref = function(args).dict[index][index]
+    ref.a = 21
+    ref.b = 42
+    ref.c = 63
+
+This also has the happy side-effect of increasing execution speed, since name bindings are resolved at run-time in Python, and the second method only needs to perform the resolution once. If the referenced object does not have a, b and c attributes, of course, the end result is still a run-time exception. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jan 11 14:32:58 2002 by +Steve Holden +

+ +

+

6.32. Why are colons required for if/while/def/class?

+The colon is required primarily to enhance readability (one of the +results of the experimental ABC language). Consider this: +

+

+    if a==b
+        print a
+
+versus +

+

+    if a==b:
+        print a
+
+Notice how the second one is slightly easier to read. Notice further how +a colon sets off the example in the second line of this FAQ answer; it's +a standard usage in English. Finally, the colon makes it easier for +editors with syntax highlighting. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 07:22:57 2002 by +Matthias Urlichs +

+ +

+

6.33. Can't we get rid of the Global Interpreter Lock?

+The Global Interpreter Lock (GIL) is often seen as a hindrance to +Python's deployment on high-end multiprocessor server machines, +because a multi-threaded Python program effectively only uses +one CPU, due to the insistence that (almost) all Python code +can only run while the GIL is held. +

+Back in the days of Python 1.5, Greg Stein actually implemented +a comprehensive patch set ("free threading") +that removed the GIL, replacing it with +fine-grained locking. Unfortunately, even on Windows (where locks +are very efficient) this ran ordinary Python code about twice as +slow as the interpreter using the GIL. On Linux the performance +loss was even worse (pthread locks aren't as efficient). +

+Since then, the idea of getting rid of the GIL has occasionally +come up but nobody has found a way to deal with the expected slowdown; +Greg's free threading patch set has not been kept up-to-date for +later Python versions. +

+This doesn't mean that you can't make good use of Python on +multi-CPU machines! You just have to be creative with dividing +the work up between multiple processes rather than multiple +threads. +

+

+It has been suggested that the GIL should be a per-interpreter-state +lock rather than truly global; interpreters then wouldn't be able +to share objects. Unfortunately, this isn't likely to happen either. +

+It would be a tremendous amount of work, because many object +implementations currently have global state. E.g. small ints and +small strings are cached; these caches would have to be moved to the +interpreter state. Other object types have their own free list; these +free lists would have to be moved to the interpreter state. And so +on. +

+And I doubt that it can even be done in finite time, because the same +problem exists for 3rd party extensions. It is likely that 3rd party +extensions are being written at a faster rate than you can convert +them to store all their global state in the interpreter state. +

+And finally, once you have multiple interpreters not sharing any +state, what have you gained over running each interpreter +in a separate process? +

+ +Edit this entry / +Log info + +/ Last changed on Fri Feb 7 16:34:01 2003 by +GvR +

+ +

+

7. Using Python on non-UNIX platforms

+ +
+

7.1. Is there a Mac version of Python?

+Yes, it is maintained by Jack Jansen. See Jack's MacPython Page: +

+

+  http://www.cwi.nl/~jack/macpython.html
+
+

+ +Edit this entry / +Log info + +/ Last changed on Fri May 4 09:33:42 2001 by +GvR +

+ +

+

7.2. Are there DOS and Windows versions of Python?

+Yes. The core windows binaries are available from http://www.python.org/windows/. There is a plethora of Windows extensions available, including a large number of not-always-compatible GUI toolkits. The core binaries include the standard Tkinter GUI extension. +

+Most windows extensions can be found (or referenced) at http://www.python.org/windows/ +

+Windows 3.1/DOS support seems to have dropped off recently. You may need to settle for an old version of Python one these platforms. One such port is WPY +

+WPY: Ports to DOS, Windows 3.1(1), Windows 95, Windows NT and OS/2. +Also contains a GUI package that offers portability between Windows +(not DOS) and Unix, and native look and feel on both. +ftp://ftp.python.org/pub/python/wpy/. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jun 2 20:21:57 1998 by +Mark Hammond +

+ +

+

7.3. Is there an OS/2 version of Python?

+Yes, see http://www.python.org/download/download_os2.html. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 7 11:33:16 1999 by +GvR +

+ +

+

7.4. Is there a VMS version of Python?

+Jean-François Piéronne has ported 2.1.3 to OpenVMS. It can be found at +<http://vmspython.dyndns.org/>. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Sep 19 15:40:38 2002 by +Skip Montanaro +

+ +

+

7.5. What about IBM mainframes, or other non-UNIX platforms?

+I haven't heard about these, except I remember hearing about an +OS/9 port and a port to Vxworks (both operating systems for embedded +systems). If you're interested in any of this, go directly to the +newsgroup and ask there, you may find exactly what you need. For +example, a port to MPE/iX 5.0 on HP3000 computers was just announced, +see http://www.allegro.com/software/. +

+On the IBM mainframe side, for Z/OS there's a port of python 1.4 that goes with their open-unix package, formely OpenEdition MVS, (http://www-1.ibm.com/servers/eserver/zseries/zos/unix/python.html). On a side note, there's also a java vm ported - so, in theory, jython could run too. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Nov 18 03:18:39 2002 by +Bruno Jessen +

+ +

+

7.6. Where are the source or Makefiles for the non-UNIX versions?

+The standard sources can (almost) be used. Additional sources can +be found in the platform-specific subdirectories of the distribution. +

+ +Edit this entry / +Log info +

+ +

+

7.7. What is the status and support for the non-UNIX versions?

+I don't have access to most of these platforms, so in general I am +dependent on material submitted by volunteers. However I strive to +integrate all changes needed to get it to compile on a particular +platform back into the standard sources, so porting of the next +version to the various non-UNIX platforms should be easy. +(Note that Linux is classified as a UNIX platform here. :-) +

+Some specific platforms: +

+Windows: all versions (95, 98, ME, NT, 2000, XP) are supported, +all python.org releases come with a Windows installer. +

+MacOS: Jack Jansen does an admirable job of keeping the Mac version +up to date (both MacOS X and older versions); +see http://www.cwi.nl/~jack/macpython.html +

+For all supported platforms, see http://www.python.org/download/ +(follow the link to "Other platforms" for less common platforms) +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 24 21:34:24 2002 by +GvR +

+ +

+

7.8. I have a PC version but it appears to be only a binary. Where's the library?

+If you are running any version of Windows, then you have the wrong distribution. The FAQ lists current Windows versions. Notably, Pythonwin and wpy provide fully functional installations. +

+But if you are sure you have the only distribution with a hope of working on +your system, then... +

+You still need to copy the files from the distribution directory +"python/Lib" to your system. If you don't have the full distribution, +you can get the file lib<version>.tar.gz from most ftp sites carrying +Python; this is a subset of the distribution containing just those +files, e.g. ftp://ftp.python.org/pub/python/src/lib1.4.tar.gz. +

+Once you have installed the library, you need to point sys.path to it. +Assuming the library is in C:\misc\python\lib, the following commands +will point your Python interpreter to it (note the doubled backslashes +-- you can also use single forward slashes instead): +

+

+        >>> import sys
+        >>> sys.path.insert(0, 'C:\\misc\\python\\lib')
+        >>>
+
+For a more permanent effect, set the environment variable PYTHONPATH, +as follows (talking to a DOS prompt): +

+

+        C> SET PYTHONPATH=C:\misc\python\lib
+
+

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 16:28:27 1997 by +Ken Manheimer +

+ +

+

7.9. Where's the documentation for the Mac or PC version?

+The documentation for the Unix version also applies to the Mac and +PC versions. Where applicable, differences are indicated in the text. +

+ +Edit this entry / +Log info +

+ +

+

7.10. How do I create a Python program file on the Mac or PC?

+Use an external editor. On the Mac, BBEdit seems to be a popular +no-frills text editor. I work like this: start the interpreter; edit +a module file using BBedit; import and test it in the interpreter; +edit again in BBedit; then use the built-in function reload() to +re-read the imported module; etc. In the 1.4 distribution +you will find a BBEdit extension that makes life a little easier: +it can tell the interpreter to execute the current window. +See :Mac:Tools:BBPy:README. +

+Regarding the same question for the PC, Kurt Wm. Hemr writes: "While +anyone with a pulse could certainly figure out how to do the same on +MS-Windows, I would recommend the NotGNU Emacs clone for MS-Windows. +Not only can you easily resave and "reload()" from Python after making +changes, but since WinNot auto-copies to the clipboard any text you +select, you can simply select the entire procedure (function) which +you changed in WinNot, switch to QWPython, and shift-ins to reenter +the changed program unit." +

+If you're using Windows95 or Windows NT, you should also know about +PythonWin, which provides a GUI framework, with an mouse-driven +editor, an object browser, and a GUI-based debugger. See +

+       http://www.python.org/ftp/python/pythonwin/
+
+for details. +

+ +Edit this entry / +Log info + +/ Last changed on Sun May 25 10:04:25 1997 by +GvR +

+ +

+

7.11. How can I use Tkinter on Windows 95/NT?

+Starting from Python 1.5, it's very easy -- just download and install +Python and Tcl/Tk and you're in business. See +

+

+  http://www.python.org/download/download_windows.html
+
+One warning: don't attempt to use Tkinter from PythonWin +(Mark Hammond's IDE). Use it from the command line interface +(python.exe) or the windowless interpreter (pythonw.exe). +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 12 09:32:48 1998 by +GvR +

+ +

+

7.12. cgi.py (or other CGI programming) doesn't work sometimes on NT or win95!

+Be sure you have the latest python.exe, that you are using +python.exe rather than a GUI version of python and that you +have configured the server to execute +

+

+     "...\python.exe -u ..."
+
+for the cgi execution. The -u (unbuffered) option on NT and +win95 prevents the interpreter from altering newlines in the +standard input and output. Without it post/multipart requests +will seem to have the wrong length and binary (eg, GIF) +responses may get garbled (resulting in, eg, a "broken image"). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jul 30 10:48:02 1997 by +aaron watters +

+ +

+

7.13. Why doesn't os.popen() work in PythonWin on NT?

+The reason that os.popen() doesn't work from within PythonWin is due to a bug in Microsoft's C Runtime Library (CRT). The CRT assumes you have a Win32 console attached to the process. +

+You should use the win32pipe module's popen() instead which doesn't depend on having an attached Win32 console. +

+Example: +

+ import win32pipe
+ f = win32pipe.popen('dir /c c:\\')
+ print f.readlines()
+ f.close()
+
+

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 31 15:34:09 1997 by +Bill Tutt +

+ +

+

7.14. How do I use different functionality on different platforms with the same program?

+Remember that Python is extremely dynamic and that you +can use this dynamism to configure a program at run-time to +use available functionality on different platforms. For example +you can test the sys.platform and import different modules based +on its value. +

+

+   import sys
+   if sys.platform == "win32":
+      import win32pipe
+      popen = win32pipe.popen
+   else:
+      import os
+      popen = os.popen
+
+(See FAQ 7.13 for an explanation of why you might want to +do something like this.) Also you can try to import a module +and use a fallback if the import fails: +

+

+    try:
+         import really_fast_implementation
+         choice = really_fast_implementation
+    except ImportError:
+         import slower_implementation
+         choice = slower_implementation
+
+

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 13 07:39:06 1997 by +aaron watters +

+ +

+

7.15. Is there an Amiga version of Python?

+Yes. See the AmigaPython homepage at http://www.bigfoot.com/~irmen/python.html. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Dec 14 06:53:32 1998 by +Irmen de Jong +

+ +

+

7.16. Why doesn't os.popen()/win32pipe.popen() work on Win9x?

+There is a bug in Win9x that prevents os.popen/win32pipe.popen* from working. The good news is there is a way to work around this problem. +The Microsoft Knowledge Base article that you need to lookup is: Q150956. You will find links to the knowledge base at: +http://www.microsoft.com/kb. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 25 10:45:38 1999 by +Bill Tutt +

+ +

+

8. Python on Windows

+ +
+

8.1. Using Python for CGI on Microsoft Windows

+** Setting up the Microsoft IIS Server/Peer Server +

+On the Microsoft IIS +server or on the Win95 MS Personal Web Server +you set up python in the same way that you +would set up any other scripting engine. +

+Run regedt32 and go to: +

+HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\W3SVC\Parameters\ScriptMap +

+and enter the following line (making any specific changes that your system may need) +

+.py :REG_SZ: c:\<path to python>\python.exe -u %s %s +

+This line will allow you to call your script with a simple reference like: +http://yourserver/scripts/yourscript.py +provided "scripts" is an "executable" directory for your server (which +it usually is by default). +The "-u" flag specifies unbuffered and binary mode for stdin - needed when working with binary data +

+In addition, it is recommended by people who would know that using ".py" may +not be a good idea for the file extensions when used in this context +(you might want to reserve *.py for support modules and use *.cgi or *.cgp +for "main program" scripts). +However, that issue is beyond this Windows FAQ entry. +

+

+** Apache configuration +

+In the Apache configuration file httpd.conf, add the following line at +the end of the file: +

+ScriptInterpreterSource Registry +

+Then, give your Python CGI-scripts the extension .py and put them in the cgi-bin directory. +

+

+** Netscape Servers: +Information on this topic exists at: +http://home.netscape.com/comprod/server_central/support/fasttrack_man/programs.htm#1010870 +

+ +Edit this entry / +Log info + +/ Last changed on Wed Mar 27 12:25:54 2002 by +Gerhard Häring +

+ +

+

8.2. How to check for a keypress without blocking?

+Use the msvcrt module. This is a standard Windows-specific extensions +in Python 1.5 and beyond. It defines a function kbhit() which checks +whether a keyboard hit is present; also getch() which gets one +character without echo. Plus a few other goodies. +

+(Search for "keypress" to find an answer for Unix as well.) +

+ +Edit this entry / +Log info + +/ Last changed on Mon Mar 30 16:21:46 1998 by +GvR +

+ +

+

8.3. $PYTHONPATH

+In MS-DOS derived environments, a unix variable such as $PYTHONPATH is +set as PYTHONPATH, without the dollar sign. PYTHONPATH is useful for +specifying the location of library files. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jun 11 00:41:26 1998 by +Gvr +

+ +

+

8.4. dedent syntax errors

+The FAQ does not recommend using tabs, and Guido's Python Style Guide recommends 4 spaces for distributed Python code; this is also the Emacs python-mode default; see +

+

+    http://www.python.org/doc/essays/styleguide.html
+
+Under any editor mixing tabs and spaces is a bad idea. MSVC is no different in this respect, and is easily configured to use spaces: Take Tools -> Options -> Tabs, and for file type "Default" set "Tab size" and "Indent size" to 4, and select the "Insert spaces" radio button. +

+If you suspect mixed tabs and spaces are causing problems in leading whitespace, run Python with the -t switch or, run Tools/Scripts/tabnanny.py to check a directory tree in batch mode. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Feb 12 15:04:14 2001 by +Steve Holden +

+ +

+

8.5. How do I emulate os.kill() in Windows?

+Use win32api: +

+

+    def kill(pid):
+        """kill function for Win32"""
+        import win32api
+        handle = win32api.OpenProcess(1, 0, pid)
+        return (0 != win32api.TerminateProcess(handle, 0))
+
+

+ +Edit this entry / +Log info + +/ Last changed on Sat Aug 8 18:55:06 1998 by +Jeff Bauer +

+ +

+

8.6. Why does os.path.isdir() fail on NT shared directories?

+The solution appears to be always append the "\\" on +the end of shared drives. +

+

+  >>> import os
+  >>> os.path.isdir( '\\\\rorschach\\public')
+  0
+  >>> os.path.isdir( '\\\\rorschach\\public\\')
+  1
+
+[Blake Winton responds:] +I've had the same problem doing "Start >> Run" and then a +directory on a shared drive. If I use "\\rorschach\public", +it will fail, but if I use "\\rorschach\public\", it will +work. For that matter, os.stat() does the same thing (well, +it gives an error for "\\\\rorschach\\public", but you get +the idea)... +

+I've got a theory about why this happens, but it's only +a theory. NT knows the difference between shared directories, +and regular directories. "\\rorschach\public" isn't a +directory, it's _really_ an IPC abstraction. This is sort +of lended credence to by the fact that when you're mapping +a network drive, you can't map "\\rorschach\public\utils", +but only "\\rorschach\public". +

+[Clarification by funkster@midwinter.com] +It's not actually a Python +question, as Python is working just fine; it's clearing up something +a bit muddled about Windows networked drives. +

+It helps to think of share points as being like drive letters. +Example: +

+        k: is not a directory
+        k:\ is a directory
+        k:\media is a directory
+        k:\media\ is not a directory
+
+The same rules apply if you substitute "k:" with "\\conky\foo": +
+        \\conky\foo  is not a directory
+        \\conky\foo\ is a directory
+        \\conky\foo\media is a directory
+        \\conky\foo\media\ is not a directory
+
+

+ +Edit this entry / +Log info + +/ Last changed on Sun Jan 31 08:44:48 1999 by +GvR +

+ +

+

8.7. PyRun_SimpleFile() crashes on Windows but not on Unix

+I've seen a number of reports of PyRun_SimpleFile() failing +in a Windows port of an application embedding Python that worked +fine on Unix. PyRun_SimpleString() works fine on both platforms. +

+I think this happens because the application was compiled with a +different set of compiler flags than Python15.DLL. It seems that some +compiler flags affect the standard I/O library in such a way that +using different flags makes calls fail. You need to set it for +the non-debug multi-threaded DLL (/MD on the command line, or can be set via MSVC under Project Settings->C++/Code Generation then the "Use rum-time library" dropdown.) +

+Also note that you can not mix-and-match Debug and Release versions. If you wish to use the Debug Multithreaded DLL, then your module _must_ have an "_d" appended to the base name. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Nov 17 17:37:07 1999 by +Mark Hammond +

+ +

+

8.8. Import of _tkinter fails on Windows 95/98

+Sometimes, the import of _tkinter fails on Windows 95 or 98, +complaining with a message like the following: +

+

+  ImportError: DLL load failed: One of the library files needed
+  to run this application cannot be found.
+
+It could be that you haven't installed Tcl/Tk, but if you did +install Tcl/Tk, and the Wish application works correctly, +the problem may be that its installer didn't +manage to edit the autoexec.bat file correctly. It tries to add a +statement that changes the PATH environment variable to include +the Tcl/Tk 'bin' subdirectory, but sometimes this edit doesn't +quite work. Opening it with notepad usually reveals what the +problem is. +

+(One additional hint, noted by David Szafranski: you can't use +long filenames here; e.g. use C:\PROGRA~1\Tcl\bin instead of +C:\Program Files\Tcl\bin.) +

+ +Edit this entry / +Log info + +/ Last changed on Wed Dec 2 22:32:41 1998 by +GvR +

+ +

+

8.9. Can't extract the downloaded documentation on Windows

+Sometimes, when you download the documentation package to a Windows +machine using a web browser, the file extension of the saved file +ends up being .EXE. This is a mistake; the extension should be .TGZ. +

+Simply rename the downloaded file to have the .TGZ extension, and +WinZip will be able to handle it. (If your copy of WinZip doesn't, +get a newer one from http://www.winzip.com.) +

+ +Edit this entry / +Log info + +/ Last changed on Sat Nov 21 13:41:35 1998 by +GvR +

+ +

+

8.10. Can't get Py_RunSimpleFile() to work.

+This is very sensitive to the compiler vendor, version and (perhaps) +even options. If the FILE* structure in your embedding program isn't +the same as is assumed by the Python interpreter it won't work. +

+The Python 1.5.* DLLs (python15.dll) are all compiled +with MS VC++ 5.0 and with multithreading-DLL options (/MD, I think). +

+If you can't change compilers or flags, try using Py_RunSimpleString(). +A trick to get it to run an arbitrary file is to construct a call to +execfile() with the name of your file as argument. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jan 13 10:58:14 1999 by +GvR +

+ +

+

8.11. Where is Freeze for Windows?

+("Freeze" is a program that allows you to ship a Python program +as a single stand-alone executable file. It is not a compiler, +your programs don't run any faster, but they are more easily +distributable (to platforms with the same OS and CPU). Read the +README file of the freeze program for more disclaimers.) +

+You can use freeze on Windows, but you must download the source +tree (see http://www.python.org/download/download_source.html). +This is recommended for Python 1.5.2 (and betas thereof) only; +older versions don't quite work. +

+You need the Microsoft VC++ 5.0 compiler (maybe it works with +6.0 too). You probably need to build Python -- the project files +are all in the PCbuild directory. +

+The freeze program is in the Tools\freeze subdirectory of the source +tree. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Feb 17 18:47:24 1999 by +GvR +

+ +

+

8.12. Is a *.pyd file the same as a DLL?

+Yes, .pyd files are dll's. But there are a few differences. If you +have a DLL named foo.pyd, then it must have a function initfoo(). You +can then write Python "import foo", and Python will search for foo.pyd +(as well as foo.py, foo.pyc) and if it finds it, will attempt to call +initfoo() to initialize it. You do not link your .exe with foo.lib, +as that would cause Windows to require the DLL to be present. +

+Note that the search path for foo.pyd is PYTHONPATH, not the same as +the path that Windows uses to search for foo.dll. Also, foo.pyd need +not be present to run your program, whereas if you linked your program +with a dll, the dll is required. Of course, foo.pyd is required if +you want to say "import foo". In a dll, linkage is declared in the +source code with __declspec(dllexport). In a .pyd, linkage is defined +in a list of available functions. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Nov 23 02:40:08 1999 by +Jameson Quinn +

+ +

+

8.13. Missing cw3215mt.dll (or missing cw3215.dll)

+Sometimes, when using Tkinter on Windows, you get an error that +cw3215mt.dll or cw3215.dll is missing. +

+Cause: you have an old Tcl/Tk DLL built with cygwin in your path +(probably C:\Windows). You must use the Tcl/Tk DLLs from the +standard Tcl/Tk installation (Python 1.5.2 comes with one). +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 11 00:54:13 1999 by +GvR +

+ +

+

8.14. How to make python scripts executable:

+[Blake Coverett] +

+Win2K: +

+The standard installer already associates the .py extension with a file type +(Python.File) and gives that file type an open command that runs the +interpreter (D:\Program Files\Python\python.exe "%1" %*). This is enough to +make scripts executable from the command prompt as 'foo.py'. If you'd +rather be able to execute the script by simple typing 'foo' with no +extension you need to add .py to the PATHEXT environment variable. +

+WinNT: +

+The steps taken by the installed as described above allow you do run a +script with 'foo.py', but a long time bug in the NT command processor +prevents you from redirecting the input or output of any script executed in +this way. This is often important. +

+An appropriate incantation for making a Python script executable under WinNT +is to give the file an extension of .cmd and add the following as the first +line: +

+

+    @setlocal enableextensions & python -x %~f0 %* & goto :EOF
+
+Win9x: +

+[Due to Bruce Eckel] +

+

+  @echo off
+  rem = """
+  rem run python on this bat file. Needs the full path where
+  rem you keep your python files. The -x causes python to skip
+  rem the first line of the file:
+  python -x c:\aaa\Python\\"%0".bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+  goto endofpython
+  rem """
+
+
+  # The python program goes here:
+
+
+  print "hello, Python"
+
+
+  # For the end of the batch file:
+  rem = """
+  :endofpython
+  rem """
+
+

+ +Edit this entry / +Log info + +/ Last changed on Tue Nov 30 10:25:17 1999 by +GvR +

+ +

+

8.15. Warning about CTL3D32 version from installer

+The Python installer issues a warning like this: +

+

+  This version uses CTL3D32.DLL whitch is not the correct version.
+  This version is used for windows NT applications only.
+
+[Tim Peters] +This is a Microsoft DLL, and a notorious +source of problems. The msg means what it says: you have the wrong version +of this DLL for your operating system. The Python installation did not +cause this -- something else you installed previous to this overwrote the +DLL that came with your OS (probably older shareware of some sort, but +there's no way to tell now). If you search for "CTL3D32" using any search +engine (AltaVista, for example), you'll find hundreds and hundreds of web +pages complaining about the same problem with all sorts of installation +programs. They'll point you to ways to get the correct version reinstalled +on your system (since Python doesn't cause this, we can't fix it). +

+David A Burton has written a little program to fix this. Go to +http://www.burtonsys.com/download.html and click on "ctl3dfix.zip" +

+ +Edit this entry / +Log info + +/ Last changed on Thu Oct 26 15:42:00 2000 by +GvR +

+ +

+

8.16. How can I embed Python into a Windows application?

+Edward K. Ream <edream@tds.net> writes +

+When '##' appears in a file name below, it is an abbreviated version number. For example, for Python 2.1.1, ## will be replaced by 21. +

+Embedding the Python interpreter in a Windows app can be summarized as +follows: +

+1. Do _not_ build Python into your .exe file directly. On Windows, +Python must be a DLL to handle importing modules that are themselves +DLL's. (This is the first key undocumented fact.) Instead, link to +python##.dll; it is typically installed in c:\Windows\System. +

+You can link to Python statically or dynamically. Linking statically +means linking against python##.lib The drawback is that your app won't +run if python##.dll does not exist on your system. +

+General note: python##.lib is the so-called "import lib" corresponding +to python.dll. It merely defines symbols for the linker. +

+Borland note: convert python##.lib to OMF format using Coff2Omf.exe +first. +

+Linking dynamically greatly simplifies link options; everything happens +at run time. Your code must load python##.dll using the Windows +LoadLibraryEx() routine. The code must also use access routines and +data in python##.dll (that is, Python's C API's) using pointers +obtained by the Windows GetProcAddress() routine. Macros can make +using these pointers transparent to any C code that calls routines in +Python's C API. +

+2. If you use SWIG, it is easy to create a Python "extension module" +that will make the app's data and methods available to Python. SWIG +will handle just about all the grungy details for you. The result is C +code that you link _into your .exe file_ (!) You do _not_ have to +create a DLL file, and this also simplifies linking. +

+3. SWIG will create an init function (a C function) whose name depends +on the name of the extension module. For example, if the name of the +module is leo, the init function will be called initleo(). If you use +SWIG shadow classes, as you should, the init function will be called +initleoc(). This initializes a mostly hidden helper class used by the +shadow class. +

+The reason you can link the C code in step 2 into your .exe file is that +calling the initialization function is equivalent to importing the +module into Python! (This is the second key undocumented fact.) +

+4. In short, you can use the following code to initialize the Python +interpreter with your extension module. +

+

+    #include "python.h"
+    ...
+    Py_Initialize();  // Initialize Python.
+    initmyAppc();  // Initialize (import) the helper class. 
+    PyRun_SimpleString("import myApp") ;  // Import the shadow class.
+
+5. There are two problems with Python's C API which will become apparent +if you use a compiler other than MSVC, the compiler used to build +python##.dll. +

+Problem 1: The so-called "Very High Level" functions that take FILE * +arguments will not work in a multi-compiler environment; each compiler's +notion of a struct FILE will be different. From an implementation +standpoint these are very _low_ level functions. +

+Problem 2: SWIG generates the following code when generating wrappers to +void functions: +

+

+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+
+Alas, Py_None is a macro that expands to a reference to a complex data +structure called _Py_NoneStruct inside python##.dll. Again, this code +will fail in a mult-compiler environment. Replace such code by: +

+

+    return Py_BuildValue("");
+
+It may be possible to use SWIG's %typemap command to make the change +automatically, though I have not been able to get this to work (I'm a +complete SWIG newbie). +

+6. Using a Python shell script to put up a Python interpreter window +from inside your Windows app is not a good idea; the resulting window +will be independent of your app's windowing system. Rather, you (or the +wxPythonWindow class) should create a "native" interpreter window. It +is easy to connect that window to the Python interpreter. You can +redirect Python's i/o to _any_ object that supports read and write, so +all you need is a Python object (defined in your extension module) that +contains read() and write() methods. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jan 31 16:29:34 2002 by +Victor Kryukov +

+ +

+

8.17. Setting up IIS 5 to use Python for CGI

+In order to set up Internet Information Services 5 to use Python for CGI processing, please see the following links: +

+http://www.e-coli.net/pyiis_server.html (for Win2k Server) +http://www.e-coli.net/pyiis.html (for Win2k pro) +

+ +Edit this entry / +Log info + +/ Last changed on Fri Mar 22 22:05:51 2002 by +douglas savitsky +

+ +

+

8.18. How do I run a Python program under Windows?

+This is not necessarily quite the straightforward question it appears +to be. If you are already familiar with running programs from the +Windows command line then everything will seem really easy and +obvious. If your computer experience is limited then you might need a +little more guidance. Also there are differences between Windows 95, +98, NT, ME, 2000 and XP which can add to the confusion. You might +think of this as "why I pay software support charges" if you have a +helpful and friendly administrator to help you set things up without +having to understand all this yourself. If so, then great! Show them +this page and it should be a done deal. +

+Unless you use some sort of integrated development environment (such +as PythonWin or IDLE, to name only two in a growing family) then you +will end up typing Windows commands into what is variously referred +to as a "DOS window" or "Command prompt window". Usually you can +create such a window from your Start menu (under Windows 2000 I use +"Start | Programs | Accessories | Command Prompt"). You should be +able to recognize when you have started such a window because you will +see a Windows "command prompt", which usually looks like this: +

+

+    C:\>
+
+The letter may be different, and there might be other things after it, +so you might just as easily see something like: +

+

+    D:\Steve\Projects\Python>
+
+depending on how your computer has been set up and what else you have +recently done with it. Once you have started such a window, you are +well on the way to running Python programs. +

+You need to realize that your Python scripts have to be processed by +another program, usually called the "Python interpreter". The +interpreter reads your script, "compiles" it into "Python bytecodes" +(which are instructions for an imaginary computer known as the "Python +Virtual Machine") and then executes the bytecodes to run your +program. So, how do you arrange for the interpreter to handle your +Python? +

+First, you need to make sure that your command window recognises the +word "python" as an instruction to start the interpreter. If you have +opened a command window, you should try entering the command: +

+

+    python
+
+and hitting return. If you then see something like: +

+

+    Python 2.2 (#28, Dec 21 2001, 12:21:22) [MSC 32 bit (Intel)] on win32
+    Type "help", "copyright", "credits" or "license" for more information.
+    >>>
+
+then this part of the job has been correctly managed during Python's +installation process, and you have started the interpreter in +"interactive mode". That means you can enter Python statements or +expressions interactively and have them executed or evaluated while +you wait. This is one of Python's strongest features, but it takes a +little getting used to. Check it by entering a few expressions of your +choice and seeing the results... +

+

+    >>> print "Hello"
+    Hello
+    >>> "Hello" * 3
+    HelloHelloHello
+
+When you want to end your interactive Python session, enter a +terminator (hold the Ctrl key down while you enter a Z, then hit the +"Enter" key) to get back to your Windows command prompt. You may also +find that you have a Start-menu entry such as "Start | Programs | +Python 2.2 | Python (command line)" that results in you seeing the +">>>" prompt in a new window. If so, the window will disappear after +you enter the terminator -- Windows runs a single "python" command in +the window, which terminates when you terminate the interpreter. +

+If the "python" command, instead of displaying the interpreter prompt ">>>", gives you a message like +

+

+    'python' is not recognized as an internal or external command,
+    operable program or batch file.
+
+or +

+

+    Bad command or filename
+
+then you need to make sure that your computer knows where to find the +Python interpreter. To do this you will have to modify a setting +called the PATH, which is a just list of directories where Windows +will look for programs. Rather than just enter the right command every +time you create a command window, you should arrange for Python's +installation directory to be added to the PATH of every command window +as it starts. If you installed Python fairly recently then the command +

+

+    dir C:\py*
+
+will probably tell you where it is installed. Alternatively, perhaps +you made a note. Otherwise you will be reduced to a search of your +whole disk ... break out the Windows explorer and use "Tools | Find" +or hit the "Search" button and look for "python.exe". Suppose you +discover that Python is installed in the C:\Python22 directory (the +default at the time of writing) then you should make sure that +entering the command +

+

+    c:\Python22\python
+
+starts up the interpreter as above (and don't forget you'll need a +"CTRL-Z" and an "Enter" to get out of it). Once you have verified the +directory, you need to add it to the start-up routines your computer +goes through. For older versions of Windows the easiest way to do +this is to edit the C:\AUTOEXEC.BAT file. You would want to add a line +like the following to AUTOEXEC.BAT: +

+

+    PATH C:\Python22;%PATH%
+
+For Windows NT, 2000 and (I assume) XP, you will need to add a string +such as +

+

+    ;C:\Python22
+
+to the current setting for the PATH environment variable, which you +will find in the properties window of "My Computer" under the +"Advanced" tab. Note that if you have sufficient privilege you might +get a choice of installing the settings either for the Current User or +for System. The latter is preferred if you want everybody to be able +to run Python on the machine. +

+If you aren't confident doing any of these manipulations yourself, ask +for help! At this stage you may or may not want to reboot your system +to make absolutely sure the new setting has "taken" (don't you love +the way Windows gives you these freqeuent coffee breaks). You probably +won't need to for Windows NT, XP or 2000. You can also avoid it in +earlier versions by editing the file C:\WINDOWS\COMMAND\CMDINIT.BAT +instead of AUTOEXEC.BAT. +

+You should now be able to start a new command window, enter +

+

+    python
+
+at the "C:>" (or whatever) prompt, and see the ">>>" prompt that +indicates the Python interpreter is reading interactive commands. +

+Let's suppose you have a program called "pytest.py" in directory +"C:\Steve\Projects\Python". A session to run that program might look +like this: +

+

+    C:\> cd \Steve\Projects\Python
+    C:\Steve\Projects\Python> python pytest.py
+
+Because you added a file name to the command to start the interpreter, +when it starts up it reads the Python script in the named file, +compiles it, executes it, and terminates (so you see another "C:\>" +prompt). You might also have entered +

+

+    C:\> python \Steve\Projects\Python\pytest.py
+
+if you hadn't wanted to change your current directory. +

+Under NT, 2000 and XP you may well find that the installation process +has also arranged that the command +

+

+    pytest.py
+
+(or, if the file isn't in the current directory) +

+

+    C:\Steve\Projects\Python\pytest.py
+
+will automatically recognize the ".py" extension and run the Python +interpreter on the named file. Using this feature is fine, but some +versions of Windows have bugs which mean that this form isn't exactly +equivalent to using the interpreter explicitly, so be careful. Easier +to remember, for now, that +

+

+    python C:\Steve\Projects\Python\pytest.py
+
+works pretty close to the same, and redirection will work (more) +reliably. +

+The important things to remember are: +

+1. Start Python from the Start Menu, or make sure the PATH is set +correctly so Windows can find the Python interpreter. +

+

+    python
+
+should give you a '>>>" prompt from the Python interpreter. Don't +forget the CTRL-Z and ENTER to terminate the interpreter (and, if you +started the window from the Start Menu, make the window disappear). +

+2. Once this works, you run programs with commands: +

+

+    python {program-file}
+
+3. When you know the commands to use you can build Windows shortcuts +to run the Python interpreter on any of your scripts, naming +particular working directories, and adding them to your menus, but +that's another lessFAQ. Take a look at +

+

+    python --help
+
+if your needs are complex. +

+4. Interactive mode (where you see the ">>>" prompt) is best used +not for running programs, which are better executed as in steps 2 +and 3, but for checking that individual statements and expressions do +what you think they will, and for developing code by experiment. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Aug 20 16:19:53 2002 by +GvR +

+ +

+Python home / +Python FAQ Wizard 1.0.3 / +Feedback to GvR +

Python Powered
+ + --- python2.6-2.6.2.orig/debian/PVER-minimal.README.Debian.in +++ python2.6-2.6.2/debian/PVER-minimal.README.Debian.in @@ -0,0 +1,127 @@ +Contents of the @PVER@-minimal package +----------------------------------------- + +@PVER@-minimal consists of a minimum set of modules which may be needed +for python scripts used during the boot process. If other packages +are needed in these scripts, don't work around the missing module, but +file a bug report against this package. The modules in this package +are: + + __builtin__ builtin + __future__ module + _abcoll module + _bisect extension + _bytesio extension + _codecs builtin + _collections extension + _fileio extension + _functools extension + _locale extension + _random extension + _socket extension + _sre builtin + _struct extension + _symtable builtin + _types builtin + _warnings builtin + _weakref extension + abc module + ConfigParser module + StringIO module + UserDict module + cPickle extension + cStringIO extension + array extension + binascii extension + collections module + compileall module + copy module + copy_reg module + dis module + errno builtin + exceptions builtin + fcntl extension + fnmatch module + gc builtin + genericpath module + getopt module + glob module + grp extension + hashlib module + imp builtin + inspect module + itertools extension + keyword module + linecache module + marshal builtin + math extension + md5 module + opcode module + operator extension + optparse module + os module + pickle module + platform module + popen2 module + posix builtin + posixpath module + pwd builtin + py_compile module + random module + re module + repr module + select extension + sha module + signal builtin + socket module + spwd extension + sre module + sre_compile module + sre_constants module + sre_parse module + stat module + string module + strop extension + struct module + subprocess module + sys builtin + syslog extension + tempfile module + textwrap module + time extension + token module + thread builtin + token module + tokenize module + traceback module + types module + unicodedata extension + warnings module + zlib extension + +Included are as well the codecs and stringprep modules, and the encodings +modules for all encodings except the multibyte encodings and the bz2 codec. + +The following modules are excluded, their import is guarded from the +importing module (i.e. omit the import of _ssl in socket): + + _hashlib hashlib + os nt ntpath os2 os2emxpath mac macpath + riscos riscospath riscosenviron + optparse gettext + pickle doctest + platform tempfile + socket _ssl + subprocess threading + +This list was derived by looking at the modules in the perl-base package, +then adding python specific "core modules". + +TODO's +------ + +- time.strptime cannot be used. The required _strptime module is not + included in the -minimal package yet. _strptime, locale, _locale and + calendar have to be added. + +- modules used very often in the testsuite: copy, cPickle, operator. --- python2.6-2.6.2.orig/debian/PVER-dbg.symbols.in +++ python2.6-2.6.2/debian/PVER-dbg.symbols.in @@ -0,0 +1,25 @@ +libpython@VER@_d.so.1.0 python@VER@-dbg #MINVER# + Py_InitModule4TraceRefs@Base @VER@ +#include "libpython.symbols" + _PyDict_Dummy@Base @VER@ + _PyObject_DebugCheckAddress@Base @VER@ + _PyObject_DebugDumpAddress@Base @VER@ + _PyObject_DebugFree@Base @VER@ + _PyObject_DebugMalloc@Base @VER@ + _PyObject_DebugMallocStats@Base @VER@ + _PyObject_DebugRealloc@Base @VER@ + _PySet_Dummy@Base @VER@ + _Py_AddToAllObjects@Base @VER@ + _Py_Dealloc@Base @VER@ + _Py_ForgetReference@Base @VER@ + _Py_GetObjects@Base @VER@ + _Py_GetRefTotal@Base @VER@ + _Py_NegativeRefcount@Base @VER@ + _Py_NewReference@Base @VER@ + _Py_PrintReferenceAddresses@Base @VER@ + _Py_PrintReferences@Base @VER@ + _Py_RefTotal@Base @VER@ + _Py_dumptree@Base @VER@ + _Py_printtree@Base @VER@ + _Py_showtree@Base @VER@ + _Py_tok_dump@Base @VER@ --- python2.6-2.6.2.orig/debian/PVER.pycentral.in +++ python2.6-2.6.2/debian/PVER.pycentral.in @@ -0,0 +1,4 @@ +[@PVER@] +runtime: @PVER@ +interpreter: /usr/bin/@PVER@ +prefix: /usr/lib/@PVER@ --- python2.6-2.6.2.orig/debian/PVER-doc.doc-base.PVER-doc.in +++ python2.6-2.6.2/debian/PVER-doc.doc-base.PVER-doc.in @@ -0,0 +1,19 @@ +Document: @PVER@-doc +Title: Documenting Python (v@VER@) +Author: Fred L. Drake, Jr. +Abstract: The Python language has a substantial body of documentation, much + of it contributed by various authors. The markup used for the Python + documentation is based on LATEX and requires a significant set of + macros written specifically for documenting Python. This document + describes the macros introduced to support Python documentation and + how they should be used to support a wide range of output formats. + . + This document describes the document classes and special markup used + in the Python documentation. Authors may use this guide, in + conjunction with the template files provided with the distribution, + to create or maintain whole documents or sections. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/documenting/index.html +Files: /usr/share/doc/@PVER@/html/documenting/*.html --- python2.6-2.6.2.orig/debian/PVER-dbg.postinst.in +++ python2.6-2.6.2/debian/PVER-dbg.postinst.in @@ -0,0 +1,29 @@ +#! /bin/sh -e + +PACKAGE=@PVER@-dbg + +case "$1" in + configure|abort-upgrade|abort-remove|abort-deconfigure) + + # Create empty debug directories in /usr/local + if [ ! -e /usr/local/lib/@PVER@ ]; then + mkdir -p /usr/local/lib/@PVER@ + chmod 2775 /usr/local/lib/@PVER@ + chown root:staff /usr/local/lib/@PVER@ + fi + if [ ! -e /usr/local/lib/@PVER@/site-packages/debug ]; then + mkdir -p /usr/local/lib/@PVER@/site-packages/debug + chmod 2775 /usr/local/lib/@PVER@/site-packages/debug + chown root:staff /usr/local/lib/@PVER@/site-packages/debug + fi + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- python2.6-2.6.2.orig/debian/README.Tk +++ python2.6-2.6.2/debian/README.Tk @@ -0,0 +1,8 @@ +Tkinter documentation can be found at + + http://www.pythonware.com/library/index.htm + +more specific: + + http://www.pythonware.com/library/tkinter/introduction/index.htm + http://www.pythonware.com/library/tkinter/an-introduction-to-tkinter.pdf --- python2.6-2.6.2.orig/debian/README.maintainers.in +++ python2.6-2.6.2/debian/README.maintainers.in @@ -0,0 +1,88 @@ + +Hints for maintainers of Debian packages of Python extensions +------------------------------------------------------------- + +Most of the content of this README can be found in the Debian Python policy. +See /usr/share/doc/python/python-policy.txt.gz. + +Documentation Tools +------------------- + +If your package ships documentation produced in the Python +documentation format, you can generate it at build-time by +build-depending on @PVER@-dev, and you will find the +templates, tools and scripts in /usr/lib/@PVER@/doc/tools -- +adjust your build scripts accordingly. + + +Makefile.pre.in issues +---------------------- + +Python comes with a `universal Unix Makefile for Python extensions' in +/usr/lib/@PVER@/config/Makefile.pre.in (with Debian, this is included +in the python-dev package), which is used by most Python extensions. + +In general, packages using the Makefile.pre.in approach can be packaged +simply by running dh_make or by using one of debhelper's rules' templates +(see /usr/doc/debhelper/examples/). Makefile.pre.in works fine with e.g. +"make prefix=debian/tmp/usr install". + +One glitch: You may be running into the problem that Makefile.pre.in +doesn't try to create all the directories when they don't exist. Therefore, +you may have to create them manually before "make install". In most cases, +the following should work: + + ... + dh_installdirs /usr/lib/@PVER@ + $(MAKE) prefix=debian/tmp/usr install + ... + + +Byte-compilation +---------------- + +For speed reasons, Python internally compiles source files into a byte-code. +To speed up subsequent imports, it tries to save the byte-code along with +the source with an extension .pyc (resp. pyo). This will fail if the +libraries are installed in a non-writable directory, which may be the +case for /usr/lib/@PVER@/. + +Not that .pyc and .pyo files should not be relocated, since for debugging +purposes the path of the source for is hard-coded into them. + +To precompile files in batches after installation, Python has a script +compileall.py, which compiles all files in a given directory tree. The +Debian version of compileall has been enhanced to support incremental +compilation and to feature a ddir (destination dir) option. ddir is +used to compile files in debian/usr/lib/python/ when they will be +installed into /usr/lib/python/. + + +Currently, there are two ways to use compileall for Debian packages. The +first has a speed penalty, the second has a space penalty in the package. + +1.) Compiling and removing .pyc files in postinst/prerm: + + Use dh_python(1) from the debhelper packages to add commands to byte- + compile on installation and to remove the byte-compiled files on removal. + Your package has to build-depend on: debhelper (>= 4.1.67), python. + + In /usr/share/doc/@PVER@, you'll find sample.postinst and sample.prerm. + If you set the directory where the .py files are installed, these + scripts will install and remove the .pyc and .pyo files for your + package after unpacking resp. before removing the package. + +2.) Compiling the .pyc files `out of place' during installation: + + As of 1.5.1, compileall.py allows you to specify a faked installation + directory using the "-d destdir" option, so that you can precompile + the files in their temporary directory + (e.g. debian/tmp/usr/lib/python2.1/site-packages/PACKAGE). + + + + 11/02/98 + Gregor Hoffleit + + +Last modified: 2007-10-14 --- python2.6-2.6.2.orig/debian/PVER-dbg.README.Debian.in +++ python2.6-2.6.2/debian/PVER-dbg.README.Debian.in @@ -0,0 +1,51 @@ +Contents of the @PVER@-dbg package +------------------------------------- + +For debugging python and extension modules, you may want to add the contents +of /usr/share/doc/@PVER@/gdbinit to your ~/.gdbinit file. + +@PVER@-dbg contains two sets of packages: + + - debugging symbols for the standard @PVER@ build. When this package + is installed, gdb will automatically load up the debugging symbols + from it when debugging @PVER@ or one of the included extension + modules. + + - a separate @PVER@-dbg binary, configured --with-pydebug, enabling the + additional debugging code to help debug memory management problems. + +For the latter, all extension modules have to be recompiled to +correctly load with an pydebug enabled build. + + +Debian and Ubuntu specific changes to the debug interpreter +----------------------------------------------------------- +The python2.4 and python2.5 packages in Ubuntu feisty are modified to +first look for extension modules under a different name. + + normal build: foo.so + debug build: foo_d.so foo.so + +This naming schema allows installation of the extension modules into +the same path (The naming is directly taken from the Windows builds +which already uses this naming scheme). + +See https://wiki.ubuntu.com/PyDbgBuilds for more information. + + +Using the python-dbg builds +--------------------------- + + * Call the python-dbg or the pythonX.Y-dbg binaries instead of the + python or pythonX.Y binaries. + + * Properties of the debug build are described in + /usr/share/doc/@PVER@/SpecialBuilds.txt.gz. + The debug interpreter is built with Py_DEBUG defined. + + * From SpecialBuilds.txt: This is what is generally meant by "a debug + build" of Python. Py_DEBUG implies LLTRACE, Py_REF_DEBUG, + Py_TRACE_REFS, and PYMALLOC_DEBUG (if WITH_PYMALLOC is enabled). + In addition, C assert()s are enabled (via the C way: by not defining + NDEBUG), and some routines do additional sanity checks inside + "#ifdef Py_DEBUG" blocks. --- python2.6-2.6.2.orig/debian/PVER-dbg.overrides.in +++ python2.6-2.6.2/debian/PVER-dbg.overrides.in @@ -0,0 +1,2 @@ +@PVER@-dbg binary: package-name-doesnt-match-sonames +@PVER@-dbg binary: non-dev-pkg-with-shlib-symlink --- python2.6-2.6.2.orig/debian/PVER-minimal.postinst.in +++ python2.6-2.6.2/debian/PVER-minimal.postinst.in @@ -0,0 +1,76 @@ +#! /bin/sh + +set -e + +if [ ! -f /etc/@PVER@/sitecustomize.py ]; then + cat <<-EOF + # Empty sitecustomize.py to avoid a dangling symlink +EOF +fi + +syssite=/usr/lib/@PVER@/site-packages +localsite=/usr/local/lib/@PVER@/dist-packages +syslink=../../${localsite#/usr/*} + +case "$1" in + configure) + # Create empty directories in /usr/local + if [ ! -e /usr/local/lib/@PVER@ ]; then + mkdir -p /usr/local/lib/@PVER@ 2> /dev/null || true + chmod 2775 /usr/local/lib/@PVER@ 2> /dev/null || true + chown root:staff /usr/local/lib/@PVER@ 2> /dev/null || true + fi + if [ ! -e $localsite ]; then + mkdir -p $localsite 2> /dev/null || true + chmod 2775 $localsite 2> /dev/null || true + chown root:staff $localsite 2> /dev/null || true + fi + #if [ ! -h $syssite ]; then + # ln -s $syslink $syssite + #fi + + if which update-binfmts >/dev/null; then + update-binfmts --import @PVER@ + fi + + ;; +esac + +if [ "$1" = configure ]; then + ( + files=$(dpkg -L @PVER@-minimal | sed -n '/^\/usr\/lib\/@PVER@\/.*\.py$/p') + @PVER@ /usr/lib/@PVER@/py_compile.py $files + if grep -sq '^byte-compile[^#]*optimize' /etc/python/debian_config; then + @PVER@ -O /usr/lib/@PVER@/py_compile.py $files + fi + ) + bc=no + #if [ -z "$2" ] || dpkg --compare-versions "$2" lt 2.6.1-1ubuntu8 \ + # || [ -f /var/lib/python/@PVER@_installed ]; then + # bc=yes + #fi + if grep -sq '^unsupported-versions[^#]*@PVER@' /usr/share/python/debian_defaults + then + # FIXME: byte compile anyway? + bc=no + fi + if [ "$bc" = yes ]; then + # new installation or installation of first version with hook support + if [ "$DEBIAN_FRONTEND" != noninteractive ]; then + echo "Linking and byte-compiling packages for runtime @PVER@..." + fi + version=$(dpkg -s @PVER@-minimal | awk '/^Version:/ {print $2}') + for hook in /usr/share/python/runtime.d/*.rtinstall; do + [ -x $hook ] || continue + $hook rtinstall @PVER@ "$2" "$version" + done + if [ -f /var/lib/python/@PVER@_installed ]; then + rm -f /var/lib/python/@PVER@_installed + rmdir --ignore-fail-on-non-empty /var/lib/python 2>/dev/null + fi + fi +fi + +#DEBHELPER# + +exit 0 --- python2.6-2.6.2.orig/debian/pdb.1.in +++ python2.6-2.6.2/debian/pdb.1.in @@ -0,0 +1,16 @@ +.TH PDB@VER@ 1 +.SH NAME +pdb@VER@ \- the Python debugger +.SH SYNOPSIS +.PP +.B pdb@VER@ +.I script [...] +.SH DESCRIPTION +.PP +See /usr/lib/python@VER@/pdb.doc for more information on the use +of pdb. When the debugger is started, help is available via the +help command. +.SH SEE ALSO +python@VER@(1). Chapter 9 of the Python Library Reference +(The Python Debugger). Available in the python@VER@-doc package at +/usr/share/doc/python2.3/html/lib/module-pdb.html. --- python2.6-2.6.2.orig/debian/rules +++ python2.6-2.6.2/debian/rules @@ -0,0 +1,1074 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. + +unexport LANG LC_ALL LC_CTYPE LC_COLLATE LC_TIME LC_NUMERIC LC_MESSAGES + +export SHELL = /bin/bash + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) + +changelog_values := $(shell dpkg-parsechangelog \ + | awk '/^(Version|Source):/ {print $$2}') +PKGSOURCE := $(word 1, $(changelog_values)) +PKGVERSION := $(word 2, $(changelog_values)) + +on_buildd := $(shell [ -f /CurrentlyBuilding -o "$$LOGNAME" = buildd ] && echo yes) + +ifneq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) + WITHOUT_CHECK := yes +endif +ifeq ($(on_buildd),yes) + ifneq (,$(findstring $(DEB_BUILD_ARCH), hppa s390)) + WITHOUT_CHECK := yes + endif +endif + +COMMA = , +ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) + NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) +endif + +distribution := $(shell lsb_release -is) +#distribution := Ubuntu + +export VER=2.6 +export NVER=2.7 +export PVER=python2.6 +export PRIORITY=$(shell echo $(VER) | tr -d '.')0 + +PREVVER := $(shell awk '/^python/ && NR > 1 {print substr($$2,2,length($$2)-2); exit}' debian/changelog) + +# default versions are built from the python-defaults source package +# keep the definition to adjust package priorities. +DEFAULT_VERSION = no +STATIC_PYTHON=yes + +MIN_MODS := $(shell awk '/^ / && $$2 == "module" { print $$1 }' \ + debian/PVER-minimal.README.Debian.in) +MIN_EXTS := $(shell awk '/^ / && $$2 == "extension" { print $$1 }' \ + debian/PVER-minimal.README.Debian.in) +MIN_BUILTINS := $(shell awk '/^ / && $$2 == "builtin" { print $$1 }' \ + debian/PVER-minimal.README.Debian.in) +MIN_ENCODINGS := $(foreach i, \ + $(filter-out \ + big5% bz2% cp932.py cp949.py cp950.py euc_% \ + gb% iso2022% johab.py shift_jis% , \ + $(shell cd Lib/encodings && echo *.py)), \ + encodings/$(i)) \ + codecs.py stringprep.py + +with_tk := no +with_gdbm := no +with_interp := static +#with_interp := shared + +build_target := build-all +install_target := install + +PY_INTERPRETER = /usr/bin/python$(VER) + +ifeq ($(DEFAULT_VERSION),yes) + PY_PRIO = standard + #PYSTDDEP = , python (>= $(VER)) +else + PY_PRIO = optional +endif +ifeq ($(distribution),Ubuntu) + PY_MINPRIO = required + with_fpectl = yes +else + PY_MINPRIO = $(PY_PRIO) + with_fpectl = yes +endif + +CC = gcc + +# on alpha, use -O2 only, use -mieee +ifeq ($(DEB_BUILD_ARCH),alpha) + OPTSETTINGS = OPT="-g -O2 -mieee -Wall -Wstrict-prototypes" + OPTDEBUGSETTINGS = OPT="-g -O0 -mieee -Wall -Wstrict-prototypes" +endif +ifeq ($(DEB_BUILD_ARCH),m68k) + OPTSETTINGS = OPT="-g -O2 -Wall -Wstrict-prototypes" +endif + +PWD := $(shell pwd) +buildd_static := $(CURDIR)/build-static +buildd_shared := $(CURDIR)/build-shared +buildd_debug := $(CURDIR)/build-debug +buildd_shdebug := $(CURDIR)/build-shdebug + +d := debian/tmp +scriptdir = usr/share/lib/python$(VER) +scriptdir = usr/share/python$(VER) +scriptdir = usr/lib/python$(VER) + +# package names and directories +p_base := $(PVER) +p_min := $(PVER)-minimal +p_lib := lib$(PVER) +p_tk := $(PVER)-tk +p_gdbm := $(PVER)-gdbm +p_dev := $(PVER)-dev +p_exam := $(PVER)-examples +p_idle := idle-$(PVER) +p_doc := $(PVER)-doc +p_dbg := $(PVER)-dbg + +d_base := debian/$(p_base) +d_min := debian/$(p_min) +d_lib := debian/$(p_lib) +d_tk := debian/$(p_tk) +d_gdbm := debian/$(p_gdbm) +d_dev := debian/$(p_dev) +d_exam := debian/$(p_exam) +d_idle := debian/$(p_idle) +d_doc := debian/$(p_doc) +d_dbg := debian/$(p_dbg) + +# profiled build fails on amd64, lpia, sparc +ifneq (,$(filter $(DEB_BUILD_ARCH), amd64 armel lpia sparc)) + make_build_target = +else + make_build_target = profile-opt +endif +make_build_target = + +build: $(build_target) +build-all: stamp-build +stamp-build: stamp-build-static stamp-build-shared stamp-build-debug stamp-build-shared-debug stamp-mincheck stamp-check stamp-pystone stamp-pybench + touch stamp-build + +PROFILE_EXCLUDES = test_compiler test_distutils test_platform test_subprocess \ + test_pstats test_profile test_multiprocessing test_cprofile \ + test_thread test_threaded_import test_threadedtempfile \ + test_threading test_threading_local test_threadsignals \ + test_dbm_dumb test_dbm_ndbm test_pydoc test_sundry + +ifneq (,$(filter $(DEB_BUILD_ARCH), arm armel)) + PROFILE_EXCLUDES += test_float +endif +PROFILE_EXCLUDES += test_zipfile + +PROFILE_TASK = ../Lib/test/regrtest.py \ + -x $(sort $(TEST_EXCLUDES) $(PROFILE_EXCLUDES)) + +stamp-build-static: stamp-configure-static + dh_testdir + $(MAKE) $(NJOBS) -C $(buildd_static) \ + PROFILE_TASK='$(PROFILE_TASK)' $(make_build_target) + touch stamp-build-static + +stamp-build-shared: stamp-configure-shared + dh_testdir + $(MAKE) $(NJOBS) -C $(buildd_shared) +# : # build the shared library +# $(MAKE) $(NJOBS) -C $(buildd_shared) \ +# libpython$(VER).so + : # build a static library with PIC objects + $(MAKE) $(NJOBS) -C $(buildd_shared) \ + LIBRARY=libpython$(VER)-pic.a libpython$(VER)-pic.a + touch stamp-build-shared + +stamp-build-debug: stamp-configure-debug + dh_testdir + $(MAKE) $(NJOBS) -C $(buildd_debug) + touch stamp-build-debug + +stamp-build-shared-debug: stamp-configure-shared-debug + dh_testdir + : # build the shared debug library + $(MAKE) $(NJOBS) -C $(buildd_shdebug) \ + libpython$(VER)_d.so + touch stamp-build-shared-debug + +common_configure_args = \ + --prefix=/usr \ + --enable-ipv6 \ + --enable-unicode=ucs4 \ + --with-system-ffi \ + +ifeq ($(with_fpectl),yes) + common_configure_args += \ + --with-fpectl +endif + +stamp-configure-shared: patch-stamp + rm -rf $(buildd_shared) + mkdir -p $(buildd_shared) + cd $(buildd_shared) && \ + CC="$(CC)" $(OPTSETTINGS) \ + ../configure \ + --enable-shared \ + $(common_configure_args) + egrep \ + "^#($$(awk '$$2 ~ /^extension$$/ {print $$1}' debian/PVER-minimal.README.Debian.in | tr '\012' '|')XX)" \ + Modules/Setup.dist \ + | sed -e 's/^#//' -e 's/-Wl,-Bdynamic//;s/-Wl,-Bstatic//' \ + >> $(buildd_shared)/Modules/Setup.local + cd $(buildd_shared) && \ + ../Modules/makesetup -c ../Modules/config.c.in -s Modules \ + Modules/Setup.config Modules/Setup.local Modules/Setup + mv $(buildd_shared)/config.c $(buildd_shared)/Modules/ + + touch stamp-configure-shared + +stamp-configure-static: patch-stamp + rm -rf $(buildd_static) + mkdir -p $(buildd_static) + cd $(buildd_static) && \ + CC="$(CC)" $(OPTSETTINGS) \ + ../configure \ + $(common_configure_args) + egrep \ + "^#($$(awk '$$2 ~ /^extension$$/ {print $$1}' debian/PVER-minimal.README.Debian.in | tr '\012' '|')XX)" \ + Modules/Setup.dist | sed 's/^#//' \ + >> $(buildd_static)/Modules/Setup.local + cd $(buildd_static) && \ + ../Modules/makesetup -c ../Modules/config.c.in -s Modules \ + Modules/Setup.config Modules/Setup.local Modules/Setup + + : # apply workaround for missing os.fsync + sed 's/HAVE_SYNC/HAVE_FSYNC/g' $(buildd_static)/pyconfig.h \ + > $(buildd_static)/pyconfig.h.new + touch -r $(buildd_static)/pyconfig.h $(buildd_static)/pyconfig.h.new + mv -f $(buildd_static)/pyconfig.h.new $(buildd_static)/pyconfig.h + mv $(buildd_static)/config.c $(buildd_static)/Modules/ + + touch stamp-configure-static + +stamp-configure-debug: patch-stamp + rm -rf $(buildd_debug) + mkdir -p $(buildd_debug) + cd $(buildd_debug) && \ + CC="$(CC)" $(OPTDEBUGSETTINGS) \ + ../configure \ + $(common_configure_args) \ + --with-pydebug + egrep \ + "^#($$(awk '$$2 ~ /^extension$$/ {print $$1}' debian/PVER-minimal.README.Debian.in | tr '\012' '|')XX)" \ + Modules/Setup.dist | sed 's/^#//' \ + >> $(buildd_debug)/Modules/Setup.local + cd $(buildd_debug) && \ + ../Modules/makesetup -c ../Modules/config.c.in -s Modules \ + Modules/Setup.config Modules/Setup.local Modules/Setup + mv $(buildd_debug)/config.c $(buildd_debug)/Modules/ + + : # apply workaround for missing os.fsync + sed 's/HAVE_SYNC/HAVE_FSYNC/g' $(buildd_debug)/pyconfig.h \ + > $(buildd_debug)/pyconfig.h.new + touch -r $(buildd_debug)/pyconfig.h $(buildd_debug)/pyconfig.h.new + mv -f $(buildd_debug)/pyconfig.h.new $(buildd_debug)/pyconfig.h + + touch stamp-configure-debug + +stamp-configure-shared-debug: patch-stamp + rm -rf $(buildd_shdebug) + mkdir -p $(buildd_shdebug) + cd $(buildd_shdebug) && \ + CC="$(CC)" $(OPTDEBUGSETTINGS) \ + ../configure \ + $(common_configure_args) \ + --enable-shared \ + --with-pydebug + egrep \ + "^#($$(awk '$$2 ~ /^extension$$/ {print $$1}' debian/PVER-minimal.README.Debian.in | tr '\012' '|')XX)" \ + Modules/Setup.dist \ + | sed -e 's/^#//' -e 's/-Wl,-Bdynamic//;s/-Wl,-Bstatic//' \ + >> $(buildd_shdebug)/Modules/Setup.local + cd $(buildd_shdebug) && \ + ../Modules/makesetup -c ../Modules/config.c.in -s Modules \ + Modules/Setup.config Modules/Setup.local Modules/Setup + mv $(buildd_shdebug)/config.c $(buildd_shdebug)/Modules/ + + : # apply workaround for missing os.fsync + sed 's/HAVE_SYNC/HAVE_FSYNC/g' $(buildd_shdebug)/pyconfig.h \ + > $(buildd_shdebug)/pyconfig.h.new + touch -r $(buildd_shdebug)/pyconfig.h $(buildd_shdebug)/pyconfig.h.new + mv -f $(buildd_shdebug)/pyconfig.h.new $(buildd_shdebug)/pyconfig.h + + touch stamp-configure-shared-debug + +stamp-mincheck: stamp-build-static debian/PVER-minimal.README.Debian.in + for m in $(MIN_MODS) $(MIN_EXTS) $(MIN_BUILTINS); do \ + echo "import $$m"; \ + done > $(buildd_static)/minmods.py + cd $(buildd_static) && ./python ../debian/pymindeps.py minmods.py \ + > $(buildd_static)/mindeps.txt + if [ -x /usr/bin/dot ]; then \ + python debian/depgraph.py < $(buildd_static)/mindeps.txt \ + > $(buildd_static)/mindeps.dot; \ + dot -Tpng -o $(buildd_static)/mindeps.png \ + $(buildd_static)/mindeps.dot; \ + else true; fi + cd $(buildd_static) && ./python ../debian/mincheck.py \ + minmods.py mindeps.txt + touch stamp-mincheck + +TEST_RESOURCES = all +ifeq ($(on_buildd),yes) + TEST_RESOURCES := $(TEST_RESOURCES),-network,-urlfetch +endif +TESTOPTS = -w -l -u$(TEST_RESOURCES) +TEST_EXCLUDES = +# not built from this source +TEST_EXCLUDES += test_bsddb3 +ifeq ($(on_buildd),yes) + TEST_EXCLUDES += test_tcl test_codecmaps_cn test_codecmaps_hk \ + test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw \ + test_normalization test_ossaudiodev +endif +ifneq (,$(filter $(DEB_BUILD_ARCH), hppa)) + TEST_EXCLUDES += test_fork1 test_wait3 +endif +ifneq (,$(filter $(DEB_BUILD_ARCH), arm)) + TEST_EXCLUDES += test_ctypes +endif +ifneq (,$(filter $(DEB_BUILD_ARCH), m68k)) + TEST_EXCLUDES += test_bsddb3 +endif +ifneq (,$(filter $(DEB_BUILD_ARCH), arm armel m68k)) + ifeq ($(on_buildd),yes) + TEST_EXCLUDES += test_compiler + endif +endif +ifneq (,$(TEST_EXCLUDES)) + TESTOPTS += -x $(sort $(TEST_EXCLUDES)) +endif + +stamp-check: +ifeq ($(WITHOUT_CHECK),yes) + echo "check run disabled for this build" > $(buildd_static)/test_results +else + : # build locales needed by the testsuite + rm -rf locales + mkdir locales + chmod +x debian/locale-gen + debian/locale-gen + + @echo ========== test environment ============ + @env + @echo ======================================== + + @echo "BEGIN test static" + -time \ + LOCPATH=$(CURDIR)/locales \ + $(MAKE) -C $(buildd_static) test \ + TESTOPTS="$(TESTOPTS)" 2>&1 \ + | tee $(buildd_static)/test_results + @echo "END test static" + @echo "BEGIN test shared" + -time \ + LOCPATH=$(CURDIR)/locales \ + $(MAKE) -C $(buildd_shared) test \ + TESTOPTS="$(TESTOPTS)" 2>&1 \ + | tee $(buildd_shared)/test_results + @echo "END test shared" + ifeq (0,1) + ifeq (,$(findstring $(DEB_BUILD_ARCH), alpha)) + @echo "BEGIN test debug" + -time \ + LOCPATH=$(CURDIR)/locales \ + $(MAKE) -C $(buildd_debug) test \ + TESTOPTS="$(TESTOPTS)" 2>&1 \ + | tee $(buildd_debug)/test_results + @echo "END test debug" + endif + endif +endif + cp -p $(buildd_static)/test_results debian/ + touch stamp-check + +stamp-pystone: + @echo "BEGIN pystone static" + cd $(buildd_static) && ./python ../Lib/test/pystone.py + cd $(buildd_static) && ./python ../Lib/test/pystone.py + @echo "END pystone static" + @echo "BEGIN pystone shared" + cd $(buildd_shared) \ + && LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. ./python ../Lib/test/pystone.py + cd $(buildd_shared) \ + && LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. ./python ../Lib/test/pystone.py + @echo "END pystone shared" + @echo "BEGIN pystone debug" + cd $(buildd_debug) && ./python ../Lib/test/pystone.py + cd $(buildd_debug) && ./python ../Lib/test/pystone.py + @echo "END pystone debug" + touch stamp-pystone + +stamp-pybench: +ifeq ($(WITHOUT_CHECK),yes) + echo "pybench run disabled for this build" > $(buildd_static)/pybench.log +else + ifeq (,$(filter $(DEB_BUILD_ARCH), arm armel hppa m68k)) + @echo "BEGIN pybench static" + cd $(buildd_static) \ + && time ./python ../Tools/pybench/pybench.py -f run1.pybench + cd $(buildd_static) \ + && ./python ../Tools/pybench/pybench.py -f run2.pybench -c run1.pybench + @echo "END pybench static" + @echo "BEGIN pybench shared" + cd $(buildd_shared) \ + && LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. ./python ../Tools/pybench/pybench.py -f run1.pybench + cd $(buildd_shared) \ + && LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. ./python ../Tools/pybench/pybench.py -f run2.pybench -c run1.pybench + @echo "END pybench shared" + ifeq (,$(filter $(DEB_BUILD_ARCH), arm armel m68k)) + @echo "BEGIN pybench debug" + cd $(buildd_debug) \ + && time ./python ../Tools/pybench/pybench.py -f run1.pybench + cd $(buildd_debug) \ + && ./python ../Tools/pybench/pybench.py -f run2.pybench -c run1.pybench + @echo "END pybench debug" + endif + @echo "BEGIN shared/static comparision" + $(buildd_static)/python Tools/pybench/pybench.py \ + -s $(buildd_static)/run2.pybench -c $(buildd_shared)/run2.pybench \ + | tee $(buildd_static)/pybench.log + @echo "END shared/static comparision" + else + echo "pybench not run on arch $(DEB_BUILD_ARCH)." > $(buildd_static)/pybench.log + endif +endif + touch stamp-pybench + +minimal-test: + rm -rf mintest + mkdir -p mintest/lib mintest/dynlib mintest/testlib mintest/all-lib + cp -p $(buildd_static)/python mintest/ + cp -p $(foreach i,$(MIN_MODS),Lib/$(i).py) \ + mintest/lib/ +# cp -p $(foreach i,$(MIN_EXTS),$(buildd_static)/build/lib*/$(i).so) \ +# mintest/dynlib/ + cp -p Lib/unittest.py mintest/lib/ + cp -pr Lib/test mintest/lib/ + cp -pr Lib mintest/all-lib + cp -p $(buildd_static)/build/lib*/*.so mintest/all-lib/ + ( \ + echo "import sys"; \ + echo "sys.path = ["; \ + echo " '$(CURDIR)/mintest/lib',"; \ + echo " '$(CURDIR)/mintest/dynlib',"; \ + echo "]"; \ + cat Lib/test/regrtest.py; \ + ) > mintest/lib/test/mintest.py + cd mintest && ./python -E -S lib/test/mintest.py \ + -x test_codecencodings_cn test_codecencodings_hk \ + test_codecencodings_jp test_codecencodings_kr \ + test_codecencodings_tw test_codecs test_multibytecodec \ + +stamp-doc-html: + dh_testdir + $(MAKE) -C Doc html + touch stamp-doc-html + +build-doc: patch-stamp stamp-build-doc +stamp-build-doc: #stamp-doc-html + touch stamp-build-doc + +control-file: + sed -e "s/@PVER@/$(PVER)/g" \ + -e "s/@VER@/$(VER)/g" \ + -e "s/@PYSTDDEP@/$(PYSTDDEP)/g" \ + -e "s/@PRIO@/$(PY_PRIO)/g" \ + -e "s/@MINPRIO@/$(PY_MINPRIO)/g" \ + debian/control.in > debian/control.tmp +ifeq ($(distribution),Ubuntu) + ifneq (,$(findstring ubuntu, $(PKGVERSION))) + m='Ubuntu Core Developers '; \ + sed -i "/^Maintainer:/s/\(.*\)/Maintainer: $$m\nXSBC-Original-\1/" \ + debian/control.tmp + endif +endif + [ -e debian/control ] \ + && cmp -s debian/control debian/control.tmp \ + && rm -f debian/control.tmp && exit 0; \ + mv debian/control.tmp debian/control + + + +clean: control-file + dh_testdir + dh_testroot + $(MAKE) -f debian/rules unpatch + rm -f stamp-* + rm -f patch-stamp* pxxx + rm -f debian/test_results + + $(MAKE) -C Doc clean + sed 's/^@/#/' Makefile.pre.in | $(MAKE) -f - srcdir=. distclean + rm -rf Lib/test/db_home + rm -rf $(buildd_static) $(buildd_shared) $(buildd_debug) $(buildd_shdebug) + find -name '*.py[co]' | xargs -r rm -f + rm -f Lib/lib2to3/*.pickle + rm -rf locales + rm -rf $(d)-dbg + + for f in debian/*.in; do \ + f2=`echo $$f | sed "s,PVER,$(PVER),g;s/@VER@/$(VER)/g;s,\.in$$,,"`; \ + if [ $$f2 != debian/control ]; then \ + rm -f $$f2; \ + fi; \ + done + dh_clean + +stamp-control: + : # We have to prepare the various control files + + for f in debian/*.in; do \ + f2=`echo $$f | sed "s,PVER,$(PVER),g;s/@VER@/$(VER)/g;s,\.in$$,,"`; \ + if [ $$f2 != debian/control ]; then \ + sed -e "s/@PVER@/$(PVER)/g;s/@VER@/$(VER)/g" \ + -e "s/@PRIORITY@/$(PRIORITY)/g" \ + -e "s,@SCRIPTDIR@,/$(scriptdir),g" \ + -e "s,@INFO@,$(info_docs),g" \ + <$$f >$$f2; \ + fi; \ + done +ifneq (,$(filter $(DEB_BUILD_ARCH), alpha amd64 ia64 ppc64)) + sed -i 's/\(Py_InitModule4[^@]*\)@/\1_64@/' \ + debian/lib$(PVER).symbols debian/$(PVER)-dbg.symbols +endif + +install: $(build_target) stamp-install +stamp-install: stamp-build control-file stamp-control + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + : # make install into tmp and subsequently move the files into + : # their packages' directories. + install -d $(d)/usr +ifeq ($(with_interp),static) + $(MAKE) -C $(buildd_static) install prefix=$(CURDIR)/$(d)/usr +else + $(MAKE) -C $(buildd_shared) install prefix=$(CURDIR)/$(d)/usr +endif + -find $(d)/usr/lib/python$(VER) -name '*_failed*.so' + find $(d)/usr/lib/python$(VER) -name '*_failed*.so' | xargs -r rm -f + + mv $(d)/usr/lib/python$(VER)/site-packages \ + $(d)/usr/lib/python$(VER)/dist-packages + + : # remove files, which are not packaged + rm -f $(d)/usr/bin/smtpd.py + rm -rf $(d)/usr/lib/python$(VER)/ctypes/macholib + + : # fix some file permissions + chmod a-x $(d)/$(scriptdir)/{fractions,lib-tk/Tix}.py + + : # move manpages to new names + if [ -d $(d)/usr/man/man1 ]; then \ + mkdir -p $(d)/usr/share/man; \ + mv $(d)/usr/man/man1/* $(d)/usr/share/man/man1/; \ + rm -rf $(d)/usr/man/; \ + fi + mv $(d)/usr/share/man/man1/python.1 \ + $(d)/usr/share/man/man1/python$(VER).1 + cp -p debian/pydoc.1 $(d)/usr/share/man/man1/pydoc$(VER).1 + + : # Symlinks to /usr/bin for some tools + ln -sf ../lib/python$(VER)/pdb.py $(d)/usr/bin/pdb$(VER) + cp -p debian/pdb.1 $(d)/usr/share/man/man1/pdb$(VER).1 + + : # versioned install only + rm -f $(d)/usr/bin/python-config + + mv $(d)/usr/bin/2to3 $(d)/usr/bin/2to3-$(VER) + +# : # remove the bsddb stuff +# rm -rf $(d)/$(scriptdir)/bsddb +# rm -f $(d)/$(scriptdir)/lib-dynload/_bsddb.so + + : # Remove version information from the egg-info file + mv $(d)/$(scriptdir)/lib-dynload/Python-2.6*.egg-info \ + $(d)/$(scriptdir)/lib-dynload/Python-$(VER).egg-info + + dh_installdirs -p$(p_lib) \ + $(scriptdir)/config \ + usr/share/doc + : # install the shared library + cp -p $(buildd_shared)/libpython$(VER).so.1.0 $(d_lib)/usr/lib/ + ln -sf libpython$(VER).so.1.0 $(d_lib)/usr/lib/libpython$(VER).so.1 + ln -sf ../../libpython$(VER).so \ + $(d_lib)/$(scriptdir)/config/libpython$(VER).so + ln -sf $(p_base) $(d_lib)/usr/share/doc/$(p_lib) + + ln -sf libpython$(VER).so.1 $(d)/usr/lib/libpython$(VER).so + +ifeq ($(with_interp),shared) + : # install the statically linked runtime + install -m755 $(buildd_static)/python $(d)/usr/bin/python$(VER)-static +endif + + mv $(d)/usr/bin/pydoc $(d)/usr/bin/pydoc$(VER) + cp -p Tools/i18n/pygettext.py $(d)/usr/bin/pygettext$(VER) + cp -p debian/pygettext.1 $(d)/usr/share/man/man1/pygettext$(VER).1 + + : # install the Makefile of the shared python build + sed -e '/^OPT/s,-O3,-O2,' \ + -e 's,^RUNSHARED *=.*,RUNSHARED=,' \ + build-shared/Makefile > $(d)/$(scriptdir)/config/Makefile + + : # Move the binary and the minimal libraries into $(p_min). + dh_installdirs -p$(p_min) \ + etc/$(PVER) \ + usr/bin \ + usr/share/man/man1 \ + $(scriptdir)/lib-dynload + DH_COMPAT=2 dh_movefiles -p$(p_min) --sourcedir=$(d) \ + usr/bin/python$(VER) \ + usr/share/man/man1/python$(VER).1 \ + $(foreach i,$(MIN_MODS),$(scriptdir)/$(i).py) \ + $(foreach i,$(MIN_ENCODINGS),$(scriptdir)/$(i)) \ + $(scriptdir)/site.py + +# $(foreach i,$(MIN_EXTS),$(scriptdir)/lib-dynload/$(i).so) \ + + : # Install sitecustomize.py. + cp -p debian/sitecustomize.py $(d_min)/etc/$(PVER)/ + patch --no-backup -d $(d_min)/$(scriptdir) < debian/patches/site-builddir.diff + dh_link -p$(p_min) /etc/$(PVER)/sitecustomize.py \ + /$(scriptdir)/sitecustomize.py + + : # Move the static library and the header files into $(p_dev). +# mv $(d)/usr/share/include/python$(VER)/* $(d)/usr/include/python$(VER)/. +# rm -rf $(d)/usr/share/include + dh_installdirs -p$(p_dev) \ + usr/share/doc/python$(VER) \ + $(scriptdir) \ + $(scriptdir)/doc/html \ + usr/include \ + usr/lib + cp -p Misc/HISTORY Misc/README.valgrind Misc/gdbinit \ + debian/README.maintainers \ + debian/test_results $(buildd_static)/pybench.log \ + $(d_dev)/usr/share/doc/python$(VER)/ + + DH_COMPAT=2 dh_movefiles -p$(p_dev) --sourcedir=$(d) \ + usr/lib/python$(VER)/config \ + usr/include/python$(VER) \ + usr/lib/libpython$(VER).so \ + usr/lib/libpython$(VER).a \ + usr/bin/python$(VER)-config \ + usr/lib/python$(VER)/distutils/command/wininst-*.exe + + mv $(d_dev)/usr/lib/python$(VER)/config/Makefile \ + $(d)/usr/lib/python$(VER)/config/ + mv $(d_dev)/usr/include/python$(VER)/pyconfig.h \ + $(d)/usr/include/python$(VER)/ + cp -p $(buildd_shared)/libpython$(VER)-pic.a \ + $(d_dev)/usr/lib/python$(VER)/config/ + +ifeq ($(with_tk),yes) + : # Move the Tkinter files into $(p_tk). + dh_installdirs -p$(p_tk) \ + $(scriptdir) \ + usr/lib/python$(VER)/lib-dynload + DH_COMPAT=2 dh_movefiles -p$(p_tk) --sourcedir=$(d) \ + usr/lib/python$(VER)/lib-dynload/_tkinter.so +endif + +ifeq ($(with_gdbm),yes) + : # gdbm and dbm modules into $(p_gdbm). + dh_installdirs -p$(p_gdbm) \ + usr/lib/python$(VER)/lib-dynload + DH_COMPAT=2 dh_movefiles -p$(p_gdbm) --sourcedir=$(d) \ + usr/lib/python$(VER)/lib-dynload/gdbm.so +endif + +# : # The test framework into $(p_base), regression tests dropped + DH_COMPAT=2 dh_movefiles -p$(p_base) --sourcedir=$(d) \ + $(scriptdir)/test/{regrtest.py,test_support.py,__init__.py,README,pystone.py} + rm -rf $(d)/$(scriptdir)/test + rm -rf $(d)/$(scriptdir)/ctypes/test + rm -rf $(d)/$(scriptdir)/bsddb/test + rm -rf $(d)/$(scriptdir)/email/test + rm -rf $(d)/$(scriptdir)/json/tests + rm -rf $(d)/$(scriptdir)/sqlite3/test + rm -rf $(d)/$(scriptdir)/distutils/tests + rm -rf $(d)/$(scriptdir)/lib2to3/tests + + : # IDLE + mv $(d)/usr/bin/idle $(d)/usr/bin/idle-python$(VER) + rm -f $(d)/usr/lib/python$(VER)/idlelib/idle.bat + dh_installdirs -p$(p_idle) \ + usr/bin \ + usr/share/man/man1 + DH_COMPAT=2 dh_movefiles -p$(p_idle) \ + usr/lib/python$(VER)/idlelib \ + usr/bin/idle-python$(VER) + cp -p debian/idle-$(PVER).1 $(d_idle)/usr/share/man/man1/ + + : # Move the demos and tools into $(p_exam)'s doc directory + dh_installdirs -p$(p_exam) \ + usr/share/doc/python$(VER)/examples + + cp -rp Demo Tools $(d_exam)/usr/share/doc/python$(VER)/examples/ + rm -rf $(d_exam)/usr/share/doc/python$(VER)/examples/Demo/sgi + : # IDLE is in its own package: + rm -rf $(d_exam)/usr/share/doc/python$(VER)/examples/Tools/idle + : # XXX: We don't need rgb.txt, we'll use our own: + rm -rf $(d_exam)/usr/share/doc/python$(VER)/examples/Tools/pynche/X + + : # XXX: Some files in upstream Demo and Tools have strange + : # exec permissions, make lintian glad: + -chmod 644 $(d_tk)/$(scriptdir)/lib-tk/Tix.py + -chmod 644 $(d)/$(scriptdir)/runpy.py + + cd $(d_exam)/usr/share/doc/python$(VER)/examples && chmod 644 \ + Demo/{classes/*.py*,comparisons/patterns} \ + Demo/{rpc/test,threads/*.py*,md5test/*} \ + Demo/pdist/{client.py,cmdfw.py,cmptree.py,cvslib.py,cvslock.py,FSProxy.py,mac.py,rcsclient.py,rcslib.py,security.py,server.py,sumtree.py} \ + Demo/scripts/{morse.py,newslist.doc,wh.py} \ + Demo/sockets/{broadcast.py,ftp.py,mcast.py,radio.py} \ + Demo/tix/{bitmaps/{tix.gif,*x[pb]m*},samples/*.py} \ + Demo/tkinter/guido/{AttrDialog.py,hanoi.py,hello.py,imagedraw.py,imageview.py,listtree.py,ManPage.py,ShellWindow.py,wish.py} \ + Tools/scripts/pydocgui.pyw \ + Tools/{scripts/mailerdaemon.py,modulator/genmodule.py} + + : # Replace all '#!' calls to python with $(PY_INTERPRETER) + : # and make them executable + for i in `find debian -mindepth 3 -type f ! -name '*.dpatch'`; do \ + sed '1s,#!.*python[^ ]*\(.*\),#! $(PY_INTERPRETER)\1,' \ + $$i > $$i.temp; \ + if cmp --quiet $$i $$i.temp; then \ + rm -f $$i.temp; \ + else \ + mv -f $$i.temp $$i; \ + chmod 755 $$i; \ + echo "fixed interpreter: $$i"; \ + fi; \ + done + + : # Move the docs into $(p_base)'s /usr/share/doc/$(PVER) directory, + : # all other packages only have a copyright file. + dh_installdocs -p$(p_base) \ + README Misc/NEWS Misc/ACKS + ln -sf NEWS.gz $(d_base)/usr/share/doc/$(p_base)/changelog.gz + dh_installdocs --all -N$(p_base) -N$(p_dev) -N$(p_dbg) -N$(p_lib) debian/README.Debian + + : # IDLE has its own changelogs, docs... + dh_installchangelogs -p$(p_idle) Lib/idlelib/ChangeLog + dh_installdocs -p$(p_idle) Lib/idlelib/{NEWS,README,TODO,extend}.txt + + mkdir -p $(d_idle)/usr/share/applications + cp -p debian/idle.desktop \ + $(d_idle)/usr/share/applications/idle-$(PVER).desktop + + : # those packages have own README.Debian's + install -m 644 -p debian/README.$(p_base) \ + $(d_base)/usr/share/doc/$(PVER)/README.Debian + install -m 644 -p debian/README.$(p_idle) \ + $(d_idle)/usr/share/doc/$(p_idle)/README.Debian +ifeq ($(with_tk),yes) + cp -p debian/README.Tk $(d_tk)/usr/share/doc/$(p_tk)/ +endif + + : # The rest goes into $(p_base) + mkdir -p $(d)/usr/lib/python$(VER)/dist-packages + (cd $(d) && tar cf - .) | (cd $(d_base) && tar xpf -) + sh debian/dh_rmemptydirs -p$(p_base) + rm -f $(d_base)/usr/bin/python + + : # Install menu icon + dh_installdirs -p$(p_base) usr/share/pixmaps + cp -p debian/pylogo.xpm $(d_base)/usr/share/pixmaps/$(PVER).xpm + + : # generate binfmt file + mkdir -p $(d_min)/usr/share/binfmts + $(buildd_static)/python debian/mkbinfmt.py $(PVER) \ + > $(d_min)/usr/share/binfmts/$(PVER) + + : # desktop entry + mkdir -p $(d_base)/usr/share/applications + cp -p debian/$(PVER).desktop \ + $(d_base)/usr/share/applications/$(PVER).desktop + + : # remove some things + -find debian -name .cvsignore | xargs rm -f + -find debian -name '*.py[co]' | xargs rm -f + + : # remove empty directories, when all components are in place + -find debian ! -name lib-dynload -type d -empty -delete + + : # install debug package + rm -rf $(d)-dbg + $(MAKE) -C $(buildd_debug) install DESTDIR=$(CURDIR)/$(d)-dbg + dh_installdirs -p$(p_dbg) \ + usr/bin \ + usr/share/man/man1 \ + $(scriptdir)/lib-dynload \ + usr/include/$(PVER)_d \ + usr/share/doc/$(p_base) + cp -p Misc/SpecialBuilds.txt $(d_dbg)/usr/share/doc/$(p_base)/ + cp -p debian/$(PVER)-dbg.README.Debian \ + $(d_dbg)/usr/share/doc/$(p_base)/README.debug + cp -p $(buildd_debug)/python $(d_dbg)/usr/bin/$(PVER)-dbg + sed '1s,#!.*python[^ ]*\(.*\),#! $(PY_INTERPRETER)-dbg\1,' \ + $(d)-dbg/usr/bin/$(PVER)-config \ + > $(d_dbg)/usr/bin/$(PVER)-dbg-config + chmod 755 $(d_dbg)/usr/bin/$(PVER)-dbg-config + cp -p $(buildd_debug)/build/lib*/*_d.so \ + $(d_dbg)/$(scriptdir)/lib-dynload/ + cp -p $(buildd_shdebug)/libpython$(VER)_d.so.1.0 $(d_dbg)/usr/lib/ + ln -sf libpython$(VER)_d.so.1.0 $(d_dbg)/usr/lib/libpython$(VER)_d.so.1 + ln -sf libpython$(VER)_d.so.1 $(d_dbg)/usr/lib/libpython$(VER)_d.so +ifneq ($(with_gdbm),yes) + rm -f $(d_dbg)/$(scriptdir)/lib-dynload/gdbm_d.so + rm -f $(d_dbg)/usr/lib/debug/$(scriptdir)/lib-dynload/gdbm.so +endif +ifneq ($(with_tk),yes) + rm -f $(d_dbg)/$(scriptdir)/lib-dynload/_tkinter_d.so + rm -f $(d_dbg)/usr/lib/debug/$(scriptdir)/lib-dynload/_tkinter.so +endif +# rm -f $(d_dbg)/$(scriptdir)/lib-dynload/_bsddb_d.so + + cp -a $(d)-dbg/$(scriptdir)/config_d $(d_dbg)/$(scriptdir)/ + ln -sf ../../libpython$(VER)_d.so \ + $(d_dbg)/$(scriptdir)/config_d/libpython$(VER)_d.so + ln -sf libpython$(VER)_d.so \ + $(d_dbg)/$(scriptdir)/config_d/libpython$(VER).so + ln -sf libpython$(VER)_d.a \ + $(d_dbg)/$(scriptdir)/config_d/libpython$(VER).a + + for i in $(d_dev)/usr/include/$(PVER)/*; do \ + i=$$(basename $$i); \ + case $$i in pyconfig.h) continue; esac; \ + ln -sf ../$(PVER)/$$i $(d_dbg)/usr/include/$(PVER)_d/$$i; \ + done + cp -p $(buildd_debug)/pyconfig.h $(d_dbg)/usr/include/$(PVER)_d/ + ln -sf $(PVER).1.gz $(d_dbg)/usr/share/man/man1/$(PVER)-dbg.1.gz + + for i in debian/*.overrides; do \ + b=$$(basename $$i .overrides); \ + install -D -m 644 $$i debian/$$b/usr/share/lintian/overrides/$$b; \ + done + + touch stamp-install + +dh_args = -N$(p_doc) + +# Build architecture-independent files here. +binary-indep: $(install_target) $(build_target) stamp-build-doc stamp-control + dh_testdir -i + dh_testroot -i + +ifeq (0,1) + : # $(p_doc) package + dh_installdirs -p$(p_doc) \ + usr/share/doc/$(p_base) \ + usr/share/doc/$(p_doc) + dh_installdocs -p$(p_doc) + cp -a Doc/build/html $(d_doc)/usr/share/doc/$(p_base)/ + rm -f $(d_doc)/usr/share/doc/$(p_base)/html/_static/jquery.js + dh_link -p$(p_doc) \ + /usr/share/doc/$(p_base)/html /usr/share/doc/$(p_doc)/html \ + /usr/share/javacript/jquery.js /usr/share/doc/$(p_base)/html/_static/jquery.js + + : # devhelp docs + python debian/pyhtml2devhelp.py \ + $(d_doc)/usr/share/doc/$(p_base)/html index.html \ + > $(d_doc)/usr/share/doc/$(p_base)/html/$(PVER).devhelp + gzip -9v $(d_doc)/usr/share/doc/$(p_base)/html/$(PVER).devhelp + dh_link -p$(p_doc) \ + /usr/share/doc/$(p_base)/html /usr/share/devhelp/books/$(PVER) +endif + + dh_installdebconf -i $(dh_args) + dh_installexamples -i $(dh_args) + dh_installmenu -i $(dh_args) + -dh_icons -i $(dh_args) || dh_iconcache -i $(dh_args) + dh_installchangelogs -i $(dh_args) + dh_link -i $(dh_args) + dh_compress -i $(dh_args) -X.py -X.cls -X.css -X.txt -X.json -X.js -Xgdbinit + dh_fixperms -i $(dh_args) + + : # make python scripts starting with '#!' executable + for i in `find debian -mindepth 3 -type f ! -name '*.dpatch' ! -perm 755`; do \ + if head -1 $$i | grep -q '^#!'; then \ + chmod 755 $$i; \ + echo "make executable: $$i"; \ + fi; \ + done + -find $(d_doc) -name '*.txt' -perm 755 -exec chmod 644 {} \; + + dh_installdeb -i $(dh_args) + dh_gencontrol -i $(dh_args) + dh_md5sums -i $(dh_args) + dh_builddeb -i $(dh_args) + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a +# dh_installdebconf -a + dh_installexamples -a + dh_installmenu -a + -dh_icons -a || dh_iconcache -a +# dh_installmime -a + dh_installchangelogs -a + for i in $(p_dev) $(p_dbg) $(p_lib); do \ + rm -rf debian/$$i/usr/share/doc/$$i; \ + ln -s $(p_base) debian/$$i/usr/share/doc/$$i; \ + done + -find debian ! -perm -200 -print -exec chmod +w {} \; +ifneq ($(with_tk),yes) + rm -f $(d_base)/$(scriptdir)/lib-dynload/_tkinter.so +endif +ifneq ($(with_gdbm),yes) + rm -f $(d_base)/$(scriptdir)/lib-dynload/gdbm.so +endif + dh_strip -a -N$(p_dbg) -Xdebug -Xdbg --dbg-package=$(p_dbg) + dh_link -a + dh_compress -a -X.py + dh_fixperms -a + + : # make python scripts starting with '#!' executable + for i in `find debian -mindepth 3 -type f ! -name '*.dpatch' ! -perm 755`; do \ + if head -1 $$i | grep -q '^#!'; then \ + chmod 755 $$i; \ + echo "make executable: $$i"; \ + fi; \ + done + + dh_makeshlibs -p$(p_lib) -V '$(p_lib)' + dh_makeshlibs -p$(p_dbg) -V '$(p_dbg)' +# don't include the following symbols, found in extensions +# which either can be built as builtin or extension. + sed -ri '/^ (_check_|asdl_|fast_save_|init)/d' \ + $(d_lib)/DEBIAN/symbols $(d_dbg)/DEBIAN/symbols + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +# rules to patch the unpacked files in the source directory +# --------------------------------------------------------------------------- +# various rules to unpack addons and (un)apply patches. +# - patch / apply-patches +# - unpatch / reverse-patches + +patchdir = debian/patches + +# which patches should be applied? +debian_patches = \ + svn-updates \ + deb-setup \ + deb-locations \ + site-locations \ + distutils-install-layout \ + locale-module \ + distutils-link \ + distutils-sysconfig \ + test-sundry \ + tkinter-import \ + link-opt \ + debug-build \ + hotshot-import \ + profile-doc \ + webbrowser \ + linecache \ + doc-nodownload \ + profiled-build2 \ + no-zip-on-sys.path \ + platform-lsbrelease \ + issue1113244 \ + bdist-wininst-notfound \ + +# setup-modules \ +# profiled-build \ +# subprocess-eintr-safety \ +# pydebug-path \ +# svn-updates \ +# db4.6 \ + +ifeq ($(with_fpectl),yes) + debian_patches += \ + enable-fpectl +endif + +ifeq ($(DEB_BUILD_ARCH),arm) + debian_patches += arm-float +endif + +# svn-updates \ +# patchlevel \ + +glibc_version := $(shell dpkg -s locales | awk '/^Version:/ {print $$2}') +broken_utimes := $(shell dpkg --compare-versions $(glibc_version) lt 2.3.5 && echo yes || echo no) +ifeq ($(broken_utimes),yes) + debian_patches += \ + disable-utimes +endif + +ifeq ($(distribution),Ubuntu) + debian_patches += \ + langpack-gettext +endif + +ifeq ($(DEB_BUILD_ARCH_OS),hurd) + debian_patches += \ + no-large-file-support \ + cthreads +endif + +patch: patch-stamp +apply-patches: patch-stamp + +patch-stampx: + dh_testdir + QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 + touch patch-stamp + +patch-stamp: $(foreach p,$(debian_patches),patch-stamp-$(p)) + echo ""; echo "Patches applied in this version:" > pxxx + for i in $(debian_patches); do \ + echo "" >> pxxx; echo "$$i:" >> pxxx; \ + sed -n 's/^# *DP: */ /p' $(patchdir)/$$i.dpatch >> pxxx; \ + done + mv -f pxxx $@ + +reverse-patches: unpatch +unpatchx: + QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 + rm -f patch-stamp + +unpatch: + for patch in $(debian_patches); do \ + [ -f patch-stamp-$$patch ] && patches="$$patch $$patches"; \ + done; \ + for patch in $$patches; do \ + echo "trying to revert patch $$patch ..."; \ + if sh -e $(patchdir)/$$patch.dpatch -unpatch; then \ + echo "reverted $$patch patch."; \ + rm -f patch-stamp-$$patch; \ + else \ + echo "error in reverting $$patch patch."; \ + exit 1; \ + fi; \ + done + rm -f patch-stamp + +patch-stamp-%: $(patchdir)/%.dpatch + if [ -f $@ ]; then \ + echo "$* patches already applied."; exit 1; \ + fi + sh -e $< -patch + echo "$* patches applied." > $@ + autoconf +# autoreconf -i + +binary: binary-indep binary-arch + +.PHONY: control-file configure build clean binary-indep binary-arch binary install + +# Local Variables: +# mode: makefile +# end: --- python2.6-2.6.2.orig/debian/pyhtml2devhelp.py +++ python2.6-2.6.2/debian/pyhtml2devhelp.py @@ -0,0 +1,221 @@ +#! /usr/bin/python + +import formatter, htmllib +import os, sys, re + +class PyHTMLParser(htmllib.HTMLParser): + pages_to_include = set(('whatsnew/index.html', 'tutorial/index.html', 'using/index.html', + 'reference/index.html', 'library/index.html', 'howto/index.html', + 'extending/index.html', 'c-api/index.html', 'install/index.html', + 'distutils/index.html', 'documenting/index.html')) + + def __init__(self, formatter, basedir, fn, indent, parents=set()): + htmllib.HTMLParser.__init__(self, formatter) + self.basedir = basedir + self.dir, self.fn = os.path.split(fn) + self.data = '' + self.parents = parents + self.link = {} + self.indent = indent + self.last_indent = indent - 1 + self.sub_indent = 0 + self.sub_count = 0 + self.next_link = False + + def process_link(self): + new_href = os.path.join(self.dir, self.link['href']) + text = self.link['text'] + indent = self.indent + self.sub_indent + if self.last_indent == indent: + print '%s' % (' ' * self.last_indent) + self.sub_count -= 1 + print '%s' % (' ' * indent, new_href, text) + self.sub_count += 1 + self.last_indent = self.indent + self.sub_indent + + def start_li(self, attrs): + self.sub_indent += 1 + self.next_link = True + + def end_li(self): + indent = self.indent + self.sub_indent + if self.sub_count > 0: + print '%s' % (' ' * self.last_indent) + self.sub_count -= 1 + self.last_indent -= 1 + self.sub_indent -= 1 + + def start_a(self, attrs): + self.link = {} + for attr in attrs: + self.link[attr[0]] = attr[1] + self.data = '' + + def end_a(self): + process = False + text = self.data.replace('\t', '').replace('\n', ' ').replace('&', '&').replace('<', '<').replace('>', '>') + self.link['text'] = text + # handle a tag without href attribute + try: + href = self.link['href'] + except KeyError: + return + + abs_href = os.path.join(self.basedir, href) + if abs_href in self.parents: + return + if href.startswith('..') or href.startswith('http:') \ + or href.startswith('mailto:') or href.startswith('news:'): + return + if href in ('', 'about.html', 'modindex.html', 'genindex.html', 'glossary.html', + 'search.html', 'contents.html', 'download.html', 'bugs.html', + 'license.html', 'copyright.html'): + return + + if self.link.has_key('class'): + if self.link['class'] in ('biglink'): + process = True + if self.link['class'] in ('reference external'): + if self.next_link: + process = True + next_link = False + + if process == True: + self.process_link() + if href in self.pages_to_include: + self.parse_file(os.path.join(self.dir, href)) + + def finish(self): + if self.sub_count > 0: + print '%s' % (' ' * self.last_indent) + + def handle_data(self, data): + self.data += data + + def parse_file(self, href): + # TODO basedir bestimmen + parent = os.path.join(self.basedir, self.fn) + self.parents.add(parent) + parser = PyHTMLParser(formatter.NullFormatter(), + self.basedir, href, self.indent + 1, + self.parents) + text = file(self.basedir + '/' + href).read() + parser.feed(text) + parser.finish() + parser.close() + if parent in self.parents: + self.parents.remove(parent) + +class PyIdxHTMLParser(htmllib.HTMLParser): + def __init__(self, formatter, basedir, fn, indent): + htmllib.HTMLParser.__init__(self, formatter) + self.basedir = basedir + self.dir, self.fn = os.path.split(fn) + self.data = '' + self.link = {} + self.indent = indent + self.active = False + self.indented = False + self.nolink = False + self.header = '' + self.last_letter = 'Z' + self.last_text = '' + + def process_link(self): + new_href = os.path.join(self.dir, self.link['href']) + text = self.link['text'] + if not self.active: + return + if text.startswith('['): + return + if self.link.get('rel', None) in ('prev', 'parent', 'next', 'contents', 'index'): + return + if self.indented: + text = self.last_text + ' ' + text + else: + # Save it in case we need it again + self.last_text = re.sub(' \([\w\-\.\s]+\)', '', text) + indent = self.indent + print '%s' % (' ' * indent, new_href, text) + + def start_dl(self, attrs): + if self.last_text: + # Looks like we found the second part to a command + self.indented = True + + def end_dl(self): + self.indented = False + + def start_dt(self, attrs): + self.data = '' + self.nolink = True + + def end_dt(self): + if not self.active: + return + if self.nolink == True: + # Looks like we found the first part to a command + self.last_text = re.sub(' \([\w\-\.\s]+\)', '', self.data) + self.nolink = False + + def start_h2(self, attrs): + for k, v in attrs: + if k == 'id': + self.header = v + if v == '_': + self.active = True + + def start_td(self, attrs): + self.indented = False + self.last_text = '' + + def start_table(self, attrs): + pass + + def end_table(self): + if self.header == self.last_letter: + self.active = False + + def start_a(self, attrs): + self.nolink = False + self.link = {} + for attr in attrs: + self.link[attr[0]] = attr[1] + self.data = '' + + def end_a(self): + text = self.data.replace('\t', '').replace('\n', ' ').replace('&', '&').replace('<', '<').replace('>', '>') + self.link['text'] = text + # handle a tag without href attribute + try: + href = self.link['href'] + except KeyError: + return + self.process_link() + + def handle_data(self, data): + self.data += data + +def main(): + base = sys.argv[1] + fn = sys.argv[2] + + parser = PyHTMLParser(formatter.NullFormatter(), base, fn, indent=0) + print '' + print '' % (sys.version[:3], sys.version[:3]) + print '' + parser.parse_file(fn) + print '' + + print '' + + fn = 'genindex-all.html' + parser = PyIdxHTMLParser(formatter.NullFormatter(), base, fn, indent=1) + text = file(base + '/' + fn).read() + parser.feed(text) + parser.close() + + print '' + print '' + +main() --- python2.6-2.6.2.orig/debian/README.dbm +++ python2.6-2.6.2/debian/README.dbm @@ -0,0 +1,72 @@ + + Python and dbm modules on Debian + -------------------------------- + +This file documents the configuration of the dbm modules for Debian. It +gives hints at the preferred use of the dbm modules. + + +The preferred way to access dbm databases in Python is the anydbm module. +dbm databases behave like mappings (dictionaries). + +Since there exist several dbm database formats, we choose the following +layout for Python on Debian: + + * creating a new database with anydbm will create a Berkeley DB 2.X Hash + database file. This is the standard format used by libdb starting + with glibc 2.1. + + * opening an existing database with anydbm will try to guess the format + of the file (using whichdb) and then load it using one of the bsddb, + bsddb1, gdbm or dbm (only if the python-gdbm package is installed) + or dumbdbm modules. + + * The modules use the following database formats: + + - bsddb: Berkeley DB 2.X Hash (as in libc6 >=2.1 or libdb2) + - bsddb1: Berkeley DB 1.85 Hash (as in libc6 >=2.1 or libdb2) + - gdbm: GNU dbm 1.x or ndbm + - dbm: " (nearly the same as the gdbm module for us) + - dumbdbm: a hand-crafted format only used in this module + + That means that all usual formats should be readable with anydbm. + + * If you want to create a database in a format different from DB 2.X, + you can still directly use the specified module. + + * I.e. bsddb is the preferred module, and DB 2.X is the preferred format. + + * Note that the db1hash and bsddb1 modules are Debian specific. anydbm + and whichdb have been modified to support DB 2.X Hash files (see + below for details). + + + +For experts only: +---------------- + +Although bsddb employs the new DB 2.X format and uses the new Sleepycat +DB 2 library as included with glibc >= 2.1, it's still using the old +DB 1.85 API (which is still supported by DB 2). + +A more recent version 1.1 of the BSD DB module (available from +http://starship.skyport.net/robind/python/) directly uses the DB 2.X API. +It has a richer set of features. + + +On a glibc 2.1 system, bsddb is linked with -ldb, bsddb1 is linked with +-ldb1 and gdbm as well as dbm are linked with -lgdbm. + +On a glibc 2.0 system (e.g. potato for m68k or slink), bsddb will be +linked with -ldb2 while bsddb1 will be linked with -ldb (therefore +python-base here depends on libdb2). + + +db1hash and bsddb1 nearly completely identical to dbhash and bsddb. The +only difference is that bsddb is linked with the real DB 2 library, while +bsddb1 is linked with an library which provides compatibility with legacy +DB 1.85 databases. + + + July 16, 1999 + Gregor Hoffleit --- python2.6-2.6.2.orig/debian/control.doc +++ python2.6-2.6.2/debian/control.doc @@ -0,0 +1,26 @@ +Source: @PVER@-doc +Section: contrib/python +Priority: optional +Maintainer: Matthias Klose +Build-Depends-Indep: debhelper (>= 4.2), python2.4, libhtml-tree-perl, tetex-bin, tetex-extra, texinfo, emacs21, debiandoc-sgml, sharutils, latex2html, bzip2 +Standards-Version: 3.6.2 + +Package: @PVER@-doc +Section: contrib/doc +Architecture: all +Suggests: @PVER@ +Description: Documentation for the high-level object-oriented language Python (v@VER@) + These is the official set of documentation for the interactive high-level + object-oriented language Python (v@VER@). All documents are provided + in HTML format, some in info format. The package consists of ten documents: + . + * What's New in Python@VER@ + * Tutorial + * Python Library Reference + * Macintosh Module Reference + * Python Language Reference + * Extending and Embedding Python + * Python/C API Reference + * Installing Python Modules + * Documenting Python + * Distributing Python Modules --- python2.6-2.6.2.orig/debian/PVER.overrides.in +++ python2.6-2.6.2/debian/PVER.overrides.in @@ -0,0 +1,8 @@ +# idlelib images +@PVER@ binary: image-file-in-usr-lib + +# yes, we have to +@PVER@ binary: depends-on-python-minimal + +@PVER@ binary: desktop-command-not-in-package +@PVER@ binary: menu-command-not-in-package --- python2.6-2.6.2.orig/debian/PVER.menu.in +++ python2.6-2.6.2/debian/PVER.menu.in @@ -0,0 +1,4 @@ +?package(@PVER@):needs="text" section="Applications/Programming"\ + title="Python (v@VER@)"\ + icon="/usr/share/pixmaps/@PVER@.xpm"\ + command="/usr/bin/python@VER@" --- python2.6-2.6.2.orig/debian/idle-PVER.1.in +++ python2.6-2.6.2/debian/idle-PVER.1.in @@ -0,0 +1,104 @@ +.TH IDLE 1 "21 September 2004" +.SH NAME +\fBIDLE\fP \- An Integrated DeveLopment Environment for Python +.SH SYNTAX +.B idle [ \fI-dins\fP ] [ \fI-t title\fP ] [ \fIfile\fP ...] +.PP +.B idle [ \fI-dins\fP ] [ \fI-t title\fP ] ( \fI-c cmd\fP | \fI-r file\fP ) [ \fIarg\fP ...] +.PP +.B idle [ \fI-dins\fP ] [ \fI-t title\fP ] - [ \fIarg\fP ...] +.SH DESCRIPTION +This manual page documents briefly the +.BR idle +command. +This manual page was written for Debian +because the original program does not have a manual page. +For more information, refer to IDLE's help menu. +.PP +.B IDLE +is an Integrated DeveLopment Environment for Python. IDLE is based on +Tkinter, Python's bindings to the Tk widget set. Features are 100% pure +Python, multi-windows with multiple undo and Python colorizing, a Python +shell window subclass, a debugger. IDLE is cross-platform, i.e. it works +on all platforms where Tk is installed. +.LP +.SH OPTIONS +.TP +.B \-h +.PD +Print this help message and exit. +.TP +.B \-n +.PD +Run IDLE without a subprocess (see Help/IDLE Help for details). +.PP +The following options will override the IDLE 'settings' configuration: +.TP +.B \-e +.PD +Open an edit window. +.TP +.B \-i +.PD +Open a shell window. +.PP +The following options imply -i and will open a shell: +.TP +.B \-c cmd +.PD +Run the command in a shell, or +.TP +.B \-r file +.PD +Run script from file. +.PP +.TP +.B \-d +.PD +Enable the debugger. +.TP +.B \-s +.PD +Run $IDLESTARTUP or $PYTHONSTARTUP before anything else. +.TP +.B \-t title +.PD +Set title of shell window. +.PP +A default edit window will be bypassed when -c, -r, or - are used. +.PP +[arg]* and [file]* are passed to the command (-c) or script (-r) in sys.argv[1:]. +.SH EXAMPLES +.TP +idle +.PD +Open an edit window or shell depending on IDLE's configuration. +.TP +idle foo.py foobar.py +.PD +Edit the files, also open a shell if configured to start with shell. +.TP +idle -est "Baz" foo.py +.PD +Run $IDLESTARTUP or $PYTHONSTARTUP, edit foo.py, and open a shell +window with the title "Baz". +.TP +idle -c "import sys; print sys.argv" "foo" +.PD +Open a shell window and run the command, passing "-c" in sys.argv[0] +and "foo" in sys.argv[1]. +.TP +idle -d -s -r foo.py "Hello World" +.PD +Open a shell window, run a startup script, enable the debugger, and +run foo.py, passing "foo.py" in sys.argv[0] and "Hello World" in +sys.argv[1]. +.TP +echo "import sys; print sys.argv" | idle - "foobar" +.PD +Open a shell window, run the script piped in, passing '' in sys.argv[0] +and "foobar" in sys.argv[1]. +.SH SEE ALSO +python(1). +.SH AUTHORS +Various. --- python2.6-2.6.2.orig/debian/PVER-doc.doc-base.PVER-dist.in +++ python2.6-2.6.2/debian/PVER-doc.doc-base.PVER-dist.in @@ -0,0 +1,13 @@ +Document: @PVER@-dist +Title: Distributing Python Modules (v@VER@) +Author: Greg Ward +Abstract: This document describes the Python Distribution Utilities + (``Distutils'') from the module developer's point-of-view, describing + how to use the Distutils to make Python modules and extensions easily + available to a wider audience with very little overhead for + build/release/install mechanics. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/distutils/index.html +Files: /usr/share/doc/@PVER@/html/distutils/*.html --- python2.6-2.6.2.orig/debian/PVER-dbg.prerm.in +++ python2.6-2.6.2/debian/PVER-dbg.prerm.in @@ -0,0 +1,10 @@ +#! /bin/sh -e + +PACKAGE=@PVER@-dbg + +rmdir /usr/local/lib/@PVER@/site-packages/debug 2>/dev/null && \ + rmdir /usr/local/lib/@PVER@/site-packages 2>/dev/null || \ + rmdir /usr/local/lib/@PVER@ 2>/dev/null || \ + true + +#DEBHELPER# --- python2.6-2.6.2.orig/debian/libpython.symbols.in +++ python2.6-2.6.2/debian/libpython.symbols.in @@ -0,0 +1,1189 @@ + PyAST_Check@Base @VER@ + PyAST_Compile@Base @VER@ + PyAST_FromNode@Base @VER@ + PyAST_mod2obj@Base @VER@ + PyAST_obj2mod@Base @VER@ + PyArena_AddPyObject@Base @VER@ + PyArena_Free@Base @VER@ + PyArena_Malloc@Base @VER@ + PyArena_New@Base @VER@ + PyArg_Parse@Base @VER@ + PyArg_ParseTuple@Base @VER@ + PyArg_ParseTupleAndKeywords@Base @VER@ + PyArg_UnpackTuple@Base @VER@ + PyArg_VaParse@Base @VER@ + PyArg_VaParseTupleAndKeywords@Base @VER@ + PyBaseObject_Type@Base @VER@ + PyBaseString_Type@Base @VER@ + PyBool_FromLong@Base @VER@ + PyBool_Type@Base @VER@ + PyBuffer_FillContiguousStrides@Base @VER@ + PyBuffer_FillInfo@Base @VER@ + PyBuffer_FromContiguous@Base @VER@ + PyBuffer_FromMemory@Base @VER@ + PyBuffer_FromObject@Base @VER@ + PyBuffer_FromReadWriteMemory@Base @VER@ + PyBuffer_FromReadWriteObject@Base @VER@ + PyBuffer_GetPointer@Base @VER@ + PyBuffer_IsContiguous@Base @VER@ + PyBuffer_New@Base @VER@ + PyBuffer_Release@Base @VER@ + PyBuffer_ToContiguous@Base @VER@ + PyBuffer_Type@Base @VER@ + PyByteArrayIter_Type@Base @VER@ + PyByteArray_AsString@Base @VER@ + PyByteArray_Concat@Base @VER@ + PyByteArray_Fini@Base @VER@ + PyByteArray_FromObject@Base @VER@ + PyByteArray_FromStringAndSize@Base @VER@ + PyByteArray_Init@Base @VER@ + PyByteArray_Resize@Base @VER@ + PyByteArray_Size@Base @VER@ + PyByteArray_Type@Base @VER@ + PyCFunction_Call@Base @VER@ + PyCFunction_ClearFreeList@Base @VER@ + PyCFunction_Fini@Base @VER@ + PyCFunction_GetFlags@Base @VER@ + PyCFunction_GetFunction@Base @VER@ + PyCFunction_GetSelf@Base @VER@ + PyCFunction_New@Base @VER@ + PyCFunction_NewEx@Base @VER@ + PyCFunction_Type@Base @VER@ + PyCObject_AsVoidPtr@Base @VER@ + PyCObject_FromVoidPtr@Base @VER@ + PyCObject_FromVoidPtrAndDesc@Base @VER@ + PyCObject_GetDesc@Base @VER@ + PyCObject_Import@Base @VER@ + PyCObject_SetVoidPtr@Base @VER@ + PyCObject_Type@Base @VER@ + PyCallIter_New@Base @VER@ + PyCallIter_Type@Base @VER@ + PyCallable_Check@Base @VER@ + PyCell_Get@Base @VER@ + PyCell_New@Base @VER@ + PyCell_Set@Base @VER@ + PyCell_Type@Base @VER@ + PyClassMethod_New@Base @VER@ + PyClassMethod_Type@Base @VER@ + PyClass_IsSubclass@Base @VER@ + PyClass_New@Base @VER@ + PyClass_Type@Base @VER@ + PyCode_Addr2Line@Base @VER@ + PyCode_CheckLineNumber@Base @VER@ + PyCode_New@Base @VER@ + PyCode_Optimize@Base @VER@ + PyCode_Type@Base @VER@ + PyCodec_BackslashReplaceErrors@Base @VER@ + PyCodec_Decode@Base @VER@ + PyCodec_Decoder@Base @VER@ + PyCodec_Encode@Base @VER@ + PyCodec_Encoder@Base @VER@ + PyCodec_IgnoreErrors@Base @VER@ + PyCodec_IncrementalDecoder@Base @VER@ + PyCodec_IncrementalEncoder@Base @VER@ + PyCodec_LookupError@Base @VER@ + PyCodec_Register@Base @VER@ + PyCodec_RegisterError@Base @VER@ + PyCodec_ReplaceErrors@Base @VER@ + PyCodec_StreamReader@Base @VER@ + PyCodec_StreamWriter@Base @VER@ + PyCodec_StrictErrors@Base @VER@ + PyCodec_XMLCharRefReplaceErrors@Base @VER@ + PyComplex_AsCComplex@Base @VER@ + PyComplex_FromCComplex@Base @VER@ + PyComplex_FromDoubles@Base @VER@ + PyComplex_ImagAsDouble@Base @VER@ + PyComplex_RealAsDouble@Base @VER@ + PyComplex_Type@Base @VER@ + PyDescr_NewClassMethod@Base @VER@ + PyDescr_NewGetSet@Base @VER@ + PyDescr_NewMember@Base @VER@ + PyDescr_NewMethod@Base @VER@ + PyDescr_NewWrapper@Base @VER@ + PyDictIterItem_Type@Base @VER@ + PyDictIterKey_Type@Base @VER@ + PyDictIterValue_Type@Base @VER@ + PyDictProxy_New@Base @VER@ + PyDictProxy_Type@Base 2.6.2 + PyDict_Clear@Base @VER@ + PyDict_Contains@Base @VER@ + PyDict_Copy@Base @VER@ + PyDict_DelItem@Base @VER@ + PyDict_DelItemString@Base @VER@ + PyDict_Fini@Base @VER@ + PyDict_GetItem@Base @VER@ + PyDict_GetItemString@Base @VER@ + PyDict_Items@Base @VER@ + PyDict_Keys@Base @VER@ + PyDict_Merge@Base @VER@ + PyDict_MergeFromSeq2@Base @VER@ + PyDict_New@Base @VER@ + PyDict_Next@Base @VER@ + PyDict_SetItem@Base @VER@ + PyDict_SetItemString@Base @VER@ + PyDict_Size@Base @VER@ + PyDict_Type@Base @VER@ + PyDict_Update@Base @VER@ + PyDict_Values@Base @VER@ + PyEllipsis_Type@Base 2.6.2 + PyEnum_Type@Base @VER@ + PyErr_BadArgument@Base @VER@ + PyErr_BadInternalCall@Base @VER@ + PyErr_CheckSignals@Base @VER@ + PyErr_Clear@Base @VER@ + PyErr_Display@Base @VER@ + PyErr_ExceptionMatches@Base @VER@ + PyErr_Fetch@Base @VER@ + PyErr_Format@Base @VER@ + PyErr_GivenExceptionMatches@Base @VER@ + PyErr_NewException@Base @VER@ + PyErr_NoMemory@Base @VER@ + PyErr_NormalizeException@Base @VER@ + PyErr_Occurred@Base @VER@ + PyErr_Print@Base @VER@ + PyErr_PrintEx@Base @VER@ + PyErr_ProgramText@Base @VER@ + PyErr_Restore@Base @VER@ + PyErr_SetFromErrno@Base @VER@ + PyErr_SetFromErrnoWithFilename@Base @VER@ + PyErr_SetFromErrnoWithFilenameObject@Base @VER@ + PyErr_SetInterrupt@Base @VER@ + PyErr_SetNone@Base @VER@ + PyErr_SetObject@Base @VER@ + PyErr_SetString@Base @VER@ + PyErr_SyntaxLocation@Base @VER@ + PyErr_Warn@Base @VER@ + PyErr_WarnEx@Base @VER@ + PyErr_WarnExplicit@Base @VER@ + PyErr_WriteUnraisable@Base @VER@ + PyEval_AcquireLock@Base @VER@ + PyEval_AcquireThread@Base @VER@ + PyEval_CallFunction@Base @VER@ + PyEval_CallMethod@Base @VER@ + PyEval_CallObject@Base @VER@ + PyEval_CallObjectWithKeywords@Base @VER@ + PyEval_EvalCode@Base @VER@ + PyEval_EvalCodeEx@Base @VER@ + PyEval_EvalFrame@Base @VER@ + PyEval_EvalFrameEx@Base @VER@ + PyEval_GetBuiltins@Base @VER@ + PyEval_GetCallStats@Base @VER@ + PyEval_GetFrame@Base @VER@ + PyEval_GetFuncDesc@Base @VER@ + PyEval_GetFuncName@Base @VER@ + PyEval_GetGlobals@Base @VER@ + PyEval_GetLocals@Base @VER@ + PyEval_GetRestricted@Base @VER@ + PyEval_InitThreads@Base @VER@ + PyEval_MergeCompilerFlags@Base @VER@ + PyEval_ReInitThreads@Base @VER@ + PyEval_ReleaseLock@Base @VER@ + PyEval_ReleaseThread@Base @VER@ + PyEval_RestoreThread@Base @VER@ + PyEval_SaveThread@Base @VER@ + PyEval_SetProfile@Base @VER@ + PyEval_SetTrace@Base @VER@ + PyEval_ThreadsInitialized@Base @VER@ + PyExc_ArithmeticError@Base @VER@ + PyExc_AssertionError@Base @VER@ + PyExc_AttributeError@Base @VER@ + PyExc_BaseException@Base @VER@ + PyExc_BufferError@Base @VER@ + PyExc_BytesWarning@Base @VER@ + PyExc_DeprecationWarning@Base @VER@ + PyExc_EOFError@Base @VER@ + PyExc_EnvironmentError@Base @VER@ + PyExc_Exception@Base @VER@ + PyExc_FloatingPointError@Base @VER@ + PyExc_FutureWarning@Base @VER@ + PyExc_GeneratorExit@Base @VER@ + PyExc_IOError@Base @VER@ + PyExc_ImportError@Base @VER@ + PyExc_ImportWarning@Base @VER@ + PyExc_IndentationError@Base @VER@ + PyExc_IndexError@Base @VER@ + PyExc_KeyError@Base @VER@ + PyExc_KeyboardInterrupt@Base @VER@ + PyExc_LookupError@Base @VER@ + PyExc_MemoryError@Base @VER@ + PyExc_MemoryErrorInst@Base @VER@ + PyExc_NameError@Base @VER@ + PyExc_NotImplementedError@Base @VER@ + PyExc_OSError@Base @VER@ + PyExc_OverflowError@Base @VER@ + PyExc_PendingDeprecationWarning@Base @VER@ + PyExc_RecursionErrorInst@Base @VER@ + PyExc_ReferenceError@Base @VER@ + PyExc_RuntimeError@Base @VER@ + PyExc_RuntimeWarning@Base @VER@ + PyExc_StandardError@Base @VER@ + PyExc_StopIteration@Base @VER@ + PyExc_SyntaxError@Base @VER@ + PyExc_SyntaxWarning@Base @VER@ + PyExc_SystemError@Base @VER@ + PyExc_SystemExit@Base @VER@ + PyExc_TabError@Base @VER@ + PyExc_TypeError@Base @VER@ + PyExc_UnboundLocalError@Base @VER@ + PyExc_UnicodeDecodeError@Base @VER@ + PyExc_UnicodeEncodeError@Base @VER@ + PyExc_UnicodeError@Base @VER@ + PyExc_UnicodeTranslateError@Base @VER@ + PyExc_UnicodeWarning@Base @VER@ + PyExc_UserWarning@Base @VER@ + PyExc_ValueError@Base @VER@ + PyExc_Warning@Base @VER@ + PyExc_ZeroDivisionError@Base @VER@ + PyFile_AsFile@Base @VER@ + PyFile_DecUseCount@Base @VER@ + PyFile_FromFile@Base @VER@ + PyFile_FromString@Base @VER@ + PyFile_GetLine@Base @VER@ + PyFile_IncUseCount@Base @VER@ + PyFile_Name@Base @VER@ + PyFile_SetBufSize@Base @VER@ + PyFile_SetEncoding@Base @VER@ + PyFile_SetEncodingAndErrors@Base @VER@ + PyFile_SoftSpace@Base @VER@ + PyFile_Type@Base @VER@ + PyFile_WriteObject@Base @VER@ + PyFile_WriteString@Base @VER@ + PyFloat_AsDouble@Base @VER@ + PyFloat_AsReprString@Base @VER@ + PyFloat_AsString@Base @VER@ + PyFloat_AsStringEx@Base @VER@ + PyFloat_ClearFreeList@Base @VER@ + PyFloat_Fini@Base @VER@ + PyFloat_FromDouble@Base @VER@ + PyFloat_FromString@Base @VER@ + PyFloat_GetInfo@Base @VER@ + PyFloat_GetMax@Base @VER@ + PyFloat_GetMin@Base @VER@ + PyFloat_Type@Base @VER@ + PyFrame_BlockPop@Base @VER@ + PyFrame_BlockSetup@Base @VER@ + PyFrame_ClearFreeList@Base @VER@ + PyFrame_FastToLocals@Base @VER@ + PyFrame_Fini@Base @VER@ + PyFrame_LocalsToFast@Base @VER@ + PyFrame_New@Base @VER@ + PyFrame_Type@Base @VER@ + PyFrozenSet_New@Base @VER@ + PyFrozenSet_Type@Base @VER@ + PyFunction_GetClosure@Base @VER@ + PyFunction_GetCode@Base @VER@ + PyFunction_GetDefaults@Base @VER@ + PyFunction_GetGlobals@Base @VER@ + PyFunction_GetModule@Base @VER@ + PyFunction_New@Base @VER@ + PyFunction_SetClosure@Base @VER@ + PyFunction_SetDefaults@Base @VER@ + PyFunction_Type@Base @VER@ + PyFuture_FromAST@Base @VER@ + PyGC_Collect@Base @VER@ + PyGILState_Ensure@Base @VER@ + PyGILState_GetThisThreadState@Base @VER@ + PyGILState_Release@Base @VER@ + PyGen_NeedsFinalizing@Base @VER@ + PyGen_New@Base @VER@ + PyGen_Type@Base @VER@ + PyGetSetDescr_Type@Base 2.6.2 + PyGrammar_AddAccelerators@Base @VER@ + PyGrammar_FindDFA@Base @VER@ + PyGrammar_LabelRepr@Base @VER@ + PyGrammar_RemoveAccelerators@Base @VER@ + PyImport_AddModule@Base @VER@ + PyImport_AppendInittab@Base @VER@ + PyImport_Cleanup@Base @VER@ + PyImport_ExecCodeModule@Base @VER@ + PyImport_ExecCodeModuleEx@Base @VER@ + PyImport_ExtendInittab@Base @VER@ + PyImport_FrozenModules@Base @VER@ + PyImport_GetImporter@Base @VER@ + PyImport_GetMagicNumber@Base @VER@ + PyImport_GetModuleDict@Base @VER@ + PyImport_Import@Base @VER@ + PyImport_ImportFrozenModule@Base @VER@ + PyImport_ImportModule@Base @VER@ + PyImport_ImportModuleLevel@Base @VER@ + PyImport_ImportModuleNoBlock@Base @VER@ + PyImport_Inittab@Base @VER@ + PyImport_ReloadModule@Base @VER@ + PyInstance_New@Base @VER@ + PyInstance_NewRaw@Base @VER@ + PyInstance_Type@Base @VER@ + PyInt_AsLong@Base @VER@ + PyInt_AsSsize_t@Base @VER@ + PyInt_AsUnsignedLongLongMask@Base @VER@ + PyInt_AsUnsignedLongMask@Base @VER@ + PyInt_ClearFreeList@Base @VER@ + PyInt_Fini@Base @VER@ + PyInt_FromLong@Base @VER@ + PyInt_FromSize_t@Base @VER@ + PyInt_FromSsize_t@Base @VER@ + PyInt_FromString@Base @VER@ + PyInt_FromUnicode@Base @VER@ + PyInt_GetMax@Base @VER@ + PyInt_Type@Base @VER@ + PyInterpreterState_Clear@Base @VER@ + PyInterpreterState_Delete@Base @VER@ + PyInterpreterState_Head@Base @VER@ + PyInterpreterState_New@Base @VER@ + PyInterpreterState_Next@Base @VER@ + PyInterpreterState_ThreadHead@Base @VER@ + PyIter_Next@Base @VER@ + PyListIter_Type@Base @VER@ + PyListRevIter_Type@Base @VER@ + PyList_Append@Base @VER@ + PyList_AsTuple@Base @VER@ + PyList_Fini@Base @VER@ + PyList_GetItem@Base @VER@ + PyList_GetSlice@Base @VER@ + PyList_Insert@Base @VER@ + PyList_New@Base @VER@ + PyList_Reverse@Base @VER@ + PyList_SetItem@Base @VER@ + PyList_SetSlice@Base @VER@ + PyList_Size@Base @VER@ + PyList_Sort@Base @VER@ + PyList_Type@Base @VER@ + PyLong_AsDouble@Base @VER@ + PyLong_AsLong@Base @VER@ + PyLong_AsLongLong@Base @VER@ + PyLong_AsSsize_t@Base @VER@ + PyLong_AsUnsignedLong@Base @VER@ + PyLong_AsUnsignedLongLong@Base @VER@ + PyLong_AsUnsignedLongLongMask@Base @VER@ + PyLong_AsUnsignedLongMask@Base @VER@ + PyLong_AsVoidPtr@Base @VER@ + PyLong_FromDouble@Base @VER@ + PyLong_FromLong@Base @VER@ + PyLong_FromLongLong@Base @VER@ + PyLong_FromSize_t@Base @VER@ + PyLong_FromSsize_t@Base @VER@ + PyLong_FromString@Base @VER@ + PyLong_FromUnicode@Base @VER@ + PyLong_FromUnsignedLong@Base @VER@ + PyLong_FromUnsignedLongLong@Base @VER@ + PyLong_FromVoidPtr@Base @VER@ + PyLong_Type@Base @VER@ + PyMapping_Check@Base @VER@ + PyMapping_GetItemString@Base @VER@ + PyMapping_HasKey@Base @VER@ + PyMapping_HasKeyString@Base @VER@ + PyMapping_Length@Base @VER@ + PyMapping_SetItemString@Base @VER@ + PyMapping_Size@Base @VER@ + PyMarshal_Init@Base @VER@ + PyMarshal_ReadLastObjectFromFile@Base @VER@ + PyMarshal_ReadLongFromFile@Base @VER@ + PyMarshal_ReadObjectFromFile@Base @VER@ + PyMarshal_ReadObjectFromString@Base @VER@ + PyMarshal_ReadShortFromFile@Base @VER@ + PyMarshal_WriteLongToFile@Base @VER@ + PyMarshal_WriteObjectToFile@Base @VER@ + PyMarshal_WriteObjectToString@Base @VER@ + PyMem_Free@Base @VER@ + PyMem_Malloc@Base @VER@ + PyMem_Realloc@Base @VER@ + PyMemberDescr_Type@Base 2.6.2 + PyMember_Get@Base @VER@ + PyMember_GetOne@Base @VER@ + PyMember_Set@Base @VER@ + PyMember_SetOne@Base @VER@ + PyMethod_Class@Base @VER@ + PyMethod_ClearFreeList@Base @VER@ + PyMethod_Fini@Base @VER@ + PyMethod_Function@Base @VER@ + PyMethod_New@Base @VER@ + PyMethod_Self@Base @VER@ + PyMethod_Type@Base @VER@ + PyModule_AddIntConstant@Base @VER@ + PyModule_AddObject@Base @VER@ + PyModule_AddStringConstant@Base @VER@ + PyModule_GetDict@Base @VER@ + PyModule_GetFilename@Base @VER@ + PyModule_GetName@Base @VER@ + PyModule_GetWarningsModule@Base @VER@ + PyModule_New@Base @VER@ + PyModule_Type@Base @VER@ + PyNode_AddChild@Base @VER@ + PyNode_Compile@Base @VER@ + PyNode_Free@Base @VER@ + PyNode_ListTree@Base @VER@ + PyNode_New@Base @VER@ + PyNullImporter_Type@Base @VER@ + PyNumber_Absolute@Base @VER@ + PyNumber_Add@Base @VER@ + PyNumber_And@Base @VER@ + PyNumber_AsSsize_t@Base @VER@ + PyNumber_Check@Base @VER@ + PyNumber_Coerce@Base @VER@ + PyNumber_CoerceEx@Base @VER@ + PyNumber_Divide@Base @VER@ + PyNumber_Divmod@Base @VER@ + PyNumber_Float@Base @VER@ + PyNumber_FloorDivide@Base @VER@ + PyNumber_InPlaceAdd@Base @VER@ + PyNumber_InPlaceAnd@Base @VER@ + PyNumber_InPlaceDivide@Base @VER@ + PyNumber_InPlaceFloorDivide@Base @VER@ + PyNumber_InPlaceLshift@Base @VER@ + PyNumber_InPlaceMultiply@Base @VER@ + PyNumber_InPlaceOr@Base @VER@ + PyNumber_InPlacePower@Base @VER@ + PyNumber_InPlaceRemainder@Base @VER@ + PyNumber_InPlaceRshift@Base @VER@ + PyNumber_InPlaceSubtract@Base @VER@ + PyNumber_InPlaceTrueDivide@Base @VER@ + PyNumber_InPlaceXor@Base @VER@ + PyNumber_Index@Base @VER@ + PyNumber_Int@Base @VER@ + PyNumber_Invert@Base @VER@ + PyNumber_Long@Base @VER@ + PyNumber_Lshift@Base @VER@ + PyNumber_Multiply@Base @VER@ + PyNumber_Negative@Base @VER@ + PyNumber_Or@Base @VER@ + PyNumber_Positive@Base @VER@ + PyNumber_Power@Base @VER@ + PyNumber_Remainder@Base @VER@ + PyNumber_Rshift@Base @VER@ + PyNumber_Subtract@Base @VER@ + PyNumber_ToBase@Base @VER@ + PyNumber_TrueDivide@Base @VER@ + PyNumber_Xor@Base @VER@ + PyOS_AfterFork@Base @VER@ + PyOS_FiniInterrupts@Base @VER@ + PyOS_GetLastModificationTime@Base @VER@ + PyOS_InitInterrupts@Base @VER@ + PyOS_InputHook@Base @VER@ + PyOS_InterruptOccurred@Base @VER@ + PyOS_Readline@Base @VER@ + PyOS_ReadlineFunctionPointer@Base @VER@ + PyOS_StdioReadline@Base @VER@ + PyOS_ascii_atof@Base @VER@ + PyOS_ascii_formatd@Base @VER@ + PyOS_ascii_strtod@Base @VER@ + PyOS_getsig@Base @VER@ + PyOS_mystricmp@Base @VER@ + PyOS_mystrnicmp@Base @VER@ + PyOS_setsig@Base @VER@ + PyOS_snprintf@Base @VER@ + PyOS_strtol@Base @VER@ + PyOS_strtoul@Base @VER@ + PyOS_vsnprintf@Base @VER@ + PyObject_AsCharBuffer@Base @VER@ + PyObject_AsFileDescriptor@Base @VER@ + PyObject_AsReadBuffer@Base @VER@ + PyObject_AsWriteBuffer@Base @VER@ + PyObject_Call@Base @VER@ + PyObject_CallFunction@Base @VER@ + PyObject_CallFunctionObjArgs@Base @VER@ + PyObject_CallMethod@Base @VER@ + PyObject_CallMethodObjArgs@Base @VER@ + PyObject_CallObject@Base @VER@ + PyObject_CheckReadBuffer@Base @VER@ + PyObject_ClearWeakRefs@Base @VER@ + PyObject_Cmp@Base @VER@ + PyObject_Compare@Base @VER@ + PyObject_CopyData@Base @VER@ + PyObject_DelItem@Base @VER@ + PyObject_DelItemString@Base @VER@ + PyObject_Dir@Base @VER@ + PyObject_Format@Base @VER@ + PyObject_Free@Base @VER@ + PyObject_GC_Del@Base @VER@ + PyObject_GC_Track@Base @VER@ + PyObject_GC_UnTrack@Base @VER@ + PyObject_GenericGetAttr@Base @VER@ + PyObject_GenericSetAttr@Base @VER@ + PyObject_GetAttr@Base @VER@ + PyObject_GetAttrString@Base @VER@ + PyObject_GetBuffer@Base @VER@ + PyObject_GetItem@Base @VER@ + PyObject_GetIter@Base @VER@ + PyObject_HasAttr@Base @VER@ + PyObject_HasAttrString@Base @VER@ + PyObject_Hash@Base @VER@ + PyObject_HashNotImplemented@Base @VER@ + PyObject_Init@Base @VER@ + PyObject_InitVar@Base @VER@ + PyObject_IsInstance@Base @VER@ + PyObject_IsSubclass@Base @VER@ + PyObject_IsTrue@Base @VER@ + PyObject_Length@Base @VER@ + PyObject_Malloc@Base @VER@ + PyObject_Not@Base @VER@ + PyObject_Print@Base @VER@ + PyObject_Realloc@Base @VER@ + PyObject_Repr@Base @VER@ + PyObject_RichCompare@Base @VER@ + PyObject_RichCompareBool@Base @VER@ + PyObject_SelfIter@Base @VER@ + PyObject_SetAttr@Base @VER@ + PyObject_SetAttrString@Base @VER@ + PyObject_SetItem@Base @VER@ + PyObject_Size@Base @VER@ + PyObject_Str@Base @VER@ + PyObject_Type@Base @VER@ + PyObject_Unicode@Base @VER@ + PyParser_ASTFromFile@Base @VER@ + PyParser_ASTFromString@Base @VER@ + PyParser_AddToken@Base @VER@ + PyParser_Delete@Base @VER@ + PyParser_New@Base @VER@ + PyParser_ParseFile@Base @VER@ + PyParser_ParseFileFlags@Base @VER@ + PyParser_ParseFileFlagsEx@Base @VER@ + PyParser_ParseString@Base @VER@ + PyParser_ParseStringFlags@Base @VER@ + PyParser_ParseStringFlagsFilename@Base @VER@ + PyParser_ParseStringFlagsFilenameEx@Base @VER@ + PyParser_SetError@Base @VER@ + PyParser_SimpleParseFile@Base @VER@ + PyParser_SimpleParseFileFlags@Base @VER@ + PyParser_SimpleParseString@Base @VER@ + PyParser_SimpleParseStringFilename@Base @VER@ + PyParser_SimpleParseStringFlags@Base @VER@ + PyParser_SimpleParseStringFlagsFilename@Base @VER@ + PyProperty_Type@Base @VER@ + PyRange_Type@Base @VER@ + PyReversed_Type@Base @VER@ + PyRun_AnyFile@Base @VER@ + PyRun_AnyFileEx@Base @VER@ + PyRun_AnyFileExFlags@Base @VER@ + PyRun_AnyFileFlags@Base @VER@ + PyRun_File@Base @VER@ + PyRun_FileEx@Base @VER@ + PyRun_FileExFlags@Base @VER@ + PyRun_FileFlags@Base @VER@ + PyRun_InteractiveLoop@Base @VER@ + PyRun_InteractiveLoopFlags@Base @VER@ + PyRun_InteractiveOne@Base @VER@ + PyRun_InteractiveOneFlags@Base @VER@ + PyRun_SimpleFile@Base @VER@ + PyRun_SimpleFileEx@Base @VER@ + PyRun_SimpleFileExFlags@Base @VER@ + PyRun_SimpleString@Base @VER@ + PyRun_SimpleStringFlags@Base @VER@ + PyRun_String@Base @VER@ + PyRun_StringFlags@Base @VER@ + PySTEntry_Type@Base @VER@ + PyST_GetScope@Base @VER@ + PySeqIter_New@Base @VER@ + PySeqIter_Type@Base @VER@ + PySequence_Check@Base @VER@ + PySequence_Concat@Base @VER@ + PySequence_Contains@Base @VER@ + PySequence_Count@Base @VER@ + PySequence_DelItem@Base @VER@ + PySequence_DelSlice@Base @VER@ + PySequence_Fast@Base @VER@ + PySequence_GetItem@Base @VER@ + PySequence_GetSlice@Base @VER@ + PySequence_In@Base @VER@ + PySequence_InPlaceConcat@Base @VER@ + PySequence_InPlaceRepeat@Base @VER@ + PySequence_Index@Base @VER@ + PySequence_Length@Base @VER@ + PySequence_List@Base @VER@ + PySequence_Repeat@Base @VER@ + PySequence_SetItem@Base @VER@ + PySequence_SetSlice@Base @VER@ + PySequence_Size@Base @VER@ + PySequence_Tuple@Base @VER@ + PySet_Add@Base @VER@ + PySet_Clear@Base @VER@ + PySet_Contains@Base @VER@ + PySet_Discard@Base @VER@ + PySet_Fini@Base @VER@ + PySet_New@Base @VER@ + PySet_Pop@Base @VER@ + PySet_Size@Base @VER@ + PySet_Type@Base @VER@ + PySignal_SetWakeupFd@Base @VER@ + PySlice_GetIndices@Base @VER@ + PySlice_GetIndicesEx@Base @VER@ + PySlice_New@Base @VER@ + PySlice_Type@Base @VER@ + PyStaticMethod_New@Base @VER@ + PyStaticMethod_Type@Base @VER@ + PyString_AsDecodedObject@Base @VER@ + PyString_AsDecodedString@Base @VER@ + PyString_AsEncodedObject@Base @VER@ + PyString_AsEncodedString@Base @VER@ + PyString_AsString@Base @VER@ + PyString_AsStringAndSize@Base @VER@ + PyString_Concat@Base @VER@ + PyString_ConcatAndDel@Base @VER@ + PyString_Decode@Base @VER@ + PyString_DecodeEscape@Base @VER@ + PyString_Encode@Base @VER@ + PyString_Fini@Base @VER@ + PyString_Format@Base @VER@ + PyString_FromFormat@Base @VER@ + PyString_FromFormatV@Base @VER@ + PyString_FromString@Base @VER@ + PyString_FromStringAndSize@Base @VER@ + PyString_InternFromString@Base @VER@ + PyString_InternImmortal@Base @VER@ + PyString_InternInPlace@Base @VER@ + PyString_Repr@Base @VER@ + PyString_Size@Base @VER@ + PyString_Type@Base @VER@ + PyStructSequence_InitType@Base @VER@ + PyStructSequence_New@Base @VER@ + PyStructSequence_UnnamedField@Base @VER@ + PySuper_Type@Base @VER@ + PySymtable_Build@Base @VER@ + PySymtable_Free@Base @VER@ + PySymtable_Lookup@Base @VER@ + PySys_AddWarnOption@Base @VER@ + PySys_GetFile@Base @VER@ + PySys_GetObject@Base @VER@ + PySys_HasWarnOptions@Base @VER@ + PySys_ResetWarnOptions@Base @VER@ + PySys_SetArgv@Base @VER@ + PySys_SetObject@Base @VER@ + PySys_SetPath@Base @VER@ + PySys_WriteStderr@Base @VER@ + PySys_WriteStdout@Base @VER@ + PyThreadState_Clear@Base @VER@ + PyThreadState_Delete@Base @VER@ + PyThreadState_DeleteCurrent@Base @VER@ + PyThreadState_Get@Base @VER@ + PyThreadState_GetDict@Base @VER@ + PyThreadState_New@Base @VER@ + PyThreadState_Next@Base @VER@ + PyThreadState_SetAsyncExc@Base @VER@ + PyThreadState_Swap@Base @VER@ + PyThread_ReInitTLS@Base @VER@ + PyThread__exit_thread@Base @VER@ + PyThread_acquire_lock@Base @VER@ + PyThread_allocate_lock@Base @VER@ + PyThread_create_key@Base @VER@ + PyThread_delete_key@Base @VER@ + PyThread_delete_key_value@Base @VER@ + PyThread_exit_thread@Base @VER@ + PyThread_free_lock@Base @VER@ + PyThread_get_key_value@Base @VER@ + PyThread_get_stacksize@Base @VER@ + PyThread_get_thread_ident@Base @VER@ + PyThread_init_thread@Base @VER@ + PyThread_release_lock@Base @VER@ + PyThread_set_key_value@Base @VER@ + PyThread_set_stacksize@Base @VER@ + PyThread_start_new_thread@Base @VER@ + PyToken_OneChar@Base @VER@ + PyToken_ThreeChars@Base @VER@ + PyToken_TwoChars@Base @VER@ + PyTokenizer_Free@Base @VER@ + PyTokenizer_FromFile@Base @VER@ + PyTokenizer_FromString@Base @VER@ + PyTokenizer_Get@Base @VER@ + PyTokenizer_RestoreEncoding@Base @VER@ + PyTraceBack_Here@Base @VER@ + PyTraceBack_Print@Base @VER@ + PyTraceBack_Type@Base @VER@ + PyTupleIter_Type@Base @VER@ + PyTuple_ClearFreeList@Base @VER@ + PyTuple_Fini@Base @VER@ + PyTuple_GetItem@Base @VER@ + PyTuple_GetSlice@Base @VER@ + PyTuple_New@Base @VER@ + PyTuple_Pack@Base @VER@ + PyTuple_SetItem@Base @VER@ + PyTuple_Size@Base @VER@ + PyTuple_Type@Base @VER@ + PyType_ClearCache@Base @VER@ + PyType_GenericAlloc@Base @VER@ + PyType_GenericNew@Base @VER@ + PyType_IsSubtype@Base @VER@ + PyType_Modified@Base @VER@ + PyType_Ready@Base @VER@ + PyType_Type@Base @VER@ + PyUnicodeDecodeError_Create@Base @VER@ + PyUnicodeDecodeError_GetEncoding@Base @VER@ + PyUnicodeDecodeError_GetEnd@Base @VER@ + PyUnicodeDecodeError_GetObject@Base @VER@ + PyUnicodeDecodeError_GetReason@Base @VER@ + PyUnicodeDecodeError_GetStart@Base @VER@ + PyUnicodeDecodeError_SetEnd@Base @VER@ + PyUnicodeDecodeError_SetReason@Base @VER@ + PyUnicodeDecodeError_SetStart@Base @VER@ + PyUnicodeEncodeError_Create@Base @VER@ + PyUnicodeEncodeError_GetEncoding@Base @VER@ + PyUnicodeEncodeError_GetEnd@Base @VER@ + PyUnicodeEncodeError_GetObject@Base @VER@ + PyUnicodeEncodeError_GetReason@Base @VER@ + PyUnicodeEncodeError_GetStart@Base @VER@ + PyUnicodeEncodeError_SetEnd@Base @VER@ + PyUnicodeEncodeError_SetReason@Base @VER@ + PyUnicodeEncodeError_SetStart@Base @VER@ + PyUnicodeTranslateError_Create@Base @VER@ + PyUnicodeTranslateError_GetEnd@Base @VER@ + PyUnicodeTranslateError_GetObject@Base @VER@ + PyUnicodeTranslateError_GetReason@Base @VER@ + PyUnicodeTranslateError_GetStart@Base @VER@ + PyUnicodeTranslateError_SetEnd@Base @VER@ + PyUnicodeTranslateError_SetReason@Base @VER@ + PyUnicodeTranslateError_SetStart@Base @VER@ + PyUnicodeUCS4_AsASCIIString@Base @VER@ + PyUnicodeUCS4_AsCharmapString@Base @VER@ + PyUnicodeUCS4_AsEncodedObject@Base @VER@ + PyUnicodeUCS4_AsEncodedString@Base @VER@ + PyUnicodeUCS4_AsLatin1String@Base @VER@ + PyUnicodeUCS4_AsRawUnicodeEscapeString@Base @VER@ + PyUnicodeUCS4_AsUTF16String@Base @VER@ + PyUnicodeUCS4_AsUTF32String@Base @VER@ + PyUnicodeUCS4_AsUTF8String@Base @VER@ + PyUnicodeUCS4_AsUnicode@Base @VER@ + PyUnicodeUCS4_AsUnicodeEscapeString@Base @VER@ + PyUnicodeUCS4_AsWideChar@Base @VER@ + PyUnicodeUCS4_ClearFreelist@Base @VER@ + PyUnicodeUCS4_Compare@Base @VER@ + PyUnicodeUCS4_Concat@Base @VER@ + PyUnicodeUCS4_Contains@Base @VER@ + PyUnicodeUCS4_Count@Base @VER@ + PyUnicodeUCS4_Decode@Base @VER@ + PyUnicodeUCS4_DecodeASCII@Base @VER@ + PyUnicodeUCS4_DecodeCharmap@Base @VER@ + PyUnicodeUCS4_DecodeLatin1@Base @VER@ + PyUnicodeUCS4_DecodeRawUnicodeEscape@Base @VER@ + PyUnicodeUCS4_DecodeUTF16@Base @VER@ + PyUnicodeUCS4_DecodeUTF16Stateful@Base @VER@ + PyUnicodeUCS4_DecodeUTF32@Base @VER@ + PyUnicodeUCS4_DecodeUTF32Stateful@Base @VER@ + PyUnicodeUCS4_DecodeUTF8@Base @VER@ + PyUnicodeUCS4_DecodeUTF8Stateful@Base @VER@ + PyUnicodeUCS4_DecodeUnicodeEscape@Base @VER@ + PyUnicodeUCS4_Encode@Base @VER@ + PyUnicodeUCS4_EncodeASCII@Base @VER@ + PyUnicodeUCS4_EncodeCharmap@Base @VER@ + PyUnicodeUCS4_EncodeDecimal@Base @VER@ + PyUnicodeUCS4_EncodeLatin1@Base @VER@ + PyUnicodeUCS4_EncodeRawUnicodeEscape@Base @VER@ + PyUnicodeUCS4_EncodeUTF16@Base @VER@ + PyUnicodeUCS4_EncodeUTF32@Base @VER@ + PyUnicodeUCS4_EncodeUTF8@Base @VER@ + PyUnicodeUCS4_EncodeUnicodeEscape@Base @VER@ + PyUnicodeUCS4_Find@Base @VER@ + PyUnicodeUCS4_Format@Base @VER@ + PyUnicodeUCS4_FromEncodedObject@Base @VER@ + PyUnicodeUCS4_FromFormat@Base @VER@ + PyUnicodeUCS4_FromFormatV@Base @VER@ + PyUnicodeUCS4_FromObject@Base @VER@ + PyUnicodeUCS4_FromOrdinal@Base @VER@ + PyUnicodeUCS4_FromString@Base @VER@ + PyUnicodeUCS4_FromStringAndSize@Base @VER@ + PyUnicodeUCS4_FromUnicode@Base @VER@ + PyUnicodeUCS4_FromWideChar@Base @VER@ + PyUnicodeUCS4_GetDefaultEncoding@Base @VER@ + PyUnicodeUCS4_GetMax@Base @VER@ + PyUnicodeUCS4_GetSize@Base @VER@ + PyUnicodeUCS4_Join@Base @VER@ + PyUnicodeUCS4_Partition@Base @VER@ + PyUnicodeUCS4_RPartition@Base @VER@ + PyUnicodeUCS4_RSplit@Base @VER@ + PyUnicodeUCS4_Replace@Base @VER@ + PyUnicodeUCS4_Resize@Base @VER@ + PyUnicodeUCS4_RichCompare@Base @VER@ + PyUnicodeUCS4_SetDefaultEncoding@Base @VER@ + PyUnicodeUCS4_Split@Base @VER@ + PyUnicodeUCS4_Splitlines@Base @VER@ + PyUnicodeUCS4_Tailmatch@Base @VER@ + PyUnicodeUCS4_Translate@Base @VER@ + PyUnicodeUCS4_TranslateCharmap@Base @VER@ + PyUnicode_AsDecodedObject@Base @VER@ + PyUnicode_BuildEncodingMap@Base @VER@ + PyUnicode_DecodeUTF7@Base @VER@ + PyUnicode_DecodeUTF7Stateful@Base @VER@ + PyUnicode_EncodeUTF7@Base @VER@ + PyUnicode_Type@Base @VER@ + PyWeakref_GetObject@Base @VER@ + PyWeakref_NewProxy@Base @VER@ + PyWeakref_NewRef@Base @VER@ + PyWrapperDescr_Type@Base @VER@ + PyWrapper_New@Base @VER@ + Py_AddPendingCall@Base @VER@ + Py_AtExit@Base @VER@ + Py_BuildValue@Base @VER@ + Py_BytesWarningFlag@Base @VER@ + Py_CompileString@Base @VER@ + Py_CompileStringFlags@Base @VER@ + Py_DebugFlag@Base @VER@ + Py_DecRef@Base @VER@ + Py_DivisionWarningFlag@Base @VER@ + Py_DontWriteBytecodeFlag@Base @VER@ + Py_EndInterpreter@Base @VER@ + Py_Exit@Base @VER@ + Py_FatalError@Base @VER@ + Py_FdIsInteractive@Base @VER@ + Py_FileSystemDefaultEncoding@Base @VER@ + Py_Finalize@Base @VER@ + Py_FindMethod@Base @VER@ + Py_FindMethodInChain@Base @VER@ + Py_FlushLine@Base @VER@ + Py_FrozenFlag@Base @VER@ + Py_FrozenMain@Base @VER@ + Py_GetArgcArgv@Base @VER@ + Py_GetBuildInfo@Base @VER@ + Py_GetCompiler@Base @VER@ + Py_GetCopyright@Base @VER@ + Py_GetExecPrefix@Base @VER@ + Py_GetPath@Base @VER@ + Py_GetPlatform@Base @VER@ + Py_GetPrefix@Base @VER@ + Py_GetProgramFullPath@Base @VER@ + Py_GetProgramName@Base @VER@ + Py_GetPythonHome@Base @VER@ + Py_GetRecursionLimit@Base @VER@ + Py_GetVersion@Base @VER@ + Py_IgnoreEnvironmentFlag@Base @VER@ + Py_IncRef@Base @VER@ + Py_Initialize@Base @VER@ + Py_InitializeEx@Base @VER@ + Py_InspectFlag@Base @VER@ + Py_InteractiveFlag@Base @VER@ + Py_IsInitialized@Base @VER@ + Py_Main@Base @VER@ + Py_MakePendingCalls@Base @VER@ + Py_NewInterpreter@Base @VER@ + Py_NoSiteFlag@Base @VER@ + Py_NoUserSiteDirectory@Base @VER@ + Py_OptimizeFlag@Base @VER@ + Py_Py3kWarningFlag@Base @VER@ + Py_ReprEnter@Base @VER@ + Py_ReprLeave@Base @VER@ + Py_SetProgramName@Base @VER@ + Py_SetPythonHome@Base @VER@ + Py_SetRecursionLimit@Base @VER@ + Py_SubversionRevision@Base @VER@ + Py_SubversionShortBranch@Base @VER@ + Py_SymtableString@Base @VER@ + Py_TabcheckFlag@Base @VER@ + Py_UnicodeFlag@Base @VER@ + Py_UniversalNewlineFgets@Base @VER@ + Py_UniversalNewlineFread@Base @VER@ + Py_UseClassExceptionsFlag@Base @VER@ + Py_VaBuildValue@Base @VER@ + Py_VerboseFlag@Base @VER@ + Py_meta_grammar@Base @VER@ + Py_pgen@Base @VER@ + _PyArg_NoKeywords@Base @VER@ + _PyArg_ParseTupleAndKeywords_SizeT@Base @VER@ + _PyArg_ParseTuple_SizeT@Base @VER@ + _PyArg_Parse_SizeT@Base @VER@ + _PyArg_VaParseTupleAndKeywords_SizeT@Base @VER@ + _PyArg_VaParse_SizeT@Base @VER@ + _PyBuiltin_Init@Base @VER@ + _PyBytes_FormatAdvanced@Base @VER@ + _PyCodec_Lookup@Base @VER@ + _PyDict_Contains@Base @VER@ + _PyDict_NewPresized@Base @VER@ + _PyDict_Next@Base @VER@ + _PyErr_BadInternalCall@Base @VER@ + _PyEval_CallTracing@Base @VER@ + _PyEval_SliceIndex@Base @VER@ + _PyExc_Fini@Base @VER@ + _PyExc_Init@Base @VER@ + _PyFile_SanitizeMode@Base @VER@ + _PyFloat_FormatAdvanced@Base @VER@ + _PyFloat_Init@Base @VER@ + _PyFloat_Pack4@Base @VER@ + _PyFloat_Pack8@Base @VER@ + _PyFloat_Unpack4@Base @VER@ + _PyFloat_Unpack8@Base @VER@ + _PyFrame_Init@Base @VER@ + _PyGC_Dump@Base @VER@ + _PyGC_generation0@Base @VER@ + _PyGILState_Fini@Base @VER@ + _PyGILState_Init@Base @VER@ + _PyImportHooks_Init@Base @VER@ + _PyImport_DynLoadFiletab@Base @VER@ + _PyImport_Filetab@Base @VER@ + _PyImport_FindExtension@Base @VER@ + _PyImport_FindModule@Base @VER@ + _PyImport_Fini@Base @VER@ + _PyImport_FixupExtension@Base @VER@ + _PyImport_GetDynLoadFunc@Base @VER@ + _PyImport_Init@Base @VER@ + _PyImport_Inittab@Base @VER@ + _PyImport_IsScript@Base @VER@ + _PyImport_LoadDynamicModule@Base @VER@ + _PyImport_ReInitLock@Base @VER@ + _PyInstance_Lookup@Base @VER@ + _PyInt_Format@Base @VER@ + _PyInt_FormatAdvanced@Base @VER@ + _PyInt_Init@Base @VER@ + _PyList_Extend@Base @VER@ + _PyLong_AsByteArray@Base @VER@ + _PyLong_AsScaledDouble@Base @VER@ + _PyLong_Copy@Base @VER@ + _PyLong_DigitValue@Base @VER@ + _PyLong_Format@Base @VER@ + _PyLong_FormatAdvanced@Base @VER@ + _PyLong_FromByteArray@Base @VER@ + _PyLong_New@Base @VER@ + _PyLong_NumBits@Base @VER@ + _PyLong_Sign@Base @VER@ + _PyModule_Clear@Base @VER@ + _PyNumber_ConvertIntegralToInt@Base @VER@ + _PyOS_GetOpt@Base @VER@ + _PyOS_ReadlineTState@Base @VER@ + _PyOS_optarg@Base @VER@ + _PyOS_opterr@Base @VER@ + _PyOS_optind@Base @VER@ + _PyObject_CallFunction_SizeT@Base @VER@ + _PyObject_CallMethod_SizeT@Base @VER@ + _PyObject_Del@Base @VER@ + _PyObject_Dump@Base @VER@ + _PyObject_GC_Del@Base @VER@ + _PyObject_GC_Malloc@Base @VER@ + _PyObject_GC_New@Base @VER@ + _PyObject_GC_NewVar@Base @VER@ + _PyObject_GC_Resize@Base @VER@ + _PyObject_GC_Track@Base @VER@ + _PyObject_GC_UnTrack@Base @VER@ + _PyObject_GetDictPtr@Base @VER@ + _PyObject_LengthHint@Base @VER@ + _PyObject_New@Base @VER@ + _PyObject_NewVar@Base @VER@ + _PyObject_RealIsInstance@Base @VER@ + _PyObject_RealIsSubclass@Base @VER@ + _PyObject_SlotCompare@Base @VER@ + _PyObject_Str@Base @VER@ + _PyParser_Grammar@Base @VER@ + _PyParser_TokenNames@Base @VER@ + _PySequence_IterSearch@Base @VER@ + _PySet_Next@Base @VER@ + _PySet_NextEntry@Base @VER@ + _PySet_Update@Base @VER@ + _PySlice_FromIndices@Base @VER@ + _PyString_Eq@Base @VER@ + _PyString_FormatLong@Base @VER@ + _PyString_InsertThousandsGrouping@Base @VER@ + _PyString_Join@Base @VER@ + _PyString_Resize@Base @VER@ + _PySys_Init@Base @VER@ + _PyThreadState_Current@Base @VER@ + _PyThreadState_GetFrame@Base @VER@ + _PyThread_CurrentFrames@Base @VER@ + _PyTime_DoubleToTimet@Base @VER@ + _PyTrash_delete_later@Base @VER@ + _PyTrash_delete_nesting@Base @VER@ + _PyTrash_deposit_object@Base @VER@ + _PyTrash_destroy_chain@Base @VER@ + _PyTuple_Resize@Base @VER@ + _PyType_Lookup@Base @VER@ + _PyUnicodeUCS4_AsDefaultEncodedString@Base @VER@ + _PyUnicodeUCS4_Fini@Base @VER@ + _PyUnicodeUCS4_Init@Base @VER@ + _PyUnicodeUCS4_IsAlpha@Base @VER@ + _PyUnicodeUCS4_IsDecimalDigit@Base @VER@ + _PyUnicodeUCS4_IsDigit@Base @VER@ + _PyUnicodeUCS4_IsLinebreak@Base @VER@ + _PyUnicodeUCS4_IsLowercase@Base @VER@ + _PyUnicodeUCS4_IsNumeric@Base @VER@ + _PyUnicodeUCS4_IsTitlecase@Base @VER@ + _PyUnicodeUCS4_IsUppercase@Base @VER@ + _PyUnicodeUCS4_IsWhitespace@Base @VER@ + _PyUnicodeUCS4_ToDecimalDigit@Base @VER@ + _PyUnicodeUCS4_ToDigit@Base @VER@ + _PyUnicodeUCS4_ToLowercase@Base @VER@ + _PyUnicodeUCS4_ToNumeric@Base @VER@ + _PyUnicodeUCS4_ToTitlecase@Base @VER@ + _PyUnicodeUCS4_ToUppercase@Base @VER@ + _PyUnicode_BidirectionalNames@Base @VER@ + _PyUnicode_CategoryNames@Base @VER@ + _PyUnicode_Database_Records@Base @VER@ + _PyUnicode_DecodeUnicodeInternal@Base @VER@ + _PyUnicode_EastAsianWidthNames@Base @VER@ + _PyUnicode_FormatAdvanced@Base @VER@ + _PyUnicode_TypeRecords@Base @VER@ + _PyUnicode_XStrip@Base @VER@ + _PyWarnings_Init@Base @VER@ + _PyWeakref_CallableProxyType@Base @VER@ + _PyWeakref_ClearRef@Base @VER@ + _PyWeakref_GetWeakrefCount@Base @VER@ + _PyWeakref_ProxyType@Base @VER@ + _PyWeakref_RefType@Base @VER@ + _Py_Assert@Base @VER@ + _Py_Assign@Base @VER@ + _Py_Attribute@Base @VER@ + _Py_AugAssign@Base @VER@ + _Py_BinOp@Base @VER@ + _Py_BoolOp@Base @VER@ + _Py_Break@Base @VER@ + _Py_BuildValue_SizeT@Base @VER@ + _Py_Call@Base @VER@ + _Py_CheckInterval@Base @VER@ + _Py_CheckRecursionLimit@Base @VER@ + _Py_CheckRecursiveCall@Base @VER@ + _Py_ClassDef@Base @VER@ + _Py_Compare@Base @VER@ + _Py_Continue@Base @VER@ + _Py_Delete@Base @VER@ + _Py_Dict@Base @VER@ + _Py_DisplaySourceLine@Base @VER@ + _Py_Ellipsis@Base @VER@ + _Py_EllipsisObject@Base @VER@ + _Py_ExceptHandler@Base @VER@ + _Py_Exec@Base @VER@ + _Py_Expr@Base @VER@ + _Py_Expression@Base @VER@ + _Py_ExtSlice@Base @VER@ + _Py_For@Base @VER@ + _Py_FunctionDef@Base @VER@ + _Py_GeneratorExp@Base @VER@ + _Py_Global@Base @VER@ + _Py_HashDouble@Base @VER@ + _Py_HashPointer@Base @VER@ + _Py_If@Base @VER@ + _Py_IfExp@Base @VER@ + _Py_Import@Base @VER@ + _Py_ImportFrom@Base @VER@ + _Py_Index@Base @VER@ + _Py_Interactive@Base @VER@ + _Py_Lambda@Base @VER@ + _Py_List@Base @VER@ + _Py_ListComp@Base @VER@ + _Py_Mangle@Base @VER@ + _Py_Module@Base @VER@ + _Py_Name@Base @VER@ + _Py_NoneStruct@Base @VER@ + _Py_NotImplementedStruct@Base @VER@ + _Py_Num@Base @VER@ + _Py_PackageContext@Base @VER@ + _Py_Pass@Base @VER@ + _Py_Print@Base @VER@ + _Py_QnewFlag@Base @VER@ + _Py_Raise@Base @VER@ + _Py_ReadyTypes@Base @VER@ + _Py_ReleaseInternedStrings@Base @VER@ + _Py_Repr@Base @VER@ + _Py_Return@Base @VER@ + _Py_Slice@Base @VER@ + _Py_Str@Base @VER@ + _Py_Subscript@Base @VER@ + _Py_Suite@Base @VER@ + _Py_SwappedOp@Base @VER@ + _Py_Ticker@Base @VER@ + _Py_TrueStruct@Base @VER@ + _Py_TryExcept@Base @VER@ + _Py_TryFinally@Base @VER@ + _Py_Tuple@Base @VER@ + _Py_UnaryOp@Base @VER@ + _Py_VaBuildValue_SizeT@Base @VER@ + _Py_While@Base @VER@ + _Py_With@Base @VER@ + _Py_Yield@Base @VER@ + _Py_ZeroStruct@Base @VER@ + _Py_abstract_hack@Base @VER@ + _Py_addarc@Base @VER@ + _Py_addbit@Base @VER@ + _Py_adddfa@Base @VER@ + _Py_addfirstsets@Base @VER@ + _Py_addlabel@Base @VER@ + _Py_addstate@Base @VER@ + _Py_alias@Base @VER@ + _Py_arguments@Base @VER@ + _Py_ascii_whitespace@Base @VER@ + _Py_bytes_capitalize@Base @VER@ + _Py_bytes_isalnum@Base @VER@ + _Py_bytes_isalpha@Base @VER@ + _Py_bytes_isdigit@Base @VER@ + _Py_bytes_islower@Base @VER@ + _Py_bytes_isspace@Base @VER@ + _Py_bytes_istitle@Base @VER@ + _Py_bytes_isupper@Base @VER@ + _Py_bytes_lower@Base @VER@ + _Py_bytes_swapcase@Base @VER@ + _Py_bytes_title@Base @VER@ + _Py_bytes_upper@Base @VER@ + _Py_c_abs@Base @VER@ + _Py_c_diff@Base @VER@ + _Py_c_neg@Base @VER@ + _Py_c_pow@Base @VER@ + _Py_c_prod@Base @VER@ + _Py_c_quot@Base @VER@ + _Py_c_sum@Base @VER@ + _Py_capitalize__doc__@Base @VER@ + _Py_cobject_hack@Base @VER@ + _Py_comprehension@Base @VER@ + _Py_ctype_table@Base @VER@ + _Py_ctype_tolower@Base @VER@ + _Py_ctype_toupper@Base @VER@ + _Py_delbitset@Base @VER@ + _Py_findlabel@Base @VER@ + _Py_isalnum__doc__@Base @VER@ + _Py_isalpha__doc__@Base @VER@ + _Py_isdigit__doc__@Base @VER@ + _Py_islower__doc__@Base @VER@ + _Py_isspace__doc__@Base @VER@ + _Py_istitle__doc__@Base @VER@ + _Py_isupper__doc__@Base @VER@ + _Py_keyword@Base @VER@ + _Py_lower__doc__@Base @VER@ + _Py_mergebitset@Base @VER@ + _Py_meta_grammar@Base @VER@ + _Py_newbitset@Base @VER@ + _Py_newgrammar@Base @VER@ + _Py_pgen@Base @VER@ + _Py_samebitset@Base @VER@ + _Py_svnversion@Base @VER@ + _Py_swapcase__doc__@Base @VER@ + _Py_title__doc__@Base @VER@ + _Py_translatelabels@Base @VER@ + _Py_upper__doc__@Base @VER@ + + PyFPE_counter@Base @VER@ + PyFPE_dummy@Base @VER@ + PyFPE_jbuf@Base @VER@ + +# don't check for the following symbols, found in extensions +# which either can be built as builtin or extension. + +# _check_for_multiple_distdirs@Base @VER@ +# asdl_int_seq_new@Base @VER@ +# asdl_seq_new@Base @VER@ +# fast_save_leave@Base @VER@ +# init_ast@Base @VER@ +# init_bisect@Base @VER@ +# init_codecs@Base @VER@ +# init_collections@Base @VER@ +# init_functools@Base @VER@ +# init_locale@Base @VER@ +# init_random@Base @VER@ +# init_socket@Base @VER@ +# init_sockobject@Base @VER@ +# init_sre@Base @VER@ +# init_struct@Base @VER@ +# init_symtable@Base @VER@ +# init_weakref@Base @VER@ +# initarray@Base @VER@ +# initbinascii@Base @VER@ +# initcPickle@Base @VER@ +# initcStringIO@Base @VER@ +# initerrno@Base @VER@ +# initfcntl@Base @VER@ +# initgc@Base @VER@ +# initgrp@Base @VER@ +# initimp@Base @VER@ +# inititertools@Base @VER@ +# initmath@Base @VER@ +# initoperator@Base @VER@ +# initposix@Base @VER@ +# initpwd@Base @VER@ +# initselect@Base @VER@ +# initsignal@Base @VER@ +# initspwd@Base @VER@ +# initstrop@Base @VER@ +# initsyslog@Base @VER@ +# initthread@Base @VER@ +# inittime@Base @VER@ +# initunicodedata@Base @VER@ +# initxxsubtype@Base @VER@ +# initzipimport@Base @VER@ +# initzlib@Base @VER@ --- python2.6-2.6.2.orig/debian/README.PVER.in +++ python2.6-2.6.2/debian/README.PVER.in @@ -0,0 +1,95 @@ + + Python @VER@ for Debian + --------------------- + +This is Python @VER@ packaged for Debian. + +This document contains information specific to the Debian packages of +Python @VER@. + + + + [TODO: This document is not yet up-to-date with the packages.] + +Currently, it features those two main topics: + + 1. Release notes for the Debian packages: + 2. Notes for developers using the Debian Python packages: + +Release notes and documentation from the upstream package are installed +in /usr/share/doc/@PVER@/. + +There's a mailing list for discussion of issues related to Python on Debian +systems: debian-python@lists.debian.org. The list is not intended for +general Python problems, but as a forum for maintainers of Python-related +packages and interested third parties. + + + +1. Release notes for the Debian packages: + + +Results of the regression test: +------------------------------ + +The package does successfully run the regression tests for all included +modules. Seven packages are skipped since they are platform-dependent and +can't be used with Linux. + + +2. Notes for developers using the Debian python packages: + +See the draft of the Debian Python policy in /usr/share/doc/python. + +distutils can be found in the @PVER@-dev package. Development files +like the python library or Makefiles can be found in the @PVER@-dev +package in /usr/lib/@PVER@/config. Therefore, if you need to install +a pure python extension, you only need @PVER@. On the other hand, to +install a C extension, you need @PVER@-dev. + +a) Locally installed Python add-ons + + /usr/local/lib/@PVER@/site-packages/ + /usr/local/lib/site-python/ (version-independent modules) + +b) Python add-ons packaged for Debian + + /usr/lib/@PVER@/site-packages/ + /usr/lib/site-python/ (version-independent modules) + +Note that no package must install files directly into /usr/lib/@PVER@/ +or /usr/local/lib/@PVER@/. Only the site-packages directory is allowed +for third-party extensions. + +Use of the new `package' scheme is strongly encouraged. The `ni' interface +is obsolete in python 1.5. + +Header files for extensions go into /usr/include/@PVER@/. + + +Installing extensions for local use only: +---------------------------------------- + +Consider using distutils ... + +Most extensions use Python's Makefile.pre.in. Note that Makefile.pre.in +by default will install files into /usr/lib/, not into /usr/local/lib/, +which is not allowed for local extensions. You'll have to change the +Makefile accordingly. Most times, "make prefix=/usr/local install" will +work. + + +Packaging python extensions for Debian: +-------------------------------------- + +Maintainers of Python extension packages should read + + /usr/share/doc/python/python-policy.txt.gz + + + + + 03/09/98 + Gregor Hoffleit + +Last change: 2001-12-14 --- python2.6-2.6.2.orig/debian/PVER-minimal.prerm.in +++ python2.6-2.6.2/debian/PVER-minimal.prerm.in @@ -0,0 +1,44 @@ +#! /bin/sh -e + +syssite=/usr/lib/@PVER@/site-packages +localsite=/usr/local/lib/@PVER@/dist-packages + +case "$1" in + remove) + if [ "$DEBIAN_FRONTEND" != noninteractive ]; then + echo "Unlinking and removing bytecode for runtime @PVER@" + fi + for hook in /usr/share/python/runtime.d/*.rtremove; do + [ -x $hook ] || continue + $hook rtremove @PVER@ || continue + done + dpkg -L @PVER@-minimal \ + | awk '/\.py$/ {print $0"c\n" $0"o"}' \ + | xargs rm -f >&2 + + if which update-binfmts >/dev/null; then + update-binfmts --package @PVER@ --remove @PVER@ /usr/bin/@PVER@ + fi + + if [ -h $syssite ]; then + rm -f $syssite + fi + [ -d $localsite ] && rmdir $localsite 2>/dev/null || true + [ -d $(dirname $localsite) ] && rmdir $(dirname $localsite) 2>/dev/null || true + ;; + upgrade) + dpkg -L @PVER@-minimal \ + | awk '/\.py$/ {print $0"c\n" $0"o"}' \ + | xargs rm -f >&2 + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- python2.6-2.6.2.orig/debian/libPVER.overrides.in +++ python2.6-2.6.2/debian/libPVER.overrides.in @@ -0,0 +1 @@ +lib@PVER@ binary: package-name-doesnt-match-sonames --- python2.6-2.6.2.orig/debian/PVER-dbg.symbols.lpia.in +++ python2.6-2.6.2/debian/PVER-dbg.symbols.lpia.in @@ -0,0 +1,26 @@ +libpython@VER@_d.so.1.0 python@VER@-dbg #MINVER# + Py_InitModule4TraceRefs@Base @VER@ +#include "libpython.symbols" + _Py_force_double@Base 2.6.2 + _PyDict_Dummy@Base @VER@ + _PyObject_DebugCheckAddress@Base @VER@ + _PyObject_DebugDumpAddress@Base @VER@ + _PyObject_DebugFree@Base @VER@ + _PyObject_DebugMalloc@Base @VER@ + _PyObject_DebugMallocStats@Base @VER@ + _PyObject_DebugRealloc@Base @VER@ + _PySet_Dummy@Base @VER@ + _Py_AddToAllObjects@Base @VER@ + _Py_Dealloc@Base @VER@ + _Py_ForgetReference@Base @VER@ + _Py_GetObjects@Base @VER@ + _Py_GetRefTotal@Base @VER@ + _Py_NegativeRefcount@Base @VER@ + _Py_NewReference@Base @VER@ + _Py_PrintReferenceAddresses@Base @VER@ + _Py_PrintReferences@Base @VER@ + _Py_RefTotal@Base @VER@ + _Py_dumptree@Base @VER@ + _Py_printtree@Base @VER@ + _Py_showtree@Base @VER@ + _Py_tok_dump@Base @VER@ --- python2.6-2.6.2.orig/debian/pydoc.1.in +++ python2.6-2.6.2/debian/pydoc.1.in @@ -0,0 +1,53 @@ +.TH PYDOC@VER@ 1 +.SH NAME +pydoc@VER@ \- the Python documentation tool +.SH SYNOPSIS +.PP +.B pydoc@VER@ +.I name +.PP +.B pydoc@VER@ -k +.I keyword +.PP +.B pydoc@VER@ -p +.I port +.PP +.B pydoc@VER@ -g +.PP +.B pydoc@VER@ -w +.I module [...] +.SH DESCRIPTION +.PP +.B pydoc@VER@ +.I name +Show text documentation on something. +.I name +may be the name of a +Python keyword, topic, function, module, or package, or a dotted +reference to a class or function within a module or module in a +package. If +.I name +contains a '/', it is used as the path to a +Python source file to document. If name is 'keywords', 'topics', +or 'modules', a listing of these things is displayed. +.PP +.B pydoc@VER@ -k +.I keyword +Search for a keyword in the synopsis lines of all available modules. +.PP +.B pydoc@VER@ -p +.I port +Start an HTTP server on the given port on the local machine. +.PP +.B pydoc@VER@ -g +Pop up a graphical interface for finding and serving documentation. +.PP +.B pydoc@VER@ -w +.I name [...] +Write out the HTML documentation for a module to a file in the current +directory. If +.I name +contains a '/', it is treated as a filename; if +it names a directory, documentation is written for all the contents. +.SH AUTHOR +Moshe Zadka, based on "pydoc --help" --- python2.6-2.6.2.orig/debian/libPVER.symbols.i386.in +++ python2.6-2.6.2/debian/libPVER.symbols.i386.in @@ -0,0 +1,4 @@ +libpython@VER@.so.1.0 libpython@VER@ #MINVER# + Py_InitModule4@Base @VER@ + _Py_force_double@Base @VER@ +#include "libpython.symbols" --- python2.6-2.6.2.orig/debian/idle-PVER.overrides.in +++ python2.6-2.6.2/debian/idle-PVER.overrides.in @@ -0,0 +1,2 @@ +# icon in dependent package +idle-@PVER@ binary: menu-icon-missing --- python2.6-2.6.2.orig/debian/patches/distutils-link.dpatch +++ python2.6-2.6.2/debian/patches/distutils-link.dpatch @@ -0,0 +1,42 @@ +#! /bin/sh -e + +# DP: Don't add standard library dirs to library_dirs and runtime_library_dirs. + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + #cd ${dir}gcc && autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + #rm ${dir}gcc/configure + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Lib/distutils/unixccompiler.py~ 2004-08-29 18:40:55.000000000 +0200 ++++ Lib/distutils/unixccompiler.py 2005-03-18 17:54:16.066246856 +0100 +@@ -148,7 +148,12 @@ + objects, output_dir = self._fix_object_args(objects, output_dir) + libraries, library_dirs, runtime_library_dirs = \ + self._fix_lib_args(libraries, library_dirs, runtime_library_dirs) +- ++ # filter out standard library paths, which are not explicitely needed ++ # for linking ++ library_dirs = [dir for dir in library_dirs ++ if not dir in ('/lib', '/lib64', '/usr/lib', '/usr/lib64')] ++ runtime_library_dirs = [dir for dir in runtime_library_dirs ++ if not dir in ('/lib', '/lib64', '/usr/lib', '/usr/lib64')] + lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs, + libraries) + if type(output_dir) not in (StringType, NoneType): --- python2.6-2.6.2.orig/debian/patches/test-sundry.dpatch +++ python2.6-2.6.2/debian/patches/test-sundry.dpatch @@ -0,0 +1,40 @@ +#! /bin/sh -e + +# DP: test_sundry: Don't fail on import of the profile and pstats module + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Lib/test/test_sundry.py~ 2008-05-22 18:02:34.000000000 +0200 ++++ Lib/test/test_sundry.py 2008-05-22 18:03:58.000000000 +0200 +@@ -65,7 +65,11 @@ + import os2emxpath + import pdb + import posixfile +- import pstats ++ try: ++ import pstats # separated out into the python-profiler package ++ except ImportError: ++ if test_support.verbose: ++ print "skipping profile and pstats" + import py_compile + import rexec + import rlcompleter --- python2.6-2.6.2.orig/debian/patches/tkinter-import.dpatch +++ python2.6-2.6.2/debian/patches/tkinter-import.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh -e + +# DP: suggest installation of python-tk package on failing _tkinter import + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Lib/lib-tk/Tkinter.py~ 2008-05-23 13:49:08.000000000 +0200 ++++ Lib/lib-tk/Tkinter.py 2008-05-23 13:51:24.000000000 +0200 +@@ -36,7 +36,10 @@ + if sys.platform == "win32": + # Attempt to configure Tcl/Tk without requiring PATH + import FixTk +-import _tkinter # If this fails your Python may not be configured for Tk ++try: ++ import _tkinter ++except ImportError, msg: ++ raise ImportError, str(msg) + ', please install the python-tk package' + tkinter = _tkinter # b/w compat for export + TclError = _tkinter.TclError + from types import * --- python2.6-2.6.2.orig/debian/patches/site-locations.dpatch +++ python2.6-2.6.2/debian/patches/site-locations.dpatch @@ -0,0 +1,54 @@ +#! /bin/sh -e + +# DP: Set site-packages/dist-packages + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p1 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- ./Lib/site.py.orig 2008-10-27 22:39:36.000000000 +0100 ++++ ./Lib/site.py 2008-10-27 22:42:36.000000000 +0100 +@@ -13,6 +13,12 @@ + resulting directories, if they exist, are appended to sys.path, and + also inspected for path configuration files. + ++For Debian and derivatives, this sys.path is augmented with directories ++for packages distributed within the distribution. Local addons go ++into /usr/local/lib/python/dist-packages, Debian addons ++install into /usr/{lib,share}/python/dist-packages. ++/usr/lib/python/site-packages is not used. ++ + A path configuration file is a file whose name has the form + .pth; its contents are additional directories (one per line) + to be added to sys.path. Non-existing directories (or +@@ -260,8 +266,11 @@ + elif os.sep == '/': + sitedirs.append(os.path.join(prefix, "lib", + "python" + sys.version[:3], +- "site-packages")) +- sitedirs.append(os.path.join(prefix, "lib", "site-python")) ++ "dist-packages")) ++ sitedirs.append(os.path.join(prefix, "local/lib", ++ "python" + sys.version[:3], ++ "dist-packages")) ++ sitedirs.append(os.path.join(prefix, "lib", "dist-python")) + else: + sitedirs.append(prefix) + sitedirs.append(os.path.join(prefix, "lib", "site-packages")) --- python2.6-2.6.2.orig/debian/patches/platform-lsbrelease.dpatch +++ python2.6-2.6.2/debian/patches/platform-lsbrelease.dpatch @@ -0,0 +1,64 @@ +#! /bin/sh -e + +# DP: Use /etc/lsb-release to identify the platform. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Lib/platform.py~ 2008-09-04 13:15:14.000000000 +0200 ++++ Lib/platform.py 2009-03-18 19:48:17.000000000 +0100 +@@ -286,6 +286,10 @@ + if parsed != output: + print (input, parsed) + ++_distributor_id_file_re = re.compile("(?:DISTRIB_ID\s*=)\s*(.*)", re.I) ++_release_file_re = re.compile("(?:DISTRIB_RELEASE\s*=)\s*(.*)", re.I) ++_codename_file_re = re.compile("(?:DISTRIB_CODENAME\s*=)\s*(.*)", re.I) ++ + def linux_distribution(distname='', version='', id='', + + supported_dists=_supported_dists, +@@ -310,6 +314,25 @@ + args given as parameters. + + """ ++ # check for the Debian/Ubuntu /etc/lsb-release file first, needed so ++ # that the distribution doesn't get identified as Debian. ++ try: ++ etclsbrel = open("/etc/lsb-release", "rU") ++ for line in etclsbrel: ++ m = _distributor_id_file_re.search(line) ++ if m: ++ _u_distname = m.group(1).strip() ++ m = _release_file_re.search(line) ++ if m: ++ _u_version = m.group(1).strip() ++ m = _codename_file_re.search(line) ++ if m: ++ _u_id = m.group(1).strip() ++ if _u_distname and _u_version: ++ return (_u_distname, _u_version, _u_id) ++ except (EnvironmentError, UnboundLocalError): ++ pass ++ + try: + etc = os.listdir('/etc') + except os.error: --- python2.6-2.6.2.orig/debian/patches/deb-locations.dpatch +++ python2.6-2.6.2/debian/patches/deb-locations.dpatch @@ -0,0 +1,130 @@ +#! /bin/sh -e + +# DP: adjust locations of directories to debian policy + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p1 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- ./Lib/pydoc.py~ 2008-07-15 15:01:17.000000000 +0200 ++++ ./Lib/pydoc.py 2008-07-15 15:31:06.000000000 +0200 +@@ -27,6 +27,10 @@ + + Module docs for core modules are assumed to be in + ++ /usr/share/doc/pythonX.Y/html/library ++ ++if the pythonX.Y-doc package is installed or in ++ + http://docs.python.org/library/ + + This can be overridden by setting the PYTHONDOCS environment variable +@@ -347,6 +351,9 @@ + + docloc = os.environ.get("PYTHONDOCS", + "http://docs.python.org/library") ++ docdir = '/usr/share/doc/python%s/html/library' % sys.version[:3] ++ if not os.environ.has_key("PYTHONDOCS") and os.path.isdir(docdir): ++ docloc = docdir + basedir = os.path.join(sys.exec_prefix, "lib", + "python"+sys.version[0:3]) + if (isinstance(object, type(os)) and +--- ./Tools/faqwiz/faqconf.py.orig 2008-05-22 17:50:31.000000000 +0200 ++++ ./Tools/faqwiz/faqconf.py 2008-05-22 17:51:11.000000000 +0200 +@@ -21,7 +21,7 @@ + OWNEREMAIL = "nobody@anywhere.org" # Email for feedback + HOMEURL = "http://www.python.org" # Related home page + HOMENAME = "Python home" # Name of related home page +-RCSBINDIR = "/usr/local/bin/" # Directory containing RCS commands ++RCSBINDIR = "/usr/bin/" # Directory containing RCS commands + # (must end in a slash) + + # Parameters you can normally leave alone +--- ./Tools/webchecker/webchecker.py.orig 2008-05-22 17:50:31.000000000 +0200 ++++ ./Tools/webchecker/webchecker.py 2008-05-22 17:51:11.000000000 +0200 +@@ -19,7 +19,8 @@ + a directory listing is returned. Now, you can point webchecker to the + document tree in the local file system of your HTTP daemon, and have + most of it checked. In fact the default works this way if your local +-web tree is located at /usr/local/etc/httpd/htdpcs (the default for ++web tree is located at /var/www, which is the default for Debian ++GNU/Linux. Other systems use /usr/local/etc/httpd/htdocs (the default for + the NCSA HTTP daemon and probably others). + + Report printed: +--- ./Demo/tkinter/guido/ManPage.py.orig 2008-05-22 17:50:31.000000000 +0200 ++++ ./Demo/tkinter/guido/ManPage.py 2008-05-22 17:51:11.000000000 +0200 +@@ -189,8 +189,9 @@ + def test(): + import os + import sys +- # XXX This directory may be different on your system +- MANDIR = '/usr/local/man/mann' ++ # XXX This directory may be different on your system, ++ # it is here set for Debian GNU/Linux. ++ MANDIR = '/usr/share/man' + DEFAULTPAGE = 'Tcl' + formatted = 0 + if sys.argv[1:] and sys.argv[1] == '-f': +--- ./Demo/tkinter/guido/tkman.py.orig 2008-05-22 17:50:31.000000000 +0200 ++++ ./Demo/tkinter/guido/tkman.py 2008-05-22 17:51:11.000000000 +0200 +@@ -9,8 +9,8 @@ + from Tkinter import * + from ManPage import ManPage + +-MANNDIRLIST = ['/depot/sundry/man/mann','/usr/local/man/mann'] +-MAN3DIRLIST = ['/depot/sundry/man/man3','/usr/local/man/man3'] ++MANNDIRLIST = ['/depot/sundry/man/mann','/usr/share/man/mann'] ++MAN3DIRLIST = ['/depot/sundry/man/man3','/usr/share/man/man3'] + + foundmanndir = 0 + for dir in MANNDIRLIST: +--- ./Demo/scripts/ftpstats.py.orig 2008-05-22 17:50:31.000000000 +0200 ++++ ./Demo/scripts/ftpstats.py 2008-05-22 17:51:11.000000000 +0200 +@@ -6,7 +6,8 @@ + # ftpstats [-m maxitems] [-s search] [file] + # -m maxitems: restrict number of items in "top-N" lists, default 25. + # -s string: restrict statistics to lines containing this string. +-# Default file is /usr/adm/ftpd; a "-" means read standard input. ++# Default file for Debian GNU/Linux is /var/log/xferlog; ++# a "-" means read stdandard input. + + # The script must be run on the host where the ftp daemon runs. + # (At CWI this is currently buizerd.) +@@ -34,7 +35,7 @@ + maxitems = string.atoi(a) + if o == '-s': + search = a +- file = '/usr/adm/ftpd' ++ file = '/var/log/xferlog' + if args: file = args[0] + if file == '-': + f = sys.stdin +--- ./Misc/python.man.orig 2008-05-22 17:50:31.000000000 +0200 ++++ ./Misc/python.man 2008-05-22 17:51:11.000000000 +0200 +@@ -294,7 +294,7 @@ + These are subject to difference depending on local installation + conventions; ${prefix} and ${exec_prefix} are installation-dependent + and should be interpreted as for GNU software; they may be the same. +-The default for both is \fI/usr/local\fP. ++On Debian GNU/{Hurd,Linux} the default for both is \fI/usr\fP. + .IP \fI${exec_prefix}/bin/python\fP + Recommended location of the interpreter. + .PP --- python2.6-2.6.2.orig/debian/patches/link-opt.dpatch +++ python2.6-2.6.2/debian/patches/link-opt.dpatch @@ -0,0 +1,47 @@ +#! /bin/sh -e + +# DP: Call the linker with -O1 -Bsymbolic-functions + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + rm -f configure + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- configure.in~ 2008-07-15 15:37:42.000000000 +0200 ++++ configure.in 2008-07-15 15:39:53.000000000 +0200 +@@ -1659,7 +1659,7 @@ + fi + fi + ;; +- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; ++ Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared -Wl,-O1 -Wl,-Bsymbolic-functions';; + BSD/OS*/4*) LDSHARED="gcc -shared";; + FreeBSD*) + if [[ "`$CC -dM -E - &2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- ./Lib/site.py.orig 2008-05-22 12:09:54.000000000 +0200 ++++ ./Lib/site.py 2009-06-19 14:52:35.000000000 +0200 +@@ -249,6 +249,13 @@ + + if ENABLE_USER_SITE and os.path.isdir(USER_SITE): + addsitedir(USER_SITE, known_paths) ++ if ENABLE_USER_SITE: ++ for dist_libdir in ("lib", "local/lib"): ++ user_site = os.path.join(USER_BASE, dist_libdir, ++ "python" + sys.version[:3], ++ "dist-packages") ++ if os.path.isdir(user_site): ++ addsitedir(user_site, known_paths) + return known_paths + + +--- ./Lib/distutils/command/install_egg_info.py.orig 2008-05-22 12:08:27.000000000 +0200 ++++ ./Lib/distutils/command/install_egg_info.py 2009-06-19 14:52:35.000000000 +0200 +@@ -14,18 +14,37 @@ + description = "Install package's PKG-INFO metadata as an .egg-info file" + user_options = [ + ('install-dir=', 'd', "directory to install to"), ++ ('install-layout', None, "custom installation layout"), + ] + + def initialize_options(self): + self.install_dir = None ++ self.install_layout = None ++ self.prefix_option = None + + def finalize_options(self): + self.set_undefined_options('install_lib',('install_dir','install_dir')) +- basename = "%s-%s-py%s.egg-info" % ( +- to_filename(safe_name(self.distribution.get_name())), +- to_filename(safe_version(self.distribution.get_version())), +- sys.version[:3] +- ) ++ self.set_undefined_options('install',('install_layout','install_layout')) ++ self.set_undefined_options('install',('prefix_option','prefix_option')) ++ if self.install_layout: ++ basename = "%s-%s.egg-info" % ( ++ to_filename(safe_name(self.distribution.get_name())), ++ to_filename(safe_version(self.distribution.get_version())) ++ ) ++ if not self.install_layout.lower() in ['deb']: ++ raise DistutilsOptionError( ++ "unknown value for --install-layout") ++ elif self.prefix_option or 'real_prefix' in sys.__dict__: ++ basename = "%s-%s-py%s.egg-info" % ( ++ to_filename(safe_name(self.distribution.get_name())), ++ to_filename(safe_version(self.distribution.get_version())), ++ sys.version[:3] ++ ) ++ else: ++ basename = "%s-%s.egg-info" % ( ++ to_filename(safe_name(self.distribution.get_name())), ++ to_filename(safe_version(self.distribution.get_version())) ++ ) + self.target = os.path.join(self.install_dir, basename) + self.outputs = [self.target] + +--- ./Lib/distutils/command/install.py.orig 2008-05-22 12:08:27.000000000 +0200 ++++ ./Lib/distutils/command/install.py 2009-06-19 15:19:39.000000000 +0200 +@@ -47,6 +47,20 @@ + 'scripts': '$base/bin', + 'data' : '$base', + }, ++ 'unix_local': { ++ 'purelib': '$base/local/lib/python$py_version_short/dist-packages', ++ 'platlib': '$platbase/local/lib/python$py_version_short/dist-packages', ++ 'headers': '$base/local/include/python$py_version_short/$dist_name', ++ 'scripts': '$base/local/bin', ++ 'data' : '$base/local', ++ }, ++ 'deb_system': { ++ 'purelib': '$base/lib/python$py_version_short/dist-packages', ++ 'platlib': '$platbase/lib/python$py_version_short/dist-packages', ++ 'headers': '$base/include/python$py_version_short/$dist_name', ++ 'scripts': '$base/bin', ++ 'data' : '$base', ++ }, + 'unix_home': { + 'purelib': '$base/lib/python', + 'platlib': '$base/lib/python', +@@ -168,6 +182,9 @@ + + ('record=', None, + "filename in which to record list of installed files"), ++ ++ ('install-layout=', None, ++ "installation layout to choose (known values: deb, unix)"), + ] + + boolean_options = ['compile', 'force', 'skip-build', 'user'] +@@ -182,6 +199,7 @@ + self.exec_prefix = None + self.home = None + self.user = 0 ++ self.prefix_option = None + + # These select only the installation base; it's up to the user to + # specify the installation scheme (currently, that means supplying +@@ -203,6 +221,9 @@ + self.install_userbase = USER_BASE + self.install_usersite = USER_SITE + ++ # enable custom installation, known values: deb ++ self.install_layout = None ++ + self.compile = None + self.optimize = None + +@@ -435,6 +456,7 @@ + self.install_base = self.install_platbase = self.home + self.select_scheme("unix_home") + else: ++ self.prefix_option = self.prefix + if self.prefix is None: + if self.exec_prefix is not None: + raise DistutilsOptionError, \ +@@ -449,7 +471,18 @@ + + self.install_base = self.prefix + self.install_platbase = self.exec_prefix +- self.select_scheme("unix_prefix") ++ if self.install_layout: ++ if self.install_layout.lower() in ['deb']: ++ self.select_scheme("deb_system") ++ elif self.install_layout.lower() in ['unix']: ++ self.select_scheme("unix_prefix") ++ else: ++ raise DistutilsOptionError( ++ "unknown value for --install-layout") ++ elif (self.prefix_option and self.prefix != '/usr/local') or 'PYTHONUSERBASE' in os.environ or 'real_prefix' in sys.__dict__: ++ self.select_scheme("unix_prefix") ++ else: ++ self.select_scheme("unix_local") + + # finalize_unix () + +--- ./Lib/distutils/sysconfig.py.orig 2009-02-11 00:24:59.000000000 +0100 ++++ ./Lib/distutils/sysconfig.py 2009-06-19 14:52:35.000000000 +0200 +@@ -111,6 +111,7 @@ + If 'prefix' is supplied, use it instead of sys.prefix or + sys.exec_prefix -- i.e., ignore 'plat_specific'. + """ ++ is_default_prefix = not prefix or os.path.normpath(prefix) in ('/usr', '/usr/local') + if prefix is None: + prefix = plat_specific and EXEC_PREFIX or PREFIX + +@@ -119,6 +120,8 @@ + "lib", "python" + get_python_version()) + if standard_lib: + return libpython ++ elif is_default_prefix and 'PYTHONUSERBASE' not in os.environ and 'real_prefix' not in sys.__dict__: ++ return os.path.join(libpython, "dist-packages") + else: + return os.path.join(libpython, "site-packages") + +--- ./Doc/install/index.rst.orig 2009-01-04 13:57:46.000000000 +0100 ++++ ./Doc/install/index.rst 2009-06-19 14:52:35.000000000 +0200 +@@ -237,6 +237,8 @@ + +-----------------+-----------------------------------------------------+--------------------------------------------------+-------+ + | Platform | Standard installation location | Default value | Notes | + +=================+=====================================================+==================================================+=======+ ++| Debian/Ubuntu | :file:`{prefix}/lib/python{X.Y}/dist-packages` | :file:`/usr/local/lib/python{X.Y}/dist-packages` | \(0) | +++-----------------+-----------------------------------------------------+--------------------------------------------------+-------+ + | Unix (pure) | :file:`{prefix}/lib/python{X.Y}/site-packages` | :file:`/usr/local/lib/python{X.Y}/site-packages` | \(1) | + +-----------------+-----------------------------------------------------+--------------------------------------------------+-------+ + | Unix (non-pure) | :file:`{exec-prefix}/lib/python{X.Y}/site-packages` | :file:`/usr/local/lib/python{X.Y}/site-packages` | \(1) | +@@ -246,6 +248,14 @@ + + Notes: + ++(0) ++ Starting with Python-2.6 Debian/Ubuntu uses for the Python which comes within ++ the Linux distribution a non-default name for the installation directory. This ++ is to avoid overwriting of the python modules which come with the distribution, ++ which unfortunately is the upstream behaviour of the installation tools. The ++ non-default name in :file:`/usr/local` is used not to overwrite a local python ++ installation (defaulting to :file:`/usr/local`). ++ + (1) + Most Linux distributions include Python as a standard part of the system, so + :file:`{prefix}` and :file:`{exec-prefix}` are usually both :file:`/usr` on +@@ -367,6 +377,15 @@ + + /usr/bin/python setup.py install --prefix=/usr/local + ++Starting with Python-2.6 Debian/Ubuntu does use ++:file:`/usr/lib/python{X.Y}/dist-packages` and ++:file:`/usr/local/lib/python{X.Y}/dist-packages` for the installation ++of python modules included in the Linux distribution. To overwrite ++the name of the site directory, explicitely use the :option:`--prefix` ++option, however make sure that the installation path is included in ++``sys.path``. For packaging of python modules for Debian/Ubuntu, use ++the new ``setup.py install`` option :option:`--install-layout=deb`. ++ + Another possibility is a network filesystem where the name used to write to a + remote directory is different from the name used to read it: for example, the + Python interpreter accessed as :file:`/usr/local/bin/python` might search for +@@ -605,6 +624,17 @@ + import them, this directory must be added to ``sys.path``. There are several + different ways to add the directory. + ++On Debian/Ubuntu, starting with Python-2.6 the convention for system ++installed packages is to put then in the ++:file:`/usr/lib/python{X.Y}/dist-packages/` directory, and for locally ++installed packages is to put them in the ++:file:`/usr/lib/python{X.Y}/dist-packages/` directory. To share the ++locally installed packages for the system provided Python with the ++locally installed packages of a local python installation, make ++:file:`/usr/lib/python{X.Y}/dist-packages/` a symbolic link to the ++:file:`{...}/site-packages/` directory of your local python ++installation. ++ + The most convenient way is to add a path configuration file to a directory + that's already on Python's path, usually to the :file:`.../site-packages/` + directory. Path configuration files have an extension of :file:`.pth`, and each --- python2.6-2.6.2.orig/debian/patches/debug-build.dpatch +++ python2.6-2.6.2/debian/patches/debug-build.dpatch @@ -0,0 +1,187 @@ +#! /bin/sh -e + +# DP: Change the interpreter to build and install python extensions +# DP: built with the python-dbg interpreter with a different name into +# DP: the same path (by appending `_d' to the extension name). + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p1 < $0 + autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 + rm -f configure + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- ./Python/sysmodule.c.orig 2009-03-22 12:19:29.000000000 +0100 ++++ ./Python/sysmodule.c 2009-03-22 12:19:54.000000000 +0100 +@@ -1362,6 +1362,12 @@ + FlagsType.tp_init = NULL; + FlagsType.tp_new = NULL; + ++#ifdef Py_DEBUG ++ PyDict_SetItemString(sysdict, "pydebug", Py_True); ++#else ++ PyDict_SetItemString(sysdict, "pydebug", Py_False); ++#endif ++ + #undef SET_SYS_FROM_STRING + if (PyErr_Occurred()) + return NULL; +--- ./Python/dynload_shlib.c.orig 2009-03-22 12:19:29.000000000 +0100 ++++ ./Python/dynload_shlib.c 2009-03-22 12:19:54.000000000 +0100 +@@ -46,6 +46,10 @@ + {"module.exe", "rb", C_EXTENSION}, + {"MODULE.EXE", "rb", C_EXTENSION}, + #else ++#ifdef Py_DEBUG ++ {"_d.so", "rb", C_EXTENSION}, ++ {"module_d.so", "rb", C_EXTENSION}, ++#endif + {".so", "rb", C_EXTENSION}, + {"module.so", "rb", C_EXTENSION}, + #endif +--- ./Lib/distutils/command/build.py.orig 2009-03-22 12:19:29.000000000 +0100 ++++ ./Lib/distutils/command/build.py 2009-03-22 12:19:54.000000000 +0100 +@@ -92,7 +92,8 @@ + # 'lib.' under the base build directory. We only use one of + # them for a given distribution, though -- + if self.build_purelib is None: +- self.build_purelib = os.path.join(self.build_base, 'lib') ++ self.build_purelib = os.path.join(self.build_base, ++ 'lib' + plat_specifier) + if self.build_platlib is None: + self.build_platlib = os.path.join(self.build_base, + 'lib' + plat_specifier) +--- ./Lib/distutils/sysconfig.py.orig 2009-03-22 12:19:29.000000000 +0100 ++++ ./Lib/distutils/sysconfig.py 2009-03-22 12:19:54.000000000 +0100 +@@ -80,7 +80,8 @@ + if not os.path.exists(inc_dir): + inc_dir = os.path.join(os.path.dirname(base), "Include") + return inc_dir +- return os.path.join(prefix, "include", "python" + get_python_version()) ++ return os.path.join(prefix, "include", ++ "python" + get_python_version() + (sys.pydebug and '_d' or '')) + elif os.name == "nt": + return os.path.join(prefix, "include") + elif os.name == "mac": +@@ -215,7 +216,7 @@ + if python_build: + return os.path.join(os.path.dirname(sys.executable), "Makefile") + lib_dir = get_python_lib(plat_specific=1, standard_lib=1) +- return os.path.join(lib_dir, "config", "Makefile") ++ return os.path.join(lib_dir, "config" + (sys.pydebug and "_d" or ""), "Makefile") + + + def parse_config_h(fp, g=None): +--- ./Makefile.pre.in.orig 2009-03-22 12:19:30.000000000 +0100 ++++ ./Makefile.pre.in 2009-03-22 12:20:26.000000000 +0100 +@@ -96,8 +96,8 @@ + # Detailed destination directories + BINLIBDEST= $(LIBDIR)/python$(VERSION) + LIBDEST= $(SCRIPTDIR)/python$(VERSION) +-INCLUDEPY= $(INCLUDEDIR)/python$(VERSION) +-CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION) ++INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)$(DEBUG_EXT) ++CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION)$(DEBUG_EXT) + LIBP= $(LIBDIR)/python$(VERSION) + + # Symbols used for using shared libraries +@@ -110,6 +110,8 @@ + EXE= @EXEEXT@ + BUILDEXE= @BUILDEXEEXT@ + ++DEBUG_EXT= @DEBUG_EXT@ ++ + # Short name and location for Mac OS X Python framework + UNIVERSALSDK=@UNIVERSALSDK@ + PYTHONFRAMEWORK= @PYTHONFRAMEWORK@ +@@ -408,7 +410,7 @@ + $(AR) cr $@ $(MODOBJS) + $(RANLIB) $@ + +-libpython$(VERSION).so: $(LIBRARY_OBJS) ++libpython$(VERSION)$(DEBUG_EXT).so: $(LIBRARY_OBJS) + if test $(INSTSONAME) != $(LDLIBRARY); then \ + $(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ + $(LN) -f $(INSTSONAME) $@; \ +@@ -924,8 +926,8 @@ + $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h + + # Install the library and miscellaneous stuff needed for extending/embedding +-# This goes into $(exec_prefix) +-LIBPL= $(LIBP)/config ++# This goes into $(exec_prefix)$(DEBUG_EXT) ++LIBPL= $(LIBP)/config$(DEBUG_EXT) + libainstall: all + @for i in $(LIBDIR) $(LIBP) $(LIBPL); \ + do \ +--- ./configure.in.orig 2009-03-22 12:19:29.000000000 +0100 ++++ ./configure.in 2009-03-22 12:19:54.000000000 +0100 +@@ -536,7 +536,7 @@ + AC_MSG_CHECKING(LIBRARY) + if test -z "$LIBRARY" + then +- LIBRARY='libpython$(VERSION).a' ++ LIBRARY='libpython$(VERSION)$(DEBUG_EXT).a' + fi + AC_MSG_RESULT($LIBRARY) + +@@ -661,8 +661,8 @@ + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; + Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) +- LDLIBRARY='libpython$(VERSION).so' +- BLDLIBRARY='-L. -lpython$(VERSION)' ++ LDLIBRARY='libpython$(VERSION)$(DEBUG_EXT).so' ++ BLDLIBRARY='-L. -lpython$(VERSION)$(DEBUG_EXT)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + case $ac_sys_system in + FreeBSD*) +@@ -759,6 +759,12 @@ + fi], + [AC_MSG_RESULT(no)]) + ++if test "$Py_DEBUG" = 'true' ++then ++ DEBUG_EXT=_d ++fi ++AC_SUBST(DEBUG_EXT) ++ + # XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be + # merged with this chunk of code? + +@@ -1518,7 +1524,7 @@ + esac + ;; + CYGWIN*) SO=.dll;; +- *) SO=.so;; ++ *) SO=$DEBUG_EXT.so;; + esac + else + # this might also be a termcap variable, see #610332 +--- ./Misc/python-config.in.orig 2009-03-22 12:19:29.000000000 +0100 ++++ ./Misc/python-config.in 2009-03-22 12:19:54.000000000 +0100 +@@ -44,7 +44,7 @@ + + elif opt in ('--libs', '--ldflags'): + libs = getvar('LIBS').split() + getvar('SYSLIBS').split() +- libs.append('-lpython'+pyver) ++ libs.append('-lpython' + pyver + (sys.pydebug and "_d" or "")) + # add the prefix/lib/pythonX.Y/config dir, but only if there is no + # shared library in prefix/lib/. + if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'): --- python2.6-2.6.2.orig/debian/patches/site-builddir.diff +++ python2.6-2.6.2/debian/patches/site-builddir.diff @@ -0,0 +1,32 @@ +--- site.py~ 2008-05-23 11:11:59.000000000 +0000 ++++ site.py 2008-05-23 11:22:03.000000000 +0000 +@@ -111,19 +111,6 @@ + sys.path[:] = L + return known_paths + +-# XXX This should not be part of site.py, since it is needed even when +-# using the -S option for Python. See http://www.python.org/sf/586680 +-def addbuilddir(): +- """Append ./build/lib. in case we're running in the build dir +- (especially for Guido :-)""" +- from distutils.util import get_platform +- s = "build/lib.%s-%.3s" % (get_platform(), sys.version) +- if hasattr(sys, 'gettotalrefcount'): +- s += '-pydebug' +- s = os.path.join(os.path.dirname(sys.path[-1]), s) +- sys.path.append(s) +- +- + def _init_pathinfo(): + """Return a set containing all existing directory entries from sys.path""" + d = set() +@@ -495,9 +482,6 @@ + + abs__file__() + known_paths = removeduppaths() +- if (os.name == "posix" and sys.path and +- os.path.basename(sys.path[-1]) == "Modules"): +- addbuilddir() + if ENABLE_USER_SITE is None: + ENABLE_USER_SITE = check_enableusersite() + known_paths = addusersitepackages(known_paths) --- python2.6-2.6.2.orig/debian/patches/issue1113244.dpatch +++ python2.6-2.6.2/debian/patches/issue1113244.dpatch @@ -0,0 +1,80 @@ +#! /bin/sh -e + +# DP: Issue #1113244: Py_XINCREF, Py_DECREF, Py_XDECREF: Add `do { ... } while (0)' +# DP: to avoid compiler warnings. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +Index: Include/object.h +=================================================================== +--- Include/object.h (Revision 71226) ++++ Include/object.h (Arbeitskopie) +@@ -746,11 +746,13 @@ + ((PyObject*)(op))->ob_refcnt++) + + #define Py_DECREF(op) \ +- if (_Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA \ +- --((PyObject*)(op))->ob_refcnt != 0) \ +- _Py_CHECK_REFCNT(op) \ +- else \ +- _Py_Dealloc((PyObject *)(op)) ++ do { \ ++ if (_Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA \ ++ --((PyObject*)(op))->ob_refcnt != 0) \ ++ _Py_CHECK_REFCNT(op) \ ++ else \ ++ _Py_Dealloc((PyObject *)(op)); \ ++ } while (0) + + /* Safely decref `op` and set `op` to NULL, especially useful in tp_clear + * and tp_dealloc implementatons. +@@ -796,8 +798,8 @@ + } while (0) + + /* Macros to use in case the object pointer may be NULL: */ +-#define Py_XINCREF(op) if ((op) == NULL) ; else Py_INCREF(op) +-#define Py_XDECREF(op) if ((op) == NULL) ; else Py_DECREF(op) ++#define Py_XINCREF(op) do { if ((op) == NULL) ; else Py_INCREF(op); } while (0) ++#define Py_XDECREF(op) do { if ((op) == NULL) ; else Py_DECREF(op); } while (0) + + /* + These are provided as conveniences to Python runtime embedders, so that +Index: Modules/readline.c +=================================================================== +--- Modules/readline.c (Revision 71226) ++++ Modules/readline.c (Arbeitskopie) +@@ -694,13 +694,13 @@ + r = PyObject_CallFunction(completion_display_matches_hook, + "sOi", matches[0], m, max_length); + +- Py_DECREF(m), m=NULL; ++ Py_DECREF(m); m=NULL; + + if (r == NULL || + (r != Py_None && PyInt_AsLong(r) == -1 && PyErr_Occurred())) { + goto error; + } +- Py_XDECREF(r), r=NULL; ++ Py_XDECREF(r); r=NULL; + + if (0) { + error: --- python2.6-2.6.2.orig/debian/patches/deb-setup.dpatch +++ python2.6-2.6.2/debian/patches/deb-setup.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh -e + +# DP: Don't include /usr/local/include and /usr/local/lib as gcc search paths + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- setup.py~ 2002-08-02 20:02:01.000000000 +0200 ++++ setup.py 2002-08-02 20:13:25.000000000 +0200 +@@ -227,8 +227,9 @@ + + def detect_modules(self): + # Ensure that /usr/local is always used +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') ++ # On Debian /usr/local is always used, so we don't include it twice ++ #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ++ #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + + if os.path.normpath(sys.prefix) != '/usr': + add_dir_to_list(self.compiler.library_dirs, --- python2.6-2.6.2.orig/debian/patches/egg-info-no-version.dpatch +++ python2.6-2.6.2/debian/patches/egg-info-no-version.dpatch @@ -0,0 +1,40 @@ +#! /bin/sh -e + +# DP: distutils: Do not encode the python version into the .egg-info name. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Lib/distutils/command/install_egg_info.py~ 2007-02-16 16:57:19.000000000 +0100 ++++ Lib/distutils/command/install_egg_info.py 2007-03-05 11:18:29.000000000 +0100 +@@ -21,10 +21,9 @@ + + def finalize_options(self): + self.set_undefined_options('install_lib',('install_dir','install_dir')) +- basename = "%s-%s-py%s.egg-info" % ( ++ basename = "%s-%s.egg-info" % ( + to_filename(safe_name(self.distribution.get_name())), +- to_filename(safe_version(self.distribution.get_version())), +- sys.version[:3] ++ to_filename(safe_version(self.distribution.get_version())) + ) + self.target = os.path.join(self.install_dir, basename) + self.outputs = [self.target] --- python2.6-2.6.2.orig/debian/patches/setup-modules.dpatch +++ python2.6-2.6.2/debian/patches/setup-modules.dpatch @@ -0,0 +1,68 @@ +#! /bin/sh -e + +# DP: Modules/Setup.dist: patches to build some extensions statically + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Modules/_elementtree.c~ 2008-11-27 10:01:33.000000000 +0100 ++++ Modules/_elementtree.c 2008-11-27 10:03:30.000000000 +0100 +@@ -1837,7 +1837,10 @@ + static struct PyExpat_CAPI* expat_capi; + #define EXPAT(func) (expat_capi->func) + #else +-#define EXPAT(func) (XML_##func) ++#define EXPAT(func) (PyExpat_XML_##func) ++#define PyExpat_XML_GetErrorLineNumber PyExpat_XML_GetCurrentLineNumber ++#define PyExpat_XML_GetErrorColumnNumber PyExpat_XML_GetCurrentColumnNumber ++#define PyExpat_XML_GetErrorByteIndex PyExpat_XML_GetCurrentByteIndex + #endif + + typedef struct { +--- Modules/Setup.dist~ 2008-11-27 10:59:37.000000000 +0100 ++++ Modules/Setup.dist 2008-11-27 11:00:26.000000000 +0100 +@@ -165,7 +165,7 @@ + #itertools itertoolsmodule.c # Functions creating iterators for efficient looping + #atexit atexitmodule.c # Register functions to be run at interpreter-shutdown + #_functools _functoolsmodule.c # Tools for working with functions and callable objects +-#_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c # elementtree accelerator ++#_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H _elementtree.c # elementtree accelerator + #_pickle _pickle.c # pickle accelerator + #datetime datetimemodule.c # date/time type + #_bisect _bisectmodule.c # Bisection algorithms +@@ -341,6 +341,7 @@ + #DBLIB=$(DB)/lib + #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) + ++#_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c _ctypes/malloc_closure.c -Wl,-Bstatic -lffi -Wl,-Bdynamic + + # Helper module for various ascii-encoders + #binascii binascii.c +@@ -382,7 +382,7 @@ + # + # More information on Expat can be found at www.libexpat.org. + # +-#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI ++#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H + + # Hye-Shik Chang's CJKCodecs + +#! /bin/sh -e --- python2.6-2.6.2.orig/debian/patches/webbrowser.dpatch +++ python2.6-2.6.2/debian/patches/webbrowser.dpatch @@ -0,0 +1,50 @@ +#! /bin/sh -e + +# DP: Recognize other browsers: www-browser, x-www-browser, iceweasel, iceape. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Lib/webbrowser.py~ 2007-07-04 15:50:53.000000000 +0200 ++++ Lib/webbrowser.py 2007-08-31 16:11:12.000000000 +0200 +@@ -453,9 +453,13 @@ + if "KDE_FULL_SESSION" in os.environ and _iscommand("kfmclient"): + register("kfmclient", Konqueror, Konqueror("kfmclient")) + ++ if _iscommand("x-www-browser"): ++ register("x-www-browser", None, BackgroundBrowser("x-www-browser")) ++ + # The Mozilla/Netscape browsers + for browser in ("mozilla-firefox", "firefox", + "mozilla-firebird", "firebird", ++ "iceweasel", "iceape", + "seamonkey", "mozilla", "netscape"): + if _iscommand(browser): + register(browser, None, Mozilla(browser)) +@@ -493,6 +497,8 @@ + + # Also try console browsers + if os.environ.get("TERM"): ++ if _iscommand("www-browser"): ++ register("www-browser", None, GenericBrowser("www-browser")) + # The Links/elinks browsers + if _iscommand("links"): + register("links", None, GenericBrowser("links")) --- python2.6-2.6.2.orig/debian/patches/enable-fpectl.dpatch +++ python2.6-2.6.2/debian/patches/enable-fpectl.dpatch @@ -0,0 +1,37 @@ +#! /bin/sh -e + +# DP: Enable the build of the fpectl module. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- setup.py~ 2005-01-04 18:23:29.000000000 +0100 ++++ setup.py 2005-01-04 18:52:18.000000000 +0100 +@@ -689,6 +689,9 @@ + libraries = ['panel'] + curses_libs) ) + + ++ #fpectl fpectlmodule.c ... ++ exts.append( Extension('fpectl', ['fpectlmodule.c']) ) ++ + # Andrew Kuchling's zlib module. Note that some versions of zlib + # 1.1.3 have security problems. See CERT Advisory CA-2002-07: + # http://www.cert.org/advisories/CA-2002-07.html --- python2.6-2.6.2.orig/debian/patches/no-large-file-support.dpatch +++ python2.6-2.6.2/debian/patches/no-large-file-support.dpatch @@ -0,0 +1,40 @@ +#! /bin/sh -e + +# DP: disable large file support for GNU/Hurd + +dir=. +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p1 < $0 + autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 + rm -f configure + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +diff -ru python2.3-2.3.2.orig/configure.in python2.3-2.3.2/configure.in +--- python2.3-2.3.2.orig/configure.in 2003-09-25 17:21:00.000000000 +0200 ++++ python2.3-2.3.2/configure.in 2003-10-05 09:38:36.000000000 +0200 +@@ -970,6 +970,9 @@ + use_lfs=no + fi + ++# Don't use largefile support anyway. ++use_lfs=no ++ + if test "$use_lfs" = "yes"; then + # Two defines needed to enable largefile support on various platforms + # These may affect some typedefs --- python2.6-2.6.2.orig/debian/patches/subprocess-eintr-safety.dpatch +++ python2.6-2.6.2/debian/patches/subprocess-eintr-safety.dpatch @@ -0,0 +1,81 @@ +#! /bin/sh -e + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + #cd ${dir}gcc && autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + #rm ${dir}gcc/configure + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Lib/test/test_subprocess.py 2007-03-14 19:16:36.000000000 +0100 ++++ Lib/test/test_subprocess.py 2007-03-14 19:18:57.000000000 +0100 +@@ -580,6 +578,34 @@ class ProcessTestCase(unittest.TestCase) + os.remove(fname) + self.assertEqual(rc, 47) + ++ def test_eintr(self): ++ # retries on EINTR for an argv ++ ++ # send ourselves a signal that causes EINTR ++ prev_handler = signal.signal(signal.SIGALRM, lambda x,y: 1) ++ signal.alarm(1) ++ time.sleep(0.5) ++ ++ rc = subprocess.Popen(['sleep', '1']) ++ self.assertEqual(rc.wait(), 0) ++ ++ signal.signal(signal.SIGALRM, prev_handler) ++ ++ def test_eintr_out(self): ++ # retries on EINTR for a shell call and pipelining ++ ++ # send ourselves a signal that causes EINTR ++ prev_handler = signal.signal(signal.SIGALRM, lambda x,y: 1) ++ signal.alarm(1) ++ time.sleep(0.5) ++ ++ rc = subprocess.Popen("sleep 1; echo hello", ++ shell=True, stdout=subprocess.PIPE) ++ out = rc.communicate()[0] ++ self.assertEqual(rc.returncode, 0) ++ self.assertEqual(out, "hello\n") ++ ++ signal.signal(signal.SIGALRM, prev_handler) + + # + # Windows tests +--- Lib/subprocess.py~ 2008-07-15 15:41:24.000000000 +0200 ++++ Lib/subprocess.py 2008-07-15 15:42:49.000000000 +0200 +@@ -657,13 +657,13 @@ + stderr = None + if self.stdin: + if input: +- self.stdin.write(input) ++ self._fo_write_no_intr(self.stdin, input) + self.stdin.close() + elif self.stdout: +- stdout = self.stdout.read() ++ stdout = self._fo_read_no_intr(self.stdout) + self.stdout.close() + elif self.stderr: +- stderr = self.stderr.read() ++ stderr = self._fo_read_no_intr(self.stderr) + self.stderr.close() + self.wait() + return (stdout, stderr) --- python2.6-2.6.2.orig/debian/patches/doc-nodownload.dpatch +++ python2.6-2.6.2/debian/patches/doc-nodownload.dpatch @@ -0,0 +1,36 @@ +#! /bin/sh -e + +# DP: Don't try to download documentation tools + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Doc/Makefile~ 2008-04-13 22:51:27.000000000 +0200 ++++ Doc/Makefile 2008-05-29 18:50:41.000000000 +0200 +@@ -49,7 +49,7 @@ + svn update tools/jinja + svn update tools/pygments + +-build: checkout ++build: + mkdir -p build/$(BUILDER) build/doctrees + $(PYTHON) tools/sphinx-build.py $(ALLSPHINXOPTS) + @echo --- python2.6-2.6.2.orig/debian/patches/cthreads.dpatch +++ python2.6-2.6.2/debian/patches/cthreads.dpatch @@ -0,0 +1,65 @@ +#! /bin/sh -e + +# DP: Remove cthreads detection + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + autoconf + autoheader + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + #rm ${dir}gcc/configure + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- configure.in~ 2004-06-14 23:29:15.000000000 +0200 ++++ configure.in 2004-06-14 23:33:13.000000000 +0200 +@@ -1527,7 +1527,6 @@ + + # Templates for things AC_DEFINEd more than once. + # For a single AC_DEFINE, no template is needed. +-AH_TEMPLATE(C_THREADS,[Define if you have the Mach cthreads package]) + AH_TEMPLATE(_REENTRANT, + [Define to force use of thread-safe errno, h_errno, and other functions]) + AH_TEMPLATE(WITH_THREAD, +@@ -1608,17 +1607,6 @@ + AC_MSG_RESULT($unistd_defines_pthreads) + + AC_DEFINE(_REENTRANT) +- AC_CHECK_HEADER(cthreads.h, [AC_DEFINE(WITH_THREAD) +- AC_DEFINE(C_THREADS) +- AC_DEFINE(HURD_C_THREADS, 1, +- [Define if you are using Mach cthreads directly under /include]) +- LIBS="$LIBS -lthreads" +- THREADOBJ="Python/thread.o"],[ +- AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD) +- AC_DEFINE(C_THREADS) +- AC_DEFINE(MACH_C_THREADS, 1, +- [Define if you are using Mach cthreads under mach /]) +- THREADOBJ="Python/thread.o"],[ + AC_MSG_CHECKING(for --with-pth) + AC_ARG_WITH([pth], + AC_HELP_STRING(--with-pth, use GNU pth threading libraries), +@@ -1673,7 +1661,7 @@ + LIBS="$LIBS -lcma" + THREADOBJ="Python/thread.o"],[ + USE_THREAD_MODULE="#"]) +- ])])])])])])])])])]) ++ ])])])])])])])]) + + AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD) + LIBS="$LIBS -lmpc" --- python2.6-2.6.2.orig/debian/patches/profile-doc.dpatch +++ python2.6-2.6.2/debian/patches/profile-doc.dpatch @@ -0,0 +1,57 @@ +#! /bin/sh -e + +# DP: hotshot/pstats.py: Error out on missing profile/pstats modules. +# DP: Add a note to the library documentation, that the profile and pstats +# DP: modules can be found in the python2.x-profiler package. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + #cd ${dir}gcc && autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + #rm ${dir}gcc/configure + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Doc/library/profile.rst~ 2008-04-18 20:39:55.000000000 +0200 ++++ Doc/library/profile.rst 2008-05-30 11:07:19.000000000 +0200 +@@ -5,6 +5,12 @@ + The Python Profilers + ******************** + ++Debian note: The license for the :mod:`profile` and :mod:`pstats` ++modules doesn't conform to the Debian Free Software Guidelines (DFSG). ++These modules can be found in the *python-profiler* package in the ++*non-free* section of the Debian archives or in the the *multiverse* ++section of the Ubuntu archives. ++ + .. sectionauthor:: James Roskind + + +@@ -241,6 +247,12 @@ + :synopsis: Python profiler + + ++Debian note: The license for the :mod:`profile` and :mod:`pstats` ++modules doesn't conform to the Debian Free Software Guidelines (DFSG). ++These modules can be found in the *python-profiler* package in the ++*non-free* section of the Debian archives or in the the *multiverse* ++section of the Ubuntu archives. ++ + The primary entry point for the profiler is the global function + :func:`profile.run` (resp. :func:`cProfile.run`). It is typically used to create + any profile information. The reports are formatted and printed using methods of --- python2.6-2.6.2.orig/debian/patches/apport-support.dpatch +++ python2.6-2.6.2/debian/patches/apport-support.dpatch @@ -0,0 +1,42 @@ +#! /bin/sh -e + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + #cd ${dir}gcc && autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + #rm ${dir}gcc/configure + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Lib/site.py 2004-07-20 12:28:28.000000000 +1000 ++++ Lib/site.py 2006-11-09 09:28:32.000000000 +1100 +@@ -393,6 +393,14 @@ + # this module is run as a script, because this code is executed twice. + if hasattr(sys, "setdefaultencoding"): + del sys.setdefaultencoding ++ # install the apport exception handler if available ++ try: ++ import apport_python_hook ++ except ImportError: ++ pass ++ else: ++ apport_python_hook.install() ++ + + main() + --- python2.6-2.6.2.orig/debian/patches/profiled-build.dpatch +++ python2.6-2.6.2/debian/patches/profiled-build.dpatch @@ -0,0 +1,36 @@ +#! /bin/sh -e + +# DP: Fix profiled build; don't use Python/thread.gc*, gcc complains + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Makefile.pre.in~ 2008-11-14 12:13:11.000000000 +0100 ++++ Makefile.pre.in 2008-11-14 14:54:20.000000000 +0100 +@@ -375,6 +375,8 @@ + ./$(BUILDPYTHON) $(PROFILE_TASK) + + build_all_use_profile: ++ : # FIXME: gcc error ++ rm -f Python/thread.gc* + $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use" + + coverage: --- python2.6-2.6.2.orig/debian/patches/no-zip-on-sys.path.dpatch +++ python2.6-2.6.2/debian/patches/no-zip-on-sys.path.dpatch @@ -0,0 +1,75 @@ +#! /bin/sh -e + +# DP: Do not add /usr/lib/pythonXY.zip on sys.path. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Modules/getpath.c~ 2006-02-20 18:37:39.000000000 +0100 ++++ Modules/getpath.c 2008-06-25 13:03:02.000000000 +0200 +@@ -371,7 +371,9 @@ + char *path = getenv("PATH"); + char *prog = Py_GetProgramName(); + char argv0_path[MAXPATHLEN+1]; ++#ifdef WITH_ZIP_PATH + char zip_path[MAXPATHLEN+1]; ++#endif + int pfound, efound; /* 1 if found; -1 if found build directory */ + char *buf; + size_t bufsz; +@@ -511,6 +513,7 @@ + else + reduce(prefix); + ++#ifdef WITH_ZIP_PATH + strncpy(zip_path, prefix, MAXPATHLEN); + zip_path[MAXPATHLEN] = '\0'; + if (pfound > 0) { /* Use the reduced prefix returned by Py_GetPrefix() */ +@@ -523,6 +526,7 @@ + bufsz = strlen(zip_path); /* Replace "00" with version */ + zip_path[bufsz - 6] = VERSION[0]; + zip_path[bufsz - 5] = VERSION[2]; ++#endif + + if (!(efound = search_for_exec_prefix(argv0_path, home))) { + if (!Py_FrozenFlag) +@@ -562,7 +566,9 @@ + defpath = delim + 1; + } + ++#ifdef WITH_ZIP_PATH + bufsz += strlen(zip_path) + 1; ++#endif + bufsz += strlen(exec_prefix) + 1; + + /* This is the only malloc call in this file */ +@@ -583,9 +589,11 @@ + else + buf[0] = '\0'; + ++#ifdef WITH_ZIP_PATH + /* Next is the default zip path */ + strcat(buf, zip_path); + strcat(buf, delimiter); ++#endif + + /* Next goes merge of compile-time $PYTHONPATH with + * dynamically located prefix. --- python2.6-2.6.2.orig/debian/patches/doc-faq.dpatch +++ python2.6-2.6.2/debian/patches/doc-faq.dpatch @@ -0,0 +1,54 @@ +#! /bin/sh -e + +# DP: Mention the FAQ on the documentation index page. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + #cd ${dir}gcc && autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + #rm ${dir}gcc/configure + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Doc/html/index.html.in~ 2002-04-01 18:11:27.000000000 +0200 ++++ Doc/html/index.html.in 2003-04-05 13:33:35.000000000 +0200 +@@ -123,6 +123,24 @@ + + + ++ ++ ++   ++

++ ++ ++   ++ ++ ++ + + +

--- python2.6-2.6.2.orig/debian/patches/disable-utimes.dpatch +++ python2.6-2.6.2/debian/patches/disable-utimes.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh -e + +# DP: disable check for utimes function, which is broken in glibc-2.3.2 + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + rm -f configure + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- configure.in~ 2003-07-24 00:17:27.000000000 +0200 ++++ configure.in 2003-08-10 11:10:00.000000000 +0200 +@@ -2051,7 +2051,7 @@ + setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \ + sigaction siginterrupt sigrelse strftime strptime \ + sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \ +- truncate uname unsetenv utimes waitpid wcscoll _getpty) ++ truncate uname unsetenv waitpid wcscoll _getpty) + + # For some functions, having a definition is not sufficient, since + # we want to take their address. --- python2.6-2.6.2.orig/debian/patches/distutils-sysconfig.dpatch +++ python2.6-2.6.2/debian/patches/distutils-sysconfig.dpatch @@ -0,0 +1,56 @@ +#! /bin/sh -e + +# DP: Allow setting BASECFLAGS, OPT and EXTRA_LDFLAGS (like, CC, CXX, CPP, +# DP: CFLAGS, CPPFLAGS, CCSHARED, LDSHARED) from the environment. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + #cd ${dir}gcc && autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + #rm ${dir}gcc/configure + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Lib/distutils/sysconfig.py~ 2008-05-23 11:12:19.000000000 +0000 ++++ Lib/distutils/sysconfig.py 2008-05-23 11:19:00.000000000 +0000 +@@ -162,8 +162,9 @@ + varies across Unices and is stored in Python's Makefile. + """ + if compiler.compiler_type == "unix": +- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext) = \ ++ (cc, cxx, opt, cflags, opt, extra_cflags, basecflags, ccshared, ldshared, so_ext) = \ + get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', ++ 'OPT', 'EXTRA_CFLAGS', 'BASECFLAGS', + 'CCSHARED', 'LDSHARED', 'SO') + + if 'CC' in os.environ: +@@ -178,8 +179,13 @@ + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ if 'BASECFLAGS' in os.environ: ++ basecflags = os.environ['BASECFLAGS'] ++ if 'OPT' in os.environ: ++ opt = os.environ['OPT'] ++ cflags = ' '.join(str(x) for x in (basecflags, opt, extra_cflags) if x) + if 'CFLAGS' in os.environ: +- cflags = opt + ' ' + os.environ['CFLAGS'] ++ cflags = ' '.join(str(x) for x in (basecflags, opt, os.environ['CFLAGS'], extra_cflags) if x) + ldshared = ldshared + ' ' + os.environ['CFLAGS'] + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] --- python2.6-2.6.2.orig/debian/patches/arm-float.dpatch +++ python2.6-2.6.2/debian/patches/arm-float.dpatch @@ -0,0 +1,119 @@ +#! /bin/sh -e + +# DP: Support mixed-endian IEEE floating point, as found in the ARM old-ABI. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Objects/floatobject.c.orig 2006-05-25 10:53:30.000000000 -0500 ++++ Objects/floatobject.c 2007-07-27 06:43:15.000000000 -0500 +@@ -982,7 +982,7 @@ + /* this is for the benefit of the pack/unpack routines below */ + + typedef enum { +- unknown_format, ieee_big_endian_format, ieee_little_endian_format ++ unknown_format, ieee_big_endian_format, ieee_little_endian_format, ieee_mixed_endian_format + } float_format_type; + + static float_format_type double_format, float_format; +@@ -1021,6 +1021,8 @@ + return PyString_FromString("IEEE, little-endian"); + case ieee_big_endian_format: + return PyString_FromString("IEEE, big-endian"); ++ case ieee_mixed_endian_format: ++ return PyString_FromString("IEEE, mixed-endian"); + default: + Py_FatalError("insane float_format or double_format"); + return NULL; +@@ -1073,11 +1075,14 @@ + else if (strcmp(format, "IEEE, big-endian") == 0) { + f = ieee_big_endian_format; + } ++ else if (strcmp(format, "IEEE, mixed-endian") == 0) { ++ f = ieee_mixed_endian_format; ++ } + else { + PyErr_SetString(PyExc_ValueError, + "__setformat__() argument 2 must be " +- "'unknown', 'IEEE, little-endian' or " +- "'IEEE, big-endian'"); ++ "'unknown', 'IEEE, little-endian', " ++ "'IEEE, big-endian' or 'IEEE, mixed-endian'"); + return NULL; + + } +@@ -1230,6 +1235,8 @@ + detected_double_format = ieee_big_endian_format; + else if (memcmp(&x, "\x05\x04\x03\x02\x01\xff\x3f\x43", 8) == 0) + detected_double_format = ieee_little_endian_format; ++ else if (memcmp(&x, "\x01\xff\x3f\x43\x05\x04\x03\x02", 8) == 0) ++ detected_double_format = ieee_mixed_endian_format; + else + detected_double_format = unknown_format; + } +@@ -1565,8 +1572,19 @@ + p += 7; + incr = -1; + } ++ else if (double_format == ieee_mixed_endian_format) { ++ if (le) ++ p += 4; ++ else { ++ p += 3; ++ incr = -1; ++ } ++ } + + for (i = 0; i < 8; i++) { ++ if (double_format == ieee_mixed_endian_format && i == 4) ++ p += -8 * incr; ++ + *p = *s++; + p += incr; + } +@@ -1739,6 +1757,27 @@ + } + memcpy(&x, buf, 8); + } ++ else if (double_format == ieee_mixed_endian_format) { ++ char buf[8]; ++ char *d; ++ int i, incr = 1; ++ ++ if (le) ++ d = &buf[4]; ++ else ++ d = &buf[3]; ++ ++ for (i = 0; i < 4; i++) { ++ *d = *p++; ++ d += incr; ++ } ++ d += -8 * incr; ++ for (i = 0; i < 4; i++) { ++ *d = *p++; ++ d += incr; ++ } ++ memcpy(&x, buf, 8); ++ } + else { + memcpy(&x, p, 8); + } --- python2.6-2.6.2.orig/debian/patches/profiled-build2.dpatch +++ python2.6-2.6.2/debian/patches/profiled-build2.dpatch @@ -0,0 +1,40 @@ +#! /bin/sh -e + +# DP: Fix profiled build; don't use Python/thread.gc*, gcc complains + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +--- Makefile.pre.in.orig 2009-02-11 12:50:56.000000000 +0100 ++++ Makefile.pre.in 2009-02-11 12:51:30.000000000 +0100 +@@ -370,9 +370,11 @@ + $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov" + + run_profile_task: +- ./$(BUILDPYTHON) $(PROFILE_TASK) ++ -./$(BUILDPYTHON) $(PROFILE_TASK) + + build_all_use_profile: ++ : # FIXME: gcc error ++ rm -f Python/thread.gc* + $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use" + + coverage: --- python2.6-2.6.2.orig/debian/patches/svn-updates.dpatch +++ python2.6-2.6.2/debian/patches/svn-updates.dpatch @@ -0,0 +1,15859 @@ +#! /bin/sh -e + +# DP: SVN updates of the release26-maint branch (until 2009-07-19). + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + rm -f configure + autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + rm -f configure + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + +# svn diff http://svn.python.org/projects/python/tags/r262 http://svn.python.org/projects/python/branches/release26-maint +# diff -urN --exclude=.svn Python-2.6 svn + +Index: Python/ceval.c +=================================================================== +--- Python/ceval.c (.../tags/r262) (Revision 74094) ++++ Python/ceval.c (.../branches/release26-maint) (Revision 74094) +@@ -3911,10 +3911,17 @@ + PCALL(PCALL_METHOD); + else if (PyType_Check(func)) + PCALL(PCALL_TYPE); ++ else if (PyCFunction_Check(func)) ++ PCALL(PCALL_CFUNCTION); + else + PCALL(PCALL_OTHER); + #endif +- result = PyObject_Call(func, callargs, kwdict); ++ if (PyCFunction_Check(func)) { ++ PyThreadState *tstate = PyThreadState_GET(); ++ C_TRACE(result, PyCFunction_Call(func, callargs, kwdict)); ++ } ++ else ++ result = PyObject_Call(func, callargs, kwdict); + call_fail: + Py_XDECREF(callargs); + Py_XDECREF(kwdict); +@@ -3999,10 +4006,17 @@ + PCALL(PCALL_METHOD); + else if (PyType_Check(func)) + PCALL(PCALL_TYPE); ++ else if (PyCFunction_Check(func)) ++ PCALL(PCALL_CFUNCTION); + else + PCALL(PCALL_OTHER); + #endif +- result = PyObject_Call(func, callargs, kwdict); ++ if (PyCFunction_Check(func)) { ++ PyThreadState *tstate = PyThreadState_GET(); ++ C_TRACE(result, PyCFunction_Call(func, callargs, kwdict)); ++ } ++ else ++ result = PyObject_Call(func, callargs, kwdict); + ext_call_fail: + Py_XDECREF(callargs); + Py_XDECREF(kwdict); +Index: Python/pymath.c +=================================================================== +--- Python/pymath.c (.../tags/r262) (Revision 74094) ++++ Python/pymath.c (.../branches/release26-maint) (Revision 74094) +@@ -1,5 +1,18 @@ + #include "Python.h" + ++#ifdef X87_DOUBLE_ROUNDING ++/* On x86 platforms using an x87 FPU, this function is called from the ++ Py_FORCE_DOUBLE macro (defined in pymath.h) to force a floating-point ++ number out of an 80-bit x87 FPU register and into a 64-bit memory location, ++ thus rounding from extended precision to double precision. */ ++double _Py_force_double(double x) ++{ ++ volatile double y; ++ y = x; ++ return y; ++} ++#endif ++ + #ifndef HAVE_HYPOT + double hypot(double x, double y) + { +@@ -22,7 +35,7 @@ + #endif /* HAVE_HYPOT */ + + #ifndef HAVE_COPYSIGN +-static double ++double + copysign(double x, double y) + { + /* use atan2 to distinguish -0. from 0. */ +Index: Python/import.c +=================================================================== +--- Python/import.c (.../tags/r262) (Revision 74094) ++++ Python/import.c (.../branches/release26-maint) (Revision 74094) +@@ -879,7 +879,11 @@ + { + FILE *fp; + time_t mtime = srcstat->st_mtime; +- mode_t mode = srcstat->st_mode; ++#ifdef MS_WINDOWS /* since Windows uses different permissions */ ++ mode_t mode = srcstat->st_mode & ~S_IEXEC; ++#else ++ mode_t mode = srcstat->st_mode & ~S_IXUSR & ~S_IXGRP & ~S_IXOTH; ++#endif + + fp = open_exclusive(cpathname, mode); + if (fp == NULL) { +Index: Python/marshal.c +=================================================================== +--- Python/marshal.c (.../tags/r262) (Revision 74094) ++++ Python/marshal.c (.../branches/release26-maint) (Revision 74094) +@@ -1179,6 +1179,20 @@ + return Py_None; + } + ++PyDoc_STRVAR(dump_doc, ++"dump(value, file[, version])\n\ ++\n\ ++Write the value on the open file. The value must be a supported type.\n\ ++The file must be an open file object such as sys.stdout or returned by\n\ ++open() or os.popen(). It must be opened in binary mode ('wb' or 'w+b').\n\ ++\n\ ++If the value has (or contains an object that has) an unsupported type, a\n\ ++ValueError exception is raised — but garbage data will also be written\n\ ++to the file. The object will not be properly read back by load()\n\ ++\n\ ++New in version 2.4: The version argument indicates the data format that\n\ ++dump should use."); ++ + static PyObject * + marshal_load(PyObject *self, PyObject *f) + { +@@ -1197,6 +1211,19 @@ + return result; + } + ++PyDoc_STRVAR(load_doc, ++"load(file)\n\ ++\n\ ++Read one value from the open file and return it. If no valid value is\n\ ++read (e.g. because the data has a different Python version’s\n\ ++incompatible marshal format), raise EOFError, ValueError or TypeError.\n\ ++The file must be an open file object opened in binary mode ('rb' or\n\ ++'r+b').\n\ ++\n\ ++Note: If an object containing an unsupported type was marshalled with\n\ ++dump(), load() will substitute None for the unmarshallable type."); ++ ++ + static PyObject * + marshal_dumps(PyObject *self, PyObject *args) + { +@@ -1207,6 +1234,17 @@ + return PyMarshal_WriteObjectToString(x, version); + } + ++PyDoc_STRVAR(dumps_doc, ++"dumps(value[, version])\n\ ++\n\ ++Return the string that would be written to a file by dump(value, file).\n\ ++The value must be a supported type. Raise a ValueError exception if\n\ ++value has (or contains an object that has) an unsupported type.\n\ ++\n\ ++New in version 2.4: The version argument indicates the data format that\n\ ++dumps should use."); ++ ++ + static PyObject * + marshal_loads(PyObject *self, PyObject *args) + { +@@ -1226,18 +1264,56 @@ + return result; + } + ++PyDoc_STRVAR(loads_doc, ++"loads(string)\n\ ++\n\ ++Convert the string to a value. If no valid value is found, raise\n\ ++EOFError, ValueError or TypeError. Extra characters in the string are\n\ ++ignored."); ++ + static PyMethodDef marshal_methods[] = { +- {"dump", marshal_dump, METH_VARARGS}, +- {"load", marshal_load, METH_O}, +- {"dumps", marshal_dumps, METH_VARARGS}, +- {"loads", marshal_loads, METH_VARARGS}, ++ {"dump", marshal_dump, METH_VARARGS, dump_doc}, ++ {"load", marshal_load, METH_O, load_doc}, ++ {"dumps", marshal_dumps, METH_VARARGS, dumps_doc}, ++ {"loads", marshal_loads, METH_VARARGS, loads_doc}, + {NULL, NULL} /* sentinel */ + }; + ++PyDoc_STRVAR(marshal_doc, ++"This module contains functions that can read and write Python values in\n\ ++a binary format. The format is specific to Python, but independent of\n\ ++machine architecture issues.\n\ ++\n\ ++Not all Python object types are supported; in general, only objects\n\ ++whose value is independent from a particular invocation of Python can be\n\ ++written and read by this module. The following types are supported:\n\ ++None, integers, long integers, floating point numbers, strings, Unicode\n\ ++objects, tuples, lists, sets, dictionaries, and code objects, where it\n\ ++should be understood that tuples, lists and dictionaries are only\n\ ++supported as long as the values contained therein are themselves\n\ ++supported; and recursive lists and dictionaries should not be written\n\ ++(they will cause infinite loops).\n\ ++\n\ ++Variables:\n\ ++\n\ ++version -- indicates the format that the module uses. Version 0 is the\n\ ++ historical format, version 1 (added in Python 2.4) shares interned\n\ ++ strings and version 2 (added in Python 2.5) uses a binary format for\n\ ++ floating point numbers. (New in version 2.4)\n\ ++\n\ ++Functions:\n\ ++\n\ ++dump() -- write value to a file\n\ ++load() -- read value from a file\n\ ++dumps() -- write value to a string\n\ ++loads() -- read value from a string"); ++ ++ + PyMODINIT_FUNC + PyMarshal_Init(void) + { +- PyObject *mod = Py_InitModule("marshal", marshal_methods); ++ PyObject *mod = Py_InitModule3("marshal", marshal_methods, ++ marshal_doc); + if (mod == NULL) + return; + PyModule_AddIntConstant(mod, "version", Py_MARSHAL_VERSION); +Index: Python/pystrtod.c +=================================================================== +--- Python/pystrtod.c (.../tags/r262) (Revision 74094) ++++ Python/pystrtod.c (.../branches/release26-maint) (Revision 74094) +@@ -229,7 +229,7 @@ + /* Ensure that any exponent, if present, is at least MIN_EXPONENT_DIGITS + in length. */ + Py_LOCAL_INLINE(void) +-ensure_minumim_exponent_length(char* buffer, size_t buf_size) ++ensure_minimum_exponent_length(char* buffer, size_t buf_size) + { + char *p = strpbrk(buffer, "eE"); + if (p && (*(p + 1) == '-' || *(p + 1) == '+')) { +@@ -468,7 +468,7 @@ + for the extra zeros. Also, if there are more than + MIN_EXPONENT_DIGITS, remove as many zeros as possible until we get + back to MIN_EXPONENT_DIGITS */ +- ensure_minumim_exponent_length(buffer, buf_size); ++ ensure_minimum_exponent_length(buffer, buf_size); + + /* If format_char is 'Z', make sure we have at least one character + after the decimal point (and make sure we have a decimal point). */ +Index: Python/bltinmodule.c +=================================================================== +--- Python/bltinmodule.c (.../tags/r262) (Revision 74094) ++++ Python/bltinmodule.c (.../branches/release26-maint) (Revision 74094) +@@ -1556,14 +1556,40 @@ + builtin_print(PyObject *self, PyObject *args, PyObject *kwds) + { + static char *kwlist[] = {"sep", "end", "file", 0}; +- static PyObject *dummy_args; ++ static PyObject *dummy_args = NULL; ++ static PyObject *unicode_newline = NULL, *unicode_space = NULL; ++ static PyObject *str_newline = NULL, *str_space = NULL; ++ PyObject *newline, *space; + PyObject *sep = NULL, *end = NULL, *file = NULL; +- int i, err; ++ int i, err, use_unicode = 0; + + if (dummy_args == NULL) { + if (!(dummy_args = PyTuple_New(0))) + return NULL; + } ++ if (str_newline == NULL) { ++ str_newline = PyString_FromString("\n"); ++ if (str_newline == NULL) ++ return NULL; ++ str_space = PyString_FromString(" "); ++ if (str_space == NULL) { ++ Py_CLEAR(str_newline); ++ return NULL; ++ } ++ unicode_newline = PyUnicode_FromString("\n"); ++ if (unicode_newline == NULL) { ++ Py_CLEAR(str_newline); ++ Py_CLEAR(str_space); ++ return NULL; ++ } ++ unicode_space = PyUnicode_FromString(" "); ++ if (unicode_space == NULL) { ++ Py_CLEAR(str_newline); ++ Py_CLEAR(str_space); ++ Py_CLEAR(unicode_space); ++ return NULL; ++ } ++ } + if (!PyArg_ParseTupleAndKeywords(dummy_args, kwds, "|OOO:print", + kwlist, &sep, &end, &file)) + return NULL; +@@ -1573,26 +1599,56 @@ + if (file == Py_None) + Py_RETURN_NONE; + } ++ if (sep == Py_None) { ++ sep = NULL; ++ } ++ else if (sep) { ++ if (PyUnicode_Check(sep)) { ++ use_unicode = 1; ++ } ++ else if (!PyString_Check(sep)) { ++ PyErr_Format(PyExc_TypeError, ++ "sep must be None, str or unicode, not %.200s", ++ sep->ob_type->tp_name); ++ return NULL; ++ } ++ } ++ if (end == Py_None) ++ end = NULL; ++ else if (end) { ++ if (PyUnicode_Check(end)) { ++ use_unicode = 1; ++ } ++ else if (!PyString_Check(end)) { ++ PyErr_Format(PyExc_TypeError, ++ "end must be None, str or unicode, not %.200s", ++ end->ob_type->tp_name); ++ return NULL; ++ } ++ } + +- if (sep && sep != Py_None && !PyString_Check(sep) && +- !PyUnicode_Check(sep)) { +- PyErr_Format(PyExc_TypeError, +- "sep must be None, str or unicode, not %.200s", +- sep->ob_type->tp_name); +- return NULL; ++ if (!use_unicode) { ++ for (i = 0; i < PyTuple_Size(args); i++) { ++ if (PyUnicode_Check(PyTuple_GET_ITEM(args, i))) { ++ use_unicode = 1; ++ break; ++ } ++ } + } +- if (end && end != Py_None && !PyString_Check(end) && +- !PyUnicode_Check(end)) { +- PyErr_Format(PyExc_TypeError, +- "end must be None, str or unicode, not %.200s", +- end->ob_type->tp_name); +- return NULL; ++ if (use_unicode) { ++ newline = unicode_newline; ++ space = unicode_space; + } ++ else { ++ newline = str_newline; ++ space = str_space; ++ } + + for (i = 0; i < PyTuple_Size(args); i++) { + if (i > 0) { +- if (sep == NULL || sep == Py_None) +- err = PyFile_WriteString(" ", file); ++ if (sep == NULL) ++ err = PyFile_WriteObject(space, file, ++ Py_PRINT_RAW); + else + err = PyFile_WriteObject(sep, file, + Py_PRINT_RAW); +@@ -1605,8 +1661,8 @@ + return NULL; + } + +- if (end == NULL || end == Py_None) +- err = PyFile_WriteString("\n", file); ++ if (end == NULL) ++ err = PyFile_WriteObject(newline, file, Py_PRINT_RAW); + else + err = PyFile_WriteObject(end, file, Py_PRINT_RAW); + if (err) +Index: Python/sysmodule.c +=================================================================== +--- Python/sysmodule.c (.../tags/r262) (Revision 74094) ++++ Python/sysmodule.c (.../branches/release26-maint) (Revision 74094) +@@ -1161,7 +1161,7 @@ + + + svnversion = _Py_svnversion(); +- if (strcmp(svnversion, "exported") != 0) ++ if (strcmp(svnversion, "Unversioned directory") != 0 && strcmp(svnversion, "exported") != 0) + svn_revision = svnversion; + else if (istag) { + len = strlen(_patchlevel_revision); +Index: Python/_warnings.c +=================================================================== +--- Python/_warnings.c (.../tags/r262) (Revision 74094) ++++ Python/_warnings.c (.../branches/release26-maint) (Revision 74094) +@@ -304,6 +304,8 @@ + } + if (rc == 1) { + text = PyObject_Str(message); ++ if (text == NULL) ++ goto cleanup; + category = (PyObject*)message->ob_type; + } + else { +Index: Include/patchlevel.h +=================================================================== +--- Include/patchlevel.h (.../tags/r262) (Revision 74094) ++++ Include/patchlevel.h (.../branches/release26-maint) (Revision 74094) +@@ -27,7 +27,7 @@ + #define PY_RELEASE_SERIAL 0 + + /* Version as a string */ +-#define PY_VERSION "2.6.2" ++#define PY_VERSION "2.6.2+" + /*--end constants--*/ + + /* Subversion Revision number of this file (not of the repository) */ +Index: Include/pymath.h +=================================================================== +--- Include/pymath.h (.../tags/r262) (Revision 74094) ++++ Include/pymath.h (.../branches/release26-maint) (Revision 74094) +@@ -77,6 +77,21 @@ + #define Py_MATH_E 2.7182818284590452354 + #endif + ++/* On x86, Py_FORCE_DOUBLE forces a floating-point number out of an x87 FPU ++ register and into a 64-bit memory location, rounding from extended ++ precision to double precision in the process. On other platforms it does ++ nothing. */ ++ ++/* we take double rounding as evidence of x87 usage */ ++#ifndef Py_FORCE_DOUBLE ++# ifdef X87_DOUBLE_ROUNDING ++PyAPI_FUNC(double) _Py_force_double(double); ++# define Py_FORCE_DOUBLE(X) (_Py_force_double(X)) ++# else ++# define Py_FORCE_DOUBLE(X) (X) ++# endif ++#endif ++ + /* Py_IS_NAN(X) + * Return 1 if float or double arg is a NaN, else 0. + * Caution: +@@ -87,7 +102,7 @@ + * Note: PC/pyconfig.h defines Py_IS_NAN as _isnan + */ + #ifndef Py_IS_NAN +-#ifdef HAVE_ISNAN ++#if defined HAVE_DECL_ISNAN && HAVE_DECL_ISNAN == 1 + #define Py_IS_NAN(X) isnan(X) + #else + #define Py_IS_NAN(X) ((X) != (X)) +@@ -101,15 +116,19 @@ + * This implementation may set the underflow flag if |X| is very small; + * it really can't be implemented correctly (& easily) before C99. + * Override in pyconfig.h if you have a better spelling on your platform. ++ * Py_FORCE_DOUBLE is used to avoid getting false negatives from a ++ * non-infinite value v sitting in an 80-bit x87 register such that ++ * v becomes infinite when spilled from the register to 64-bit memory. + * Note: PC/pyconfig.h defines Py_IS_INFINITY as _isinf + */ + #ifndef Py_IS_INFINITY +-#ifdef HAVE_ISINF +-#define Py_IS_INFINITY(X) isinf(X) +-#else +-#define Py_IS_INFINITY(X) ((X) && (X)*0.5 == (X)) ++# if defined HAVE_DECL_ISINF && HAVE_DECL_ISINF == 1 ++# define Py_IS_INFINITY(X) isinf(X) ++# else ++# define Py_IS_INFINITY(X) ((X) && \ ++ (Py_FORCE_DOUBLE(X)*0.5 == Py_FORCE_DOUBLE(X))) ++# endif + #endif +-#endif + + /* Py_IS_FINITE(X) + * Return 1 if float or double arg is neither infinite nor NAN, else 0. +@@ -118,7 +137,9 @@ + * Note: PC/pyconfig.h defines Py_IS_FINITE as _finite + */ + #ifndef Py_IS_FINITE +-#ifdef HAVE_FINITE ++#if defined HAVE_DECL_ISFINITE && HAVE_DECL_ISFINITE == 1 ++#define Py_IS_FINITE(X) isfinite(X) ++#elif defined HAVE_FINITE + #define Py_IS_FINITE(X) finite(X) + #else + #define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X)) +Index: Include/descrobject.h +=================================================================== +--- Include/descrobject.h (.../tags/r262) (Revision 74094) ++++ Include/descrobject.h (.../branches/release26-maint) (Revision 74094) +@@ -68,6 +68,9 @@ + } PyWrapperDescrObject; + + PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type; ++PyAPI_DATA(PyTypeObject) PyDictProxy_Type; ++PyAPI_DATA(PyTypeObject) PyGetSetDescr_Type; ++PyAPI_DATA(PyTypeObject) PyMemberDescr_Type; + + PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *); + PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *); +Index: Include/pymacconfig.h +=================================================================== +--- Include/pymacconfig.h (.../tags/r262) (Revision 74094) ++++ Include/pymacconfig.h (.../branches/release26-maint) (Revision 74094) +@@ -67,7 +67,19 @@ + #define WORDS_BIGENDIAN 1 + #endif /* __BIG_ENDIAN */ + ++ /* ++ * The definition in pyconfig.h is only valid on the OS release ++ * where configure ran on and not necessarily for all systems where ++ * the executable can be used on. ++ * ++ * Specifically: OSX 10.4 has limited supported for '%zd', while ++ * 10.5 has full support for '%zd'. A binary built on 10.5 won't ++ * work properly on 10.4 unless we surpress the definition ++ * of PY_FORMAT_SIZE_T ++ */ ++#undef PY_FORMAT_SIZE_T + ++ + #endif /* defined(_APPLE__) */ + + #endif /* PYMACCONFIG_H */ +Index: Include/sliceobject.h +=================================================================== +--- Include/sliceobject.h (.../tags/r262) (Revision 74094) ++++ Include/sliceobject.h (.../branches/release26-maint) (Revision 74094) +@@ -25,6 +25,7 @@ + } PySliceObject; + + PyAPI_DATA(PyTypeObject) PySlice_Type; ++PyAPI_DATA(PyTypeObject) PyEllipsis_Type; + + #define PySlice_Check(op) (Py_TYPE(op) == &PySlice_Type) + +Index: Demo/turtle/tdemo_chaos.py +=================================================================== +--- Demo/turtle/tdemo_chaos.py (.../tags/r262) (Revision 74094) ++++ Demo/turtle/tdemo_chaos.py (.../branches/release26-maint) (Revision 74094) +@@ -1,11 +1,13 @@ +-# Datei: chaosplotter.py +-# Autor: Gregor Lingl +-# Datum: 31. 5. 2008 ++# File: tdemo_chaos.py ++# Author: Gregor Lingl ++# Date: 2009-06-24 + +-# Ein einfaches Programm zur Demonstration von "chaotischem Verhalten". ++# A demonstration of chaos + + from turtle import * + ++N = 80 ++ + def f(x): + return 3.9*x*(1-x) + +@@ -15,47 +17,41 @@ + def h(x): + return 3.9*x-3.9*x*x + +-def coosys(): +- penup() +- goto(-1,0) ++def jumpto(x, y): ++ penup(); goto(x,y) ++ ++def line(x1, y1, x2, y2): ++ jumpto(x1, y1) + pendown() +- goto(n+1,0) +- penup() +- goto(0, -0.1) +- pendown() +- goto(-0.1, 1.1) ++ goto(x2, y2) + +-def plot(fun, start, farbe): ++def coosys(): ++ line(-1, 0, N+1, 0) ++ line(0, -0.1, 0, 1.1) ++ ++def plot(fun, start, colour): ++ pencolor(colour) + x = start +- pencolor(farbe) +- penup() +- goto(0, x) ++ jumpto(0, x) + pendown() + dot(5) +- for i in range(n): ++ for i in range(N): + x=fun(x) + goto(i+1,x) + dot(5) + + def main(): +- global n +- n = 80 +- ox=-250.0 +- oy=-150.0 +- ex= -2.0*ox / n +- ey=300.0 +- + reset() +- setworldcoordinates(-1.0,-0.1, n+1, 1.1) ++ setworldcoordinates(-1.0,-0.1, N+1, 1.1) + speed(0) + hideturtle() + coosys() + plot(f, 0.35, "blue") + plot(g, 0.35, "green") + plot(h, 0.35, "red") ++ # Now zoom in: + for s in range(100): +- setworldcoordinates(0.5*s,-0.1, n+1, 1.1) +- ++ setworldcoordinates(0.5*s,-0.1, N+1, 1.1) + return "Done!" + + if __name__ == "__main__": +Index: Demo/tkinter/matt/menu-simple.py +=================================================================== +--- Demo/tkinter/matt/menu-simple.py (.../tags/r262) (Revision 74094) ++++ Demo/tkinter/matt/menu-simple.py (.../branches/release26-maint) (Revision 74094) +@@ -48,7 +48,7 @@ + File_button.menu = Menu(File_button) + + # add an item. The first param is a menu entry type, +- # must be one of: "cascade", "checkbutton", "command", "radiobutton", "seperator" ++ # must be one of: "cascade", "checkbutton", "command", "radiobutton", "separator" + # see menu-demo-2.py for examples of use + File_button.menu.add_command(label='New...', underline=0, + command=new_file) +Index: Demo/tkinter/matt/menu-all-types-of-entries.py +=================================================================== +--- Demo/tkinter/matt/menu-all-types-of-entries.py (.../tags/r262) (Revision 74094) ++++ Demo/tkinter/matt/menu-all-types-of-entries.py (.../branches/release26-maint) (Revision 74094) +@@ -110,12 +110,12 @@ + Cascade_button.menu.choices = Menu(Cascade_button.menu) + + # ...and this is a menu that cascades from that. +- Cascade_button.menu.choices.wierdones = Menu(Cascade_button.menu.choices) ++ Cascade_button.menu.choices.weirdones = Menu(Cascade_button.menu.choices) + + # then you define the menus from the deepest level on up. +- Cascade_button.menu.choices.wierdones.add_command(label='avacado') +- Cascade_button.menu.choices.wierdones.add_command(label='belgian endive') +- Cascade_button.menu.choices.wierdones.add_command(label='beefaroni') ++ Cascade_button.menu.choices.weirdones.add_command(label='avacado') ++ Cascade_button.menu.choices.weirdones.add_command(label='belgian endive') ++ Cascade_button.menu.choices.weirdones.add_command(label='beefaroni') + + # definition of the menu one level up... + Cascade_button.menu.choices.add_command(label='Chocolate') +@@ -125,8 +125,8 @@ + Cascade_button.menu.choices.add_command(label='Rocky Road') + Cascade_button.menu.choices.add_command(label='BubbleGum') + Cascade_button.menu.choices.add_cascade( +- label='Wierd Flavors', +- menu=Cascade_button.menu.choices.wierdones) ++ label='Weird Flavors', ++ menu=Cascade_button.menu.choices.weirdones) + + # and finally, the definition for the top level + Cascade_button.menu.add_cascade(label='more choices', +Index: configure.in +=================================================================== +--- configure.in (.../tags/r262) (Revision 74094) ++++ configure.in (.../branches/release26-maint) (Revision 74094) +@@ -767,7 +767,7 @@ + then + SVNVERSION="svnversion \$(srcdir)" + else +- SVNVERSION="echo exported" ++ SVNVERSION="echo Unversioned directory" + fi + + case $MACHDEP in +@@ -1553,6 +1553,10 @@ + [Define if you want to produce an OpenStep/Rhapsody framework + (shared library plus accessory files).]) + AC_MSG_RESULT(yes) ++ if test $enable_shared = "yes" ++ then ++ AC_MSG_ERROR([Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead]) ++ fi + else + AC_MSG_RESULT(no) + fi +@@ -3145,6 +3149,44 @@ + LIBS_SAVE=$LIBS + LIBS="$LIBS $LIBM" + ++# Detect whether system arithmetic is subject to x87-style double ++# rounding issues. The result of this test has little meaning on non ++# IEEE 754 platforms. On IEEE 754, test should return 1 if rounding ++# mode is round-to-nearest and double rounding issues are present, and ++# 0 otherwise. See http://bugs.python.org/issue2937 for more info. ++AC_MSG_CHECKING(for x87-style double rounding) ++AC_CACHE_VAL(ac_cv_x87_double_rounding, [ ++AC_TRY_RUN([ ++#include ++#include ++int main() { ++ volatile double x, y, z; ++ /* 1./(1-2**-53) -> 1+2**-52 (correct), 1.0 (double rounding) */ ++ x = 0.99999999999999989; /* 1-2**-53 */ ++ y = 1./x; ++ if (y != 1.) ++ exit(0); ++ /* 1e16+2.99999 -> 1e16+2. (correct), 1e16+4. (double rounding) */ ++ x = 1e16; ++ y = 2.99999; ++ z = x + y; ++ if (z != 1e16+4.) ++ exit(0); ++ /* both tests show evidence of double rounding */ ++ exit(1); ++} ++], ++ac_cv_x87_double_rounding=no, ++ac_cv_x87_double_rounding=yes, ++ac_cv_x87_double_rounding=no)]) ++AC_MSG_RESULT($ac_cv_x87_double_rounding) ++if test "$ac_cv_x87_double_rounding" = yes ++then ++ AC_DEFINE(X87_DOUBLE_ROUNDING, 1, ++ [Define if arithmetic is subject to x87-style double rounding issue]) ++fi ++ ++ + # On FreeBSD 6.2, it appears that tanh(-0.) returns 0. instead of + # -0. on some architectures. + AC_MSG_CHECKING(whether tanh preserves the sign of zero) +@@ -3171,7 +3213,8 @@ + [Define if tanh(-0.) is -0., or if platform doesn't have signed zeros]) + fi + +-AC_CHECK_FUNCS([acosh asinh atanh copysign expm1 finite hypot isinf isnan log1p]) ++AC_CHECK_FUNCS([acosh asinh atanh copysign expm1 finite hypot log1p]) ++AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include ]]) + + LIBS=$LIBS_SAVE + +Index: Objects/complexobject.c +=================================================================== +--- Objects/complexobject.c (.../tags/r262) (Revision 74094) ++++ Objects/complexobject.c (.../branches/release26-maint) (Revision 74094) +@@ -785,7 +785,7 @@ + complex_int(PyObject *v) + { + PyErr_SetString(PyExc_TypeError, +- "can't convert complex to int; use int(abs(z))"); ++ "can't convert complex to int"); + return NULL; + } + +@@ -793,7 +793,7 @@ + complex_long(PyObject *v) + { + PyErr_SetString(PyExc_TypeError, +- "can't convert complex to long; use long(abs(z))"); ++ "can't convert complex to long"); + return NULL; + } + +@@ -801,7 +801,7 @@ + complex_float(PyObject *v) + { + PyErr_SetString(PyExc_TypeError, +- "can't convert complex to float; use abs(z)"); ++ "can't convert complex to float"); + return NULL; + } + +@@ -995,16 +995,16 @@ + } + errno = 0; + PyFPE_START_PROTECT("strtod", return 0) +- z = PyOS_ascii_strtod(s, &end) ; ++ z = PyOS_ascii_strtod(s, &end) ; + PyFPE_END_PROTECT(z) +- if (errno != 0) { +- PyOS_snprintf(buffer, sizeof(buffer), +- "float() out of range: %.150s", s); +- PyErr_SetString( +- PyExc_ValueError, +- buffer); +- return NULL; +- } ++ if (errno == ERANGE && fabs(z) >= 1.0) { ++ PyOS_snprintf(buffer, sizeof(buffer), ++ "float() out of range: %.150s", s); ++ PyErr_SetString( ++ PyExc_ValueError, ++ buffer); ++ return NULL; ++ } + s=end; + if (*s=='J' || *s=='j') { + +Index: Objects/abstract.c +=================================================================== +--- Objects/abstract.c (.../tags/r262) (Revision 74094) ++++ Objects/abstract.c (.../branches/release26-maint) (Revision 74094) +@@ -2244,7 +2244,7 @@ + + /* Iterate over seq. Result depends on the operation: + PY_ITERSEARCH_COUNT: -1 if error, else # of times obj appears in seq. +- PY_ITERSEARCH_INDEX: 0-based index of first occurence of obj in seq; ++ PY_ITERSEARCH_INDEX: 0-based index of first occurrence of obj in seq; + set ValueError and return -1 if none found; also return -1 on error. + Py_ITERSEARCH_CONTAINS: return 1 if obj in seq, else 0; -1 on error. + */ +Index: Objects/object.c +=================================================================== +--- Objects/object.c (.../tags/r262) (Revision 74094) ++++ Objects/object.c (.../branches/release26-maint) (Revision 74094) +@@ -2,6 +2,7 @@ + /* Generic object operations; and implementation of None (NoObject) */ + + #include "Python.h" ++#include "frameobject.h" + + #ifdef __cplusplus + extern "C" { +@@ -1959,7 +1960,7 @@ + none_dealloc(PyObject* ignore) + { + /* This should never get called, but we also don't want to SEGV if +- * we accidently decref None out of existance. ++ * we accidentally decref None out of existence. + */ + Py_FatalError("deallocating None"); + } +@@ -2022,28 +2023,132 @@ + _Py_ReadyTypes(void) + { + if (PyType_Ready(&PyType_Type) < 0) +- Py_FatalError("Can't initialize 'type'"); ++ Py_FatalError("Can't initialize type type"); + + if (PyType_Ready(&_PyWeakref_RefType) < 0) +- Py_FatalError("Can't initialize 'weakref'"); ++ Py_FatalError("Can't initialize weakref type"); + ++ if (PyType_Ready(&_PyWeakref_CallableProxyType) < 0) ++ Py_FatalError("Can't initialize callable weakref proxy type"); ++ ++ if (PyType_Ready(&_PyWeakref_ProxyType) < 0) ++ Py_FatalError("Can't initialize weakref proxy type"); ++ + if (PyType_Ready(&PyBool_Type) < 0) +- Py_FatalError("Can't initialize 'bool'"); ++ Py_FatalError("Can't initialize bool type"); + + if (PyType_Ready(&PyString_Type) < 0) +- Py_FatalError("Can't initialize 'str'"); ++ Py_FatalError("Can't initialize str type"); + + if (PyType_Ready(&PyByteArray_Type) < 0) +- Py_FatalError("Can't initialize 'bytes'"); ++ Py_FatalError("Can't initialize bytearray type"); + + if (PyType_Ready(&PyList_Type) < 0) +- Py_FatalError("Can't initialize 'list'"); ++ Py_FatalError("Can't initialize list type"); + + if (PyType_Ready(&PyNone_Type) < 0) +- Py_FatalError("Can't initialize type(None)"); ++ Py_FatalError("Can't initialize None type"); + + if (PyType_Ready(&PyNotImplemented_Type) < 0) +- Py_FatalError("Can't initialize type(NotImplemented)"); ++ Py_FatalError("Can't initialize NotImplemented type"); ++ ++ if (PyType_Ready(&PyTraceBack_Type) < 0) ++ Py_FatalError("Can't initialize traceback type"); ++ ++ if (PyType_Ready(&PySuper_Type) < 0) ++ Py_FatalError("Can't initialize super type"); ++ ++ if (PyType_Ready(&PyBaseObject_Type) < 0) ++ Py_FatalError("Can't initialize object type"); ++ ++ if (PyType_Ready(&PyRange_Type) < 0) ++ Py_FatalError("Can't initialize xrange type"); ++ ++ if (PyType_Ready(&PyDict_Type) < 0) ++ Py_FatalError("Can't initialize dict type"); ++ ++ if (PyType_Ready(&PySet_Type) < 0) ++ Py_FatalError("Can't initialize set type"); ++ ++ if (PyType_Ready(&PyUnicode_Type) < 0) ++ Py_FatalError("Can't initialize unicode type"); ++ ++ if (PyType_Ready(&PySlice_Type) < 0) ++ Py_FatalError("Can't initialize slice type"); ++ ++ if (PyType_Ready(&PyStaticMethod_Type) < 0) ++ Py_FatalError("Can't initialize static method type"); ++ ++#ifndef WITHOUT_COMPLEX ++ if (PyType_Ready(&PyComplex_Type) < 0) ++ Py_FatalError("Can't initialize complex type"); ++#endif ++ ++ if (PyType_Ready(&PyFloat_Type) < 0) ++ Py_FatalError("Can't initialize float type"); ++ ++ if (PyType_Ready(&PyBuffer_Type) < 0) ++ Py_FatalError("Can't initialize buffer type"); ++ ++ if (PyType_Ready(&PyLong_Type) < 0) ++ Py_FatalError("Can't initialize long type"); ++ ++ if (PyType_Ready(&PyInt_Type) < 0) ++ Py_FatalError("Can't initialize int type"); ++ ++ if (PyType_Ready(&PyFrozenSet_Type) < 0) ++ Py_FatalError("Can't initialize frozenset type"); ++ ++ if (PyType_Ready(&PyProperty_Type) < 0) ++ Py_FatalError("Can't initialize property type"); ++ ++ if (PyType_Ready(&PyTuple_Type) < 0) ++ Py_FatalError("Can't initialize tuple type"); ++ ++ if (PyType_Ready(&PyEnum_Type) < 0) ++ Py_FatalError("Can't initialize enumerate type"); ++ ++ if (PyType_Ready(&PyReversed_Type) < 0) ++ Py_FatalError("Can't initialize reversed type"); ++ ++ if (PyType_Ready(&PyCode_Type) < 0) ++ Py_FatalError("Can't initialize code type"); ++ ++ if (PyType_Ready(&PyFrame_Type) < 0) ++ Py_FatalError("Can't initialize frame type"); ++ ++ if (PyType_Ready(&PyCFunction_Type) < 0) ++ Py_FatalError("Can't initialize builtin function type"); ++ ++ if (PyType_Ready(&PyMethod_Type) < 0) ++ Py_FatalError("Can't initialize method type"); ++ ++ if (PyType_Ready(&PyFunction_Type) < 0) ++ Py_FatalError("Can't initialize function type"); ++ ++ if (PyType_Ready(&PyClass_Type) < 0) ++ Py_FatalError("Can't initialize class type"); ++ ++ if (PyType_Ready(&PyDictProxy_Type) < 0) ++ Py_FatalError("Can't initialize dict proxy type"); ++ ++ if (PyType_Ready(&PyGen_Type) < 0) ++ Py_FatalError("Can't initialize generator type"); ++ ++ if (PyType_Ready(&PyGetSetDescr_Type) < 0) ++ Py_FatalError("Can't initialize get-set descriptor type"); ++ ++ if (PyType_Ready(&PyWrapperDescr_Type) < 0) ++ Py_FatalError("Can't initialize wrapper type"); ++ ++ if (PyType_Ready(&PyInstance_Type) < 0) ++ Py_FatalError("Can't initialize instance type"); ++ ++ if (PyType_Ready(&PyEllipsis_Type) < 0) ++ Py_FatalError("Can't initialize ellipsis type"); ++ ++ if (PyType_Ready(&PyMemberDescr_Type) < 0) ++ Py_FatalError("Can't initialize member descriptor type"); + } + + +Index: Objects/methodobject.c +=================================================================== +--- Objects/methodobject.c (.../tags/r262) (Revision 74094) ++++ Objects/methodobject.c (.../branches/release26-maint) (Revision 74094) +@@ -230,12 +230,9 @@ + PyObject *res; + int eq; + +- if ((op != Py_EQ && op != Py_NE) || +- !PyCFunction_Check(self) || +- !PyCFunction_Check(other)) +- { +- /* Py3K warning if types are not equal and comparison isn't == or != */ +- if (PyErr_WarnPy3k("builtin_function_or_method inequality " ++ if (op != Py_EQ && op != Py_NE) { ++ /* Py3K warning if comparison isn't == or !=. */ ++ if (PyErr_WarnPy3k("builtin_function_or_method order " + "comparisons not supported in 3.x", 1) < 0) { + return NULL; + } +@@ -243,6 +240,10 @@ + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; + } ++ else if (!PyCFunction_Check(self) || !PyCFunction_Check(other)) { ++ Py_INCREF(Py_NotImplemented); ++ return Py_NotImplemented; ++ } + a = (PyCFunctionObject *)self; + b = (PyCFunctionObject *)other; + eq = a->m_self == b->m_self; +Index: Objects/typeobject.c +=================================================================== +--- Objects/typeobject.c (.../tags/r262) (Revision 74094) ++++ Objects/typeobject.c (.../branches/release26-maint) (Revision 74094) +@@ -928,6 +928,9 @@ + assert(base); + } + ++ /* Extract the type again; tp_del may have changed it */ ++ type = Py_TYPE(self); ++ + /* Call the base tp_dealloc() */ + assert(basedealloc); + basedealloc(self); +@@ -1009,6 +1012,9 @@ + } + } + ++ /* Extract the type again; tp_del may have changed it */ ++ type = Py_TYPE(self); ++ + /* Call the base tp_dealloc(); first retrack self if + * basedealloc knows about gc. + */ +Index: Objects/unicodeobject.c +=================================================================== +--- Objects/unicodeobject.c (.../tags/r262) (Revision 74094) ++++ Objects/unicodeobject.c (.../branches/release26-maint) (Revision 74094) +@@ -616,15 +616,25 @@ + count = vargs; + #endif + #endif +- /* step 1: count the number of %S/%R format specifications +- * (we call PyObject_Str()/PyObject_Repr() for these objects +- * once during step 3 and put the result in an array) */ ++ /* step 1: count the number of %S/%R/%s format specifications ++ * (we call PyObject_Str()/PyObject_Repr()/PyUnicode_DecodeUTF8() for these ++ * objects once during step 3 and put the result in an array) */ + for (f = format; *f; f++) { +- if (*f == '%' && (*(f+1)=='S' || *(f+1)=='R')) +- ++callcount; ++ if (*f == '%') { ++ if (*(f+1)=='%') ++ continue; ++ if (*(f+1)=='S' || *(f+1)=='R') ++ ++callcount; ++ while (isdigit((unsigned)*f)) ++ width = (width*10) + *f++ - '0'; ++ while (*++f && *f != '%' && !isalpha((unsigned)*f)) ++ ; ++ if (*f == 's') ++ ++callcount; ++ } + } + /* step 2: allocate memory for the results of +- * PyObject_Str()/PyObject_Repr() calls */ ++ * PyObject_Str()/PyObject_Repr()/PyUnicode_DecodeUTF8() calls */ + if (callcount) { + callresults = PyObject_Malloc(sizeof(PyObject *)*callcount); + if (!callresults) { +@@ -673,35 +683,13 @@ + case 's': + { + /* UTF-8 */ +- unsigned char*s; +- s = va_arg(count, unsigned char*); +- while (*s) { +- if (*s < 128) { +- n++; s++; +- } else if (*s < 0xc0) { +- /* invalid UTF-8 */ +- n++; s++; +- } else if (*s < 0xc0) { +- n++; +- s++; if(!*s)break; +- s++; +- } else if (*s < 0xe0) { +- n++; +- s++; if(!*s)break; +- s++; if(!*s)break; +- s++; +- } else { +-#ifdef Py_UNICODE_WIDE +- n++; +-#else +- n+=2; +-#endif +- s++; if(!*s)break; +- s++; if(!*s)break; +- s++; if(!*s)break; +- s++; +- } +- } ++ unsigned char *s = va_arg(count, unsigned char*); ++ PyObject *str = PyUnicode_DecodeUTF8(s, strlen(s), "replace"); ++ if (!str) ++ goto fail; ++ n += PyUnicode_GET_SIZE(str); ++ /* Remember the str and switch to the next slot */ ++ *callresult++ = str; + break; + } + case 'U': +@@ -857,19 +845,15 @@ + break; + case 's': + { +- /* Parameter must be UTF-8 encoded. +- In case of encoding errors, use +- the replacement character. */ +- PyObject *u; +- p = va_arg(vargs, char*); +- u = PyUnicode_DecodeUTF8(p, strlen(p), +- "replace"); +- if (!u) +- goto fail; +- Py_UNICODE_COPY(s, PyUnicode_AS_UNICODE(u), +- PyUnicode_GET_SIZE(u)); +- s += PyUnicode_GET_SIZE(u); +- Py_DECREF(u); ++ /* unused, since we already have the result */ ++ (void) va_arg(vargs, char *); ++ Py_UNICODE_COPY(s, PyUnicode_AS_UNICODE(*callresult), ++ PyUnicode_GET_SIZE(*callresult)); ++ s += PyUnicode_GET_SIZE(*callresult); ++ /* We're done with the unicode()/repr() => forget it */ ++ Py_DECREF(*callresult); ++ /* switch to next unicode()/repr() result */ ++ ++callresult; + break; + } + case 'U': +@@ -1704,7 +1688,7 @@ + charsleft = (charsleft << 16) | ch; + /* out, charsleft, bitsleft = */ ENCODE(out, charsleft, bitsleft); + +- /* If the next character is special then we dont' need to terminate ++ /* If the next character is special then we don't need to terminate + the shift sequence. If the next character is not a BASE64 character + or '-' then the shift sequence will be terminated implicitly and we + don't have to insert a '-'. */ +Index: Objects/listsort.txt +=================================================================== +--- Objects/listsort.txt (.../tags/r262) (Revision 74094) ++++ Objects/listsort.txt (.../branches/release26-maint) (Revision 74094) +@@ -309,7 +309,7 @@ + A:10000 B:20000 C:10000 + + we dare not merge A with C first, because if A, B and C happen to contain +-a common element, it would get out of order wrt its occurence(s) in B. The ++a common element, it would get out of order wrt its occurrence(s) in B. The + merging must be done as (A+B)+C or A+(B+C) instead. + + So merging is always done on two consecutive runs at a time, and in-place, +Index: Objects/descrobject.c +=================================================================== +--- Objects/descrobject.c (.../tags/r262) (Revision 74094) ++++ Objects/descrobject.c (.../branches/release26-maint) (Revision 74094) +@@ -456,7 +456,7 @@ + 0, /* tp_descr_set */ + }; + +-static PyTypeObject PyMemberDescr_Type = { ++PyTypeObject PyMemberDescr_Type = { + PyVarObject_HEAD_INIT(&PyType_Type, 0) + "member_descriptor", + sizeof(PyMemberDescrObject), +@@ -493,7 +493,7 @@ + (descrsetfunc)member_set, /* tp_descr_set */ + }; + +-static PyTypeObject PyGetSetDescr_Type = { ++PyTypeObject PyGetSetDescr_Type = { + PyVarObject_HEAD_INIT(&PyType_Type, 0) + "getset_descriptor", + sizeof(PyGetSetDescrObject), +@@ -819,7 +819,7 @@ + return PyObject_RichCompare(v->dict, w, op); + } + +-static PyTypeObject proxytype = { ++PyTypeObject PyDictProxy_Type = { + PyVarObject_HEAD_INIT(&PyType_Type, 0) + "dictproxy", /* tp_name */ + sizeof(proxyobject), /* tp_basicsize */ +@@ -862,7 +862,7 @@ + { + proxyobject *pp; + +- pp = PyObject_GC_New(proxyobject, &proxytype); ++ pp = PyObject_GC_New(proxyobject, &PyDictProxy_Type); + if (pp != NULL) { + Py_INCREF(dict); + pp->dict = dict; +@@ -1233,25 +1233,19 @@ + } + if (doc == NULL || doc == Py_None) { + Py_XDECREF(doc); +- doc = pold->prop_doc ? pold->prop_doc : Py_None; ++ if (pold->getter_doc && get != Py_None) { ++ /* make _init use __doc__ from getter */ ++ doc = Py_None; ++ } ++ else { ++ doc = pold->prop_doc ? pold->prop_doc : Py_None; ++ } + } +- ++ + new = PyObject_CallFunction(type, "OOOO", get, set, del, doc); + Py_DECREF(type); + if (new == NULL) + return NULL; +- pnew = (propertyobject *)new; +- +- if (pold->getter_doc && get != Py_None) { +- PyObject *get_doc = PyObject_GetAttrString(get, "__doc__"); +- if (get_doc != NULL) { +- Py_XDECREF(pnew->prop_doc); +- pnew->prop_doc = get_doc; /* get_doc already INCREF'd by GetAttr */ +- pnew->getter_doc = 1; +- } else { +- PyErr_Clear(); +- } +- } + return new; + } + +@@ -1288,8 +1282,21 @@ + if ((doc == NULL || doc == Py_None) && get != NULL) { + PyObject *get_doc = PyObject_GetAttrString(get, "__doc__"); + if (get_doc != NULL) { +- Py_XDECREF(prop->prop_doc); +- prop->prop_doc = get_doc; /* get_doc already INCREF'd by GetAttr */ ++ /* get_doc already INCREF'd by GetAttr */ ++ if (Py_TYPE(self)==&PyProperty_Type) { ++ Py_XDECREF(prop->prop_doc); ++ prop->prop_doc = get_doc; ++ } else { ++ /* Put __doc__ in dict of the subclass instance instead, ++ otherwise it gets shadowed by class's __doc__. */ ++ if (PyObject_SetAttrString(self, "__doc__", get_doc) != 0) ++ { ++ /* DECREF for props handled by _dealloc */ ++ Py_DECREF(get_doc); ++ return -1; ++ } ++ Py_DECREF(get_doc); ++ } + prop->getter_doc = 1; + } else { + PyErr_Clear(); +Index: Objects/unicodectype.c +=================================================================== +--- Objects/unicodectype.c (.../tags/r262) (Revision 74094) ++++ Objects/unicodectype.c (.../branches/release26-maint) (Revision 74094) +@@ -76,13 +76,8 @@ + Py_UNICODE _PyUnicode_ToTitlecase(register Py_UNICODE ch) + { + const _PyUnicode_TypeRecord *ctype = gettyperecord(ch); +- int delta; ++ int delta = ctype->title; + +- if (ctype->title) +- delta = ctype->title; +- else +- delta = ctype->upper; +- + if (ctype->flags & NODELTA_MASK) + return delta; + +Index: Objects/unicodetype_db.h +=================================================================== +--- Objects/unicodetype_db.h (.../tags/r262) (Revision 74094) ++++ Objects/unicodetype_db.h (.../branches/release26-maint) (Revision 74094) +@@ -118,7 +118,7 @@ + {0, 0, 0, 0, 7, 4}, + {0, 0, 0, 0, 8, 4}, + {0, 0, 0, 0, 9, 4}, +- {42877, 0, 42877, 0, 0, 265}, ++ {42877, 7545, 42877, 0, 0, 265}, + {3814, 0, 3814, 0, 0, 9}, + {65477, 0, 65477, 0, 0, 9}, + {0, 57921, 0, 0, 0, 129}, +@@ -159,7 +159,7 @@ + {0, 54787, 0, 0, 0, 129}, + {0, 54753, 0, 0, 0, 129}, + {58272, 0, 58272, 0, 0, 9}, +- {0, 7545, 0, 0, 0, 385}, ++ {42877, 7545, 42877, 0, 0, 385}, + {0, 40, 0, 0, 0, 129}, + {65496, 0, 65496, 0, 0, 9}, + }; +Index: Objects/stringlib/string_format.h +=================================================================== +--- Objects/stringlib/string_format.h (.../tags/r262) (Revision 74094) ++++ Objects/stringlib/string_format.h (.../branches/release26-maint) (Revision 74094) +@@ -329,8 +329,9 @@ + *name_idx = get_integer(name); + break; + default: +- /* interal error, can't get here */ +- assert(0); ++ /* Invalid character follows ']' */ ++ PyErr_SetString(PyExc_ValueError, "Only '.' or '[' may " ++ "follow ']' in format field specifier"); + return 0; + } + +Index: Objects/frameobject.c +=================================================================== +--- Objects/frameobject.c (.../tags/r262) (Revision 74094) ++++ Objects/frameobject.c (.../branches/release26-maint) (Revision 74094) +@@ -70,7 +70,7 @@ + int new_iblock = 0; /* The new value of f_iblock */ + unsigned char *code = NULL; /* The bytecode for the frame... */ + Py_ssize_t code_len = 0; /* ...and its length */ +- char *lnotab = NULL; /* Iterating over co_lnotab */ ++ unsigned char *lnotab = NULL; /* Iterating over co_lnotab */ + Py_ssize_t lnotab_len = 0; /* (ditto) */ + int offset = 0; /* (ditto) */ + int line = 0; /* (ditto) */ +@@ -86,6 +86,7 @@ + int in_finally[CO_MAXBLOCKS]; /* (ditto) */ + int blockstack_top = 0; /* (ditto) */ + unsigned char setup_op = 0; /* (ditto) */ ++ char *tmp; + + /* f_lineno must be an integer. */ + if (!PyInt_Check(p_new_lineno)) { +@@ -114,7 +115,9 @@ + + /* Find the bytecode offset for the start of the given line, or the + * first code-owning line after it. */ +- PyString_AsStringAndSize(f->f_code->co_lnotab, &lnotab, &lnotab_len); ++ PyString_AsStringAndSize(f->f_code->co_lnotab, ++ &tmp, &lnotab_len); ++ lnotab = (unsigned char *) tmp; + addr = 0; + line = f->f_code->co_firstlineno; + new_lasti = -1; +@@ -574,14 +577,6 @@ + builtin_object = PyString_InternFromString("__builtins__"); + if (builtin_object == NULL) + return 0; +- /* +- Traceback objects are not created the normal way (through calling the +- type), so PyType_Ready has to be called here. +- */ +- if (PyType_Ready(&PyTraceBack_Type)) { +- Py_DECREF(builtin_object); +- return 0; +- } + return 1; + } + +Index: Objects/sliceobject.c +=================================================================== +--- Objects/sliceobject.c (.../tags/r262) (Revision 74094) ++++ Objects/sliceobject.c (.../branches/release26-maint) (Revision 74094) +@@ -22,7 +22,7 @@ + return PyString_FromString("Ellipsis"); + } + +-static PyTypeObject PyEllipsis_Type = { ++PyTypeObject PyEllipsis_Type = { + PyVarObject_HEAD_INIT(&PyType_Type, 0) + "ellipsis", /* tp_name */ + 0, /* tp_basicsize */ +Index: Objects/floatobject.c +=================================================================== +--- Objects/floatobject.c (.../tags/r262) (Revision 74094) ++++ Objects/floatobject.c (.../branches/release26-maint) (Revision 74094) +@@ -1263,6 +1263,20 @@ + >>> 3.14159.hex()\n\ + '0x1.921f9f01b866ep+1'"); + ++/* Case-insensitive string match used for nan and inf detection. t should be ++ lower-case and null-terminated. Return a nonzero result if the first ++ strlen(t) characters of s match t and 0 otherwise. */ ++ ++static int ++case_insensitive_match(const char *s, const char *t) ++{ ++ while(*t && tolower(*s) == *t) { ++ s++; ++ t++; ++ } ++ return *t ? 0 : 1; ++} ++ + /* Convert a hexadecimal string to a float. */ + + static PyObject * +@@ -1329,7 +1343,7 @@ + ********************/ + + /* leading whitespace and optional sign */ +- while (isspace(*s)) ++ while (*s && isspace(Py_CHARMASK(*s))) + s++; + if (*s == '-') { + s++; +@@ -1339,13 +1353,20 @@ + s++; + + /* infinities and nans */ +- if (PyOS_strnicmp(s, "nan", 4) == 0) { +- x = Py_NAN; ++ if (*s == 'i' || *s == 'I') { ++ if (!case_insensitive_match(s+1, "nf")) ++ goto parse_error; ++ s += 3; ++ x = Py_HUGE_VAL; ++ if (case_insensitive_match(s, "inity")) ++ s += 5; + goto finished; + } +- if (PyOS_strnicmp(s, "inf", 4) == 0 || +- PyOS_strnicmp(s, "infinity", 9) == 0) { +- x = sign*Py_HUGE_VAL; ++ if (*s == 'n' || *s == 'N') { ++ if (!case_insensitive_match(s+1, "an")) ++ goto parse_error; ++ s += 3; ++ x = Py_NAN; + goto finished; + } + +@@ -1398,12 +1419,6 @@ + else + exp = 0; + +- /* optional trailing whitespace leading to the end of the string */ +- while (isspace(*s)) +- s++; +- if (s != s_end) +- goto parse_error; +- + /* for 0 <= j < ndigits, HEX_DIGIT(j) gives the jth most significant digit */ + #define HEX_DIGIT(j) hex_from_char(*((j) < fdigits ? \ + coeff_end-(j) : \ +@@ -1417,7 +1432,7 @@ + while (ndigits > 0 && HEX_DIGIT(ndigits-1) == 0) + ndigits--; + if (ndigits == 0 || exp < LONG_MIN/2) { +- x = sign * 0.0; ++ x = 0.0; + goto finished; + } + if (exp > LONG_MAX/2) +@@ -1433,7 +1448,7 @@ + + /* catch almost all nonextreme cases of overflow and underflow here */ + if (top_exp < DBL_MIN_EXP - DBL_MANT_DIG) { +- x = sign * 0.0; ++ x = 0.0; + goto finished; + } + if (top_exp > DBL_MAX_EXP) +@@ -1448,7 +1463,7 @@ + /* no rounding required */ + for (i = ndigits-1; i >= 0; i--) + x = 16.0*x + HEX_DIGIT(i); +- x = sign * ldexp(x, (int)(exp)); ++ x = ldexp(x, (int)(exp)); + goto finished; + } + /* rounding required. key_digit is the index of the hex digit +@@ -1482,10 +1497,15 @@ + goto overflow_error; + } + } +- x = sign * ldexp(x, (int)(exp+4*key_digit)); ++ x = ldexp(x, (int)(exp+4*key_digit)); + + finished: +- result_as_float = Py_BuildValue("(d)", x); ++ /* optional trailing whitespace leading to the end of the string */ ++ while (*s && isspace(Py_CHARMASK(*s))) ++ s++; ++ if (s != s_end) ++ goto parse_error; ++ result_as_float = Py_BuildValue("(d)", sign * x); + if (result_as_float == NULL) + return NULL; + result = PyObject_CallObject(cls, result_as_float); +@@ -1630,7 +1650,9 @@ + return float_subtype_new(type, args, kwds); /* Wimp out */ + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:float", kwlist, &x)) + return NULL; +- if (PyString_Check(x)) ++ /* If it's a string, but not a string subclass, use ++ PyFloat_FromString. */ ++ if (PyString_CheckExact(x)) + return PyFloat_FromString(x, NULL); + return PyNumber_Float(x); + } +Index: Misc/HISTORY +=================================================================== +--- Misc/HISTORY (.../tags/r262) (Revision 74094) ++++ Misc/HISTORY (.../branches/release26-maint) (Revision 74094) +@@ -9862,7 +9862,7 @@ + Also (quite separately, but strangely related to the philosophical + issue above) fix abspath() so that if win32api exists, it doesn't fail + when the path doesn't actually exist -- if GetFullPathName() fails, +- fall back on the old strategy (join with getcwd() if neccessary, and ++ fall back on the old strategy (join with getcwd() if necessary, and + then use normpath()). + + * configure.in, configure, config.h.in, acconfig.h: +Index: Misc/AIX-NOTES +=================================================================== +--- Misc/AIX-NOTES (.../tags/r262) (Revision 74094) ++++ Misc/AIX-NOTES (.../branches/release26-maint) (Revision 74094) +@@ -22,7 +22,7 @@ + (2) Stefan Esser (se@MI.Uni-Koeln.DE), in work done to compile Python + 1.0.0 on AIX 3.2.4, reports that AIX compilers don't like the LANG + environment varaiable set to European locales. This makes the compiler +- generate floating point constants using "," as the decimal seperator, ++ generate floating point constants using "," as the decimal separator, + which the assembler doesn't understand (or perhaps it is the other way + around, with the assembler expecting, but not getting "," in float + numbers). "LANG=C; export LANG" solves the problem, as does +Index: Misc/NEWS +=================================================================== +--- Misc/NEWS (.../tags/r262) (Revision 74094) ++++ Misc/NEWS (.../branches/release26-maint) (Revision 74094) +@@ -4,12 +4,170 @@ + + (editors: check NEWS.help for information about editing NEWS using ReST.) + +-What's New in Python 2.6.2 ++What's New in Python 2.6.3 + ========================== + +-*Release date: 14-Apr-2009* ++*Release date: XX-XX-XXX* + ++Core and Builtins ++----------------- + ++- Issue #6070: On posix platforms import no longer copies the execute bit ++ from the .py file to the .pyc file if it is set. ++ ++- Issue #4547: When debugging a very large function, it was not always ++ possible to update the lineno attribute of the current frame. ++ ++- Issue #4618: When unicode arguments are passed to print(), the default ++ separator and end should be unicode also. ++ ++- Issue #6119: Fixed a incorrect Py3k warning about order comparisons of builtin ++ functions and methods. ++ ++- Issue #5330: C functions called with keyword arguments were not reported by ++ the various profiling modules (profile, cProfile). Patch by Hagen F�rstenau. ++ ++- Issue #6089: str.format can raise SystemError with certain invalid ++ field specifiers. ++ ++- Issue #5994: the marshal module now has docstrings. ++ ++- Issue #5981: Fix two minor inf/nan issues in float.fromhex: (1) inf ++ and nan strings with trailing whitespace were incorrectly rejected ++ and (2) the interpretation of fromhex('-nan') didn't match that of ++ float('-nan'). ++ ++- Issue #5890: in subclasses of 'property' the __doc__ attribute was ++ shadowed by classtype's, even if it was None. property now ++ inserts the __doc__ into the subclass instance __dict__. ++ ++- Issue #5724: (See also issue #4575.) Fix Py_IS_INFINITY macro to ++ work correctly on x87 FPUs: it now forces its argument to double ++ before testing for infinity. ++ ++- Issue #4971: Fix titlecase for characters that are their own ++ titlecase, but not their own uppercase. ++ ++- Issue #5829: complex('1e-500') no longer raises an exception ++ ++- Issue #5787: object.__getattribute__(some_type, "__bases__") segfaulted on ++ some builtin types. ++ ++- Issue #5283: Setting __class__ in __del__ caused a segfault. ++ ++- Issue #5759: float() didn't call __float__ on str subclasses. ++ ++- Issue #5108: Handle %s like %S and %R in PyUnicode_FromFormatV(): Call ++ PyUnicode_DecodeUTF8() once, remember the result and output it in a second ++ step. This avoids problems with counting UTF-8 bytes that ignores the effect ++ of using the replace error handler in PyUnicode_DecodeUTF8(). ++ ++Library ++------- ++ ++- Issue #6415: Fixed warnings.warn sagfault on bad formatted string. ++ ++- Issue #6344: Fixed a crash of mmap.read() when passed a negative argument. ++ ++- Issue #5230: pydoc would report no documentation found if a module generated ++ a 'not found' import error when loaded; it now reports the import errors. ++ Thanks to Lucas Prado Melo for initial fix and collaboration on the tests. ++ ++- Issue #6274: Fixed possible file descriptors leak in subprocess.py ++ ++- Issue #6271: mmap tried to close invalid file handle (-1) when annonymous. ++ (On Unix) ++ ++- Issue #6258: Support AMD64 in bdist_msi. ++ ++- Issue #5262: Fixed bug in next rollover time computation in ++ TimedRotatingFileHandler. ++ ++- Issue #6121: pydoc now ignores leading and trailing spaces in the ++ argument to the 'help' function. ++ ++- Issue #6050: Don't fail extracting a directory from a zipfile if ++ the directory already exists. ++ ++- collections.namedtuple() was not working with the following field ++ names: cls, self, tuple, itemgetter, and property. ++ ++- Issue #1309352: fcntl now converts its third arguments to a C `long` rather ++ than an int, which makes some operations possible under 64-bit Linux (e.g. ++ DN_MULTISHOT with F_NOTIFY). ++ ++- Issue #1983: Fix functions taking or returning a process identifier to use ++ the dedicated C type ``pid_t`` instead of a C ``int``. Some platforms have ++ a process identifier type wider than the standard C integer type. ++ ++- Issue #4066: smtplib.SMTP_SSL._get_socket now correctly returns the socket. ++ Patch by Farhan Ahmad, test by Marcin Bachry. ++ ++- Issue #1655: Make imaplib IPv6-capable. Patch by Derek Morr. ++ ++- Issue #1664: Make nntplib IPv6-capable. Patch by Derek Morr. ++ ++- Issue #5971: StreamHandler.handleError now swallows IOErrors which occur when ++ trying to print a traceback. ++ ++- Issue 5955: aifc's close method did not close the file it wrapped, ++ now it does. This also means getfp method now returns the real fp. ++ ++- Issue #4875: On win32, ctypes.util.find_library does no longer ++ return directories. ++ ++- Issue #5692: In :class:`zipfile.Zipfile`, fix wrong path calculation when ++ extracting a file to the root directory. ++ ++- Issue #2245: aifc now skips chunk types it doesn't recognize, per spec. ++ ++- Issue #4305: ctypes should now build again on mipsel-linux-gnu ++ ++- Issue #5853: calling a function of the mimetypes module from several threads ++ at once could hit the recursion limit if the mimetypes database hadn't been ++ initialized before. ++ ++- Issue #5041: ctypes does now allow pickling wide character. ++ ++- Issue #5768: Fixed bug in Unicode output logic and test case for same. ++ ++- Issue #1161031: fix readwrite select flag handling: POLLPRI now ++ results in a handle_expt_event call, not handle_read_event, and POLLERR ++ and POLLNVAL now call handle_close, not handle_expt_event. Also, ++ dispatcher now has an 'ignore_log_types' attribute for suppressing ++ log messages, which is set to 'warning' by default. ++ ++- Issue #5828 (Invalid behavior of unicode.lower): Fixed bogus logic in ++ makeunicodedata.py and regenerated the Unicode database (This fixes ++ u'\u1d79'.lower() == '\x00'). ++ ++- Issue #1202: zipfile module would cause a DeprecationWarning when storing ++ files with a CRC32 > 2**31-1. ++ ++Extension Modules ++----------------- ++ ++- Issue #4873: Fix resource leaks in error cases of pwd and grp. ++ ++Build ++----- ++ ++- Issue 5390: Add uninstall icon independent of whether file ++ extensions are installed. ++ ++- Issue #6094: Build correctly with Subversion 1.7. ++ ++- Issue #5726: Make Modules/ld_so_aix return the actual exit code of the ++ linker, rather than always exit successfully. Patch by Floris Bruynooghe. ++ ++Tests ++----- ++ ++- Issue #5837: Certain sequences of calls to set() and unset() for ++ support.EnvironmentVarGuard objects restored the environment variables ++ incorrectly on __exit__. ++ ++ + What's New in Python 2.6.2 rc 1 + =============================== + +@@ -109,10 +267,49 @@ + Library + ------- + ++- Issue #2622: Fixed an ImportError when importing email.messsage from a ++ standalone application built with py2exe or py2app. ++ ++- Issue #6455: Fixed test_build_ext under win32. ++ ++- Issue #6403: Fixed package path usage in build_ext. ++ ++- Issue #6287: Added the license field in Distutils documentation. ++ ++- Issue #6263: Fixed syntax error in distutils.cygwincompiler. ++ ++- Issue #5201: distutils.sysconfig.parse_makefile() now understands `$$` ++ in Makefiles. This prevents compile errors when using syntax like: ++ `LDFLAGS='-rpath=\$$LIB:/some/other/path'`. Patch by Floris Bruynooghe. ++ ++- Issue #6062: In distutils, fixed the package option of build_ext. Feedback ++ and tests on pywin32 by Tim Golden. ++ ++- Issue #1309567: Fix linecache behavior of stripping subdirectories when ++ looking for files given by a relative filename. ++ ++- Issue #6046: Fixed the library extension when distutils build_ext is used ++ inplace. Initial patch by Roumen Petrov. ++ ++- Issue #6022: a test file was created in the current working directory by ++ test_get_outputs in Distutils. ++ ++- Issue #5977: distutils build_ext.get_outputs was not taking into account the ++ inplace option. Initial patch by kxroberto. ++ ++- Issue #5984: distutils.command.build_ext.check_extensions_list checks were broken ++ for old-style extensions. ++ ++- Issue #5854: Updated __all__ to include some missing names and remove some ++ names which should not be exported. ++ ++- Issue #5810: Fixed Distutils test_build_scripts so it uses ++ sysconfig.get_config_vars. ++ + - Issue #5741: don't disallow "%%" (which is an escape for "%") when setting + a value in SafeConfigParser. + +-- Issue #5731: Distutils bdist_wininst no longer worked on non-Windows ++- Issue #5731: Distutils bdist_wininst no longer worked on non-Windows + platforms. Initial patch by Paul Moore. + + - Issue #1491431: Fixed distutils.filelist.glob_to_re for edge cases. +@@ -135,10 +332,6 @@ + + - Actually make the SimpleXMLRPCServer CGI handler work. + +-- Issue #2522: locale.format now checks its first argument to ensure it has +- been passed only one pattern, avoiding mysterious errors where it appeared +- that it was failing to do localization. +- + - Issue 2625: added missing iteritems() call to the for loop in + mailbox.MH.get_message(). + +@@ -161,7 +354,7 @@ + - Issue #5261: Patch multiprocessing's semaphore.c to support context + manager use: "with multiprocessing.Lock()" works now. + +-- Issue #5177: Multiprocessing's SocketListener class now uses ++- Issue #5177: Multiprocessing's SocketListener class now uses + socket.SO_REUSEADDR on all connections so that the user no longer needs + to wait 120 seconds for the socket to expire. + +@@ -433,6 +626,9 @@ + Build + ----- + ++- Issue 5809: Specifying both --enable-framework and --enable-shared is ++ an error. Configure now explicity tells you about this. ++ + - Link the shared python library with $(MODLIBS). + + - Issue #5134: Silence compiler warnings when compiling sqlite with VC++. +@@ -459,7 +655,7 @@ + - Issue #5635: Fix running test_sys with tracing enabled. + + - regrtest no longer treats ImportError as equivalent to SkipTest. Imports +- that should cause a test to be skipped are now done using import_module ++ that should cause a test to be skipped are now done using import_module + from test support, which does the conversion. + + - Issue #5083: New 'gui' resource for regrtest. +@@ -909,7 +1105,7 @@ + - Issue #3575: Incremental decoder's decode function now takes bytearray + by using 's*' instead of 't#'. + +-- Issue #2222: Fixed reference leak when occured os.rename() ++- Issue #2222: Fixed reference leak when occurred os.rename() + fails unicode conversion on 2nd parameter. (windows only) + + - Issue 2464. urllib2 now supports a malformation in the URL received +Index: Misc/ACKS +=================================================================== +--- Misc/ACKS (.../tags/r262) (Revision 74094) ++++ Misc/ACKS (.../branches/release26-maint) (Revision 74094) +@@ -12,6 +12,7 @@ + + David Abrahams + Jim Ahlstrom ++Farhan Ahmad + Jyrki Alakuijala + Billy G. Allie + Kevin Altis +@@ -29,6 +30,7 @@ + Donovan Baarda + Attila Babo + Alfonso Baciero ++Marcin Bachry + Dwayne Bailey + Stig Bakken + Greg Ball +@@ -166,6 +168,7 @@ + Raghuram Devarakonda + Toby Dickenson + Mark Dickinson ++Daniel Diniz + Yves Dionne + Daniel Dittmar + Jaromir Dolecek +@@ -362,6 +365,7 @@ + Peter van Kampen + Jacob Kaplan-Moss + Lou Kates ++Hiroaki Kawai + Sebastien Keim + Robert Kern + Randall Kern +@@ -460,6 +464,7 @@ + Craig McPheeters + Lambert Meertens + Bill van Melle ++Lucas Prado Melo + Luke Mewburn + Mike Meyer + Steven Miale +@@ -475,6 +480,7 @@ + The Dragon De Monsyne + Skip Montanaro + Paul Moore ++Derek Morr + James A Morrison + Sjoerd Mullender + Sape Mullender +@@ -527,6 +533,7 @@ + Samuele Pedroni + Marcel van der Peijl + Steven Pemberton ++Santiago Peresón + Mark Perrego + Trevor Perrin + Tim Peters +@@ -678,6 +685,7 @@ + Kalle Svensson + Paul Swartz + Thenault Sylvain ++Arfrever Frehtes Taifersar Arahesis + Geoff Talvola + William Tanksley + Christian Tanzer +Index: Misc/cheatsheet +=================================================================== +--- Misc/cheatsheet (.../tags/r262) (Revision 74094) ++++ Misc/cheatsheet (.../branches/release26-maint) (Revision 74094) +@@ -481,7 +481,7 @@ + s.isupper() return True if all characters in s are uppercase, False (6) + otherwise. + s.join(seq) return a concatenation of the strings in the sequence +- seq, seperated by 's's. ++ seq, separated by 's's. + s.ljust(width) return s left justified in a string of length width. (1), + (8) + s.lower() return a copy of s converted to lowercase. +@@ -1556,10 +1556,10 @@ + asctime( + timeTuple), + strftime( +-format, return a formated string representing time. ++format, return a formatted string representing time. + timeTuple) + mktime(tuple) inverse of localtime(). Return a float. +-strptime( parse a formated string representing time, return tuple as in ++strptime( parse a formatted string representing time, return tuple as in + string[, gmtime(). + format]) + sleep(secs) Suspend execution for seconds. can be a float. +Index: Tools/unicode/makeunicodedata.py +=================================================================== +--- Tools/unicode/makeunicodedata.py (.../tags/r262) (Revision 74094) ++++ Tools/unicode/makeunicodedata.py (.../branches/release26-maint) (Revision 74094) +@@ -371,33 +371,32 @@ + flags |= UPPER_MASK + # use delta predictor for upper/lower/title if it fits + if record[12]: +- upper = int(record[12], 16) - char +- if -32768 <= upper <= 32767 and delta: +- upper = upper & 0xffff +- else: +- upper += char +- delta = False ++ upper = int(record[12], 16) + else: +- upper = 0 ++ upper = char + if record[13]: +- lower = int(record[13], 16) - char +- if -32768 <= lower <= 32767 and delta: +- lower = lower & 0xffff +- else: +- lower += char +- delta = False ++ lower = int(record[13], 16) + else: +- lower = 0 ++ lower = char + if record[14]: +- title = int(record[14], 16) - char +- if -32768 <= lower <= 32767 and delta: +- title = title & 0xffff +- else: +- title += char +- delta = False ++ title = int(record[14], 16) + else: +- title = 0 +- if not delta: ++ # UCD.html says that a missing title char means that ++ # it defaults to the uppercase character, not to the ++ # character itself. Apparently, in the current UCD (5.x) ++ # this feature is never used ++ title = upper ++ upper_d = upper - char ++ lower_d = lower - char ++ title_d = title - char ++ if -32768 <= upper_d <= 32767 and \ ++ -32768 <= lower_d <= 32767 and \ ++ -32768 <= title_d <= 32767: ++ # use deltas ++ upper = upper_d & 0xffff ++ lower = lower_d & 0xffff ++ title = title_d & 0xffff ++ else: + flags |= NODELTA_MASK + # decimal digit, integer digit + decimal = 0 +Index: Tools/scripts/texi2html.py +=================================================================== +--- Tools/scripts/texi2html.py (.../tags/r262) (Revision 74094) ++++ Tools/scripts/texi2html.py (.../branches/release26-maint) (Revision 74094) +@@ -38,7 +38,7 @@ + # rpyron 2002-05-07 + # Robert Pyron + # 1. BUGFIX: In function makefile(), strip blanks from the nodename. +-# This is necesary to match the behavior of parser.makeref() and ++# This is necessary to match the behavior of parser.makeref() and + # parser.do_node(). + # 2. BUGFIX fixed KeyError in end_ifset (well, I may have just made + # it go away, rather than fix it) +Index: Tools/msi/msi.py +=================================================================== +--- Tools/msi/msi.py (.../tags/r262) (Revision 74094) ++++ Tools/msi/msi.py (.../branches/release26-maint) (Revision 74094) +@@ -1007,6 +1007,7 @@ + lib.add_file("test_difflib_expect.html") + lib.add_file("check_soundcard.vbs") + lib.add_file("empty.vbs") ++ lib.add_file("Sine-1000Hz-300ms.aif") + lib.glob("*.uue") + lib.glob("*.pem") + lib.glob("*.pck") +@@ -1253,7 +1254,7 @@ + "", r"[TARGETDIR]Python.exe", "REGISTRY.def"), + ("DisplayIcon", -1, + r"Software\Microsoft\Windows\CurrentVersion\Uninstall\%s" % product_code, +- "DisplayIcon", "[TARGETDIR]python.exe", "REGISTRY.def") ++ "DisplayIcon", "[TARGETDIR]python.exe", "REGISTRY") + ]) + # Shortcuts, see "Shortcut Table" + add_data(db, "Directory", +Index: PC/os2vacpp/makefile.omk +=================================================================== +--- PC/os2vacpp/makefile.omk (.../tags/r262) (Revision 74094) ++++ PC/os2vacpp/makefile.omk (.../branches/release26-maint) (Revision 74094) +@@ -220,7 +220,7 @@ + + # zlibmodule.c -- Wrapper of ZLib Compression API (GZip Format) + # puremodule.c -- Wrapper of Purify Debugging API (Probably Non-OS/2) +- # dlmodule.c -- Some Wierd Form of Data Processing Module ++ # dlmodule.c -- Some Weird Form of Data Processing Module + # xxmodule.c -- Template to Create Your Own Module + + # +Index: PC/pyconfig.h +=================================================================== +--- PC/pyconfig.h (.../tags/r262) (Revision 74094) ++++ PC/pyconfig.h (.../branches/release26-maint) (Revision 74094) +@@ -405,11 +405,11 @@ + /* Define to 1 if you have the `copysign' function. */ + #define HAVE_COPYSIGN 1 + +-/* Define to 1 if you have the `isinf' function. */ +-#define HAVE_ISINF 1 ++/* Define to 1 if you have the `isinf' macro. */ ++#define HAVE_DECL_ISINF 1 + + /* Define to 1 if you have the `isnan' function. */ +-#define HAVE_ISNAN 1 ++#define HAVE_DECL_ISNAN 1 + + /* Define if on AIX 3. + System headers sometimes define this. +Index: PC/_winreg.c +=================================================================== +--- PC/_winreg.c (.../tags/r262) (Revision 74094) ++++ PC/_winreg.c (.../branches/release26-maint) (Revision 74094) +@@ -25,7 +25,7 @@ + + /* The win32api module reports the function name that failed, + but this concept is not in the Python core. +- Hopefully it will one day, and in the meantime I dont ++ Hopefully it will one day, and in the meantime I don't + want to lose this info... + */ + #define PyErr_SetFromWindowsErrWithFunction(rc, fnname) \ +@@ -694,9 +694,9 @@ + ** Note that fixupMultiSZ and countString have both had changes + ** made to support "incorrect strings". The registry specification + ** calls for strings to be terminated with 2 null bytes. It seems +-** some commercial packages install strings which dont conform, ++** some commercial packages install strings which don't conform, + ** causing this code to fail - however, "regedit" etc still work +-** with these strings (ie only we dont!). ++** with these strings (ie only we don't!). + */ + static void + fixupMultiSZ(char **str, char *data, int len) +Index: Doc/TODO.txt +=================================================================== +--- Doc/TODO.txt (.../tags/r262) (Revision 74094) ++++ Doc/TODO.txt (.../branches/release26-maint) (Revision 74094) +@@ -1,6 +0,0 @@ +-To do +-===== +- +-* split very large files and add toctrees +-* finish "Documenting Python" +-* care about XXX comments +Index: Doc/about.rst +=================================================================== +--- Doc/about.rst (.../tags/r262) (Revision 74094) ++++ Doc/about.rst (.../branches/release26-maint) (Revision 74094) +@@ -7,8 +7,8 @@ + `_ sources by *Sphinx*, a document processor + specifically written for the Python documentation. + +-In the online version of these documents, you can submit comments and suggest +-changes directly on the documentation pages. ++.. In the online version of these documents, you can submit comments and suggest ++ changes directly on the documentation pages. + + Development of the documentation and its toolchain takes place on the + docs@python.org mailing list. We're always looking for volunteers wanting +@@ -24,7 +24,8 @@ + `_ project from which Sphinx got many good + ideas. + +-See :ref:`reporting-bugs` for information how to report bugs in Python itself. ++See :ref:`reporting-bugs` for information how to report bugs in this ++documentation, or Python itself. + + .. including the ACKS file here so that it can be maintained separately + .. include:: ACKS.txt +Index: Doc/make.bat +=================================================================== +--- Doc/make.bat (.../tags/r262) (Revision 74094) ++++ Doc/make.bat (.../branches/release26-maint) (Revision 74094) +@@ -34,7 +34,7 @@ + goto end + + :checkout +-svn co %SVNROOT%/doctools/trunk/sphinx tools/sphinx ++svn co %SVNROOT%/external/Sphinx-0.6.2/sphinx tools/sphinx + svn co %SVNROOT%/external/docutils-0.5/docutils tools/docutils + svn co %SVNROOT%/external/Jinja-2.1.1/jinja2 tools/jinja2 + svn co %SVNROOT%/external/Pygments-0.11.1/pygments tools/pygments +Index: Doc/distutils/setupscript.rst +=================================================================== +--- Doc/distutils/setupscript.rst (.../tags/r262) (Revision 74094) ++++ Doc/distutils/setupscript.rst (.../branches/release26-maint) (Revision 74094) +@@ -565,6 +565,8 @@ + +----------------------+---------------------------+-----------------+--------+ + | ``platforms`` | a list of platforms | list of strings | | + +----------------------+---------------------------+-----------------+--------+ ++| ``license`` | license for the package | short string | \(6) | +++----------------------+---------------------------+-----------------+--------+ + + Notes: + +@@ -582,6 +584,13 @@ + versions prior to 2.2.3 or 2.3. The list is available from the `PyPI website + `_. + ++(6) ++ The ``license`` field is a text indicating the license covering the ++ package where the license is not a selection from the "License" Trove ++ classifiers. See the ``Classifier`` field. Notice that ++ there's a ``licence`` distribution option which is deprecated but still ++ acts as an alias for ``license``. ++ + 'short string' + A single line of text, not more than 200 characters. + +Index: Doc/distutils/apiref.rst +=================================================================== +--- Doc/distutils/apiref.rst (.../tags/r262) (Revision 74094) ++++ Doc/distutils/apiref.rst (.../branches/release26-maint) (Revision 74094) +@@ -886,11 +886,9 @@ + prefix of all files and directories in the archive. *root_dir* and *base_dir* + both default to the current directory. Returns the name of the archive file. + +- .. warning:: ++ .. XXX This should be changed to support bz2 files. + +- This should be changed to support bz2 files + +- + .. function:: make_tarball(base_name, base_dir[, compress='gzip', verbose=0, dry_run=0]) + + 'Create an (optional compressed) archive as a tar file from all files in and +@@ -901,11 +899,9 @@ + possibly plus the appropriate compression extension (:file:`.gz`, :file:`.bz2` + or :file:`.Z`). Return the output filename. + +- .. warning:: ++ .. XXX This should be replaced with calls to the :mod:`tarfile` module. + +- This should be replaced with calls to the :mod:`tarfile` module. + +- + .. function:: make_zipfile(base_name, base_dir[, verbose=0, dry_run=0]) + + Create a zip file from all files in and under *base_dir*. The output zip file +@@ -1346,12 +1342,10 @@ + + Wraps *text* to less than *width* wide. + +- .. warning:: ++ .. XXX Should be replaced with :mod:`textwrap` (which is available in Python ++ 2.3 and later). + +- Should be replaced with :mod:`textwrap` (which is available in Python 2.3 and +- later). + +- + .. class:: FancyGetopt([option_table=None]) + + The option_table is a list of 3-tuples: ``(long_option, short_option, +@@ -1398,8 +1392,8 @@ + ================================================ + + .. module:: distutils.filelist +- :synopsis: The FileList class, used for poking about the file system and building lists of +- files. ++ :synopsis: The FileList class, used for poking about the file system and ++ building lists of files. + + + This module provides the :class:`FileList` class, used for poking about the +@@ -1413,15 +1407,10 @@ + :synopsis: A simple logging mechanism, 282-style + + +-.. warning:: ++.. XXX Should be replaced with standard :mod:`logging` module. + +- Should be replaced with standard :mod:`logging` module. + +-.. % \subsubsection{\module{} --- } +-.. % \declaremodule{standard}{distutils.magic} +-.. % \modulesynopsis{ } + +- + :mod:`distutils.spawn` --- Spawn a sub-process + ============================================== + +Index: Doc/using/cmdline.rst +=================================================================== +--- Doc/using/cmdline.rst (.../tags/r262) (Revision 74094) ++++ Doc/using/cmdline.rst (.../branches/release26-maint) (Revision 74094) +@@ -351,7 +351,7 @@ + Skip the first line of the source, allowing use of non-Unix forms of + ``#!cmd``. This is intended for a DOS specific hack only. + +- .. warning:: The line numbers in error messages will be off by one! ++ .. note:: The line numbers in error messages will be off by one. + + + .. cmdoption:: -3 +Index: Doc/extending/extending.rst +=================================================================== +--- Doc/extending/extending.rst (.../tags/r262) (Revision 74094) ++++ Doc/extending/extending.rst (.../branches/release26-maint) (Revision 74094) +@@ -47,7 +47,7 @@ + which pulls in the Python API (you can add a comment describing the purpose of + the module and a copyright notice if you like). + +-.. warning:: ++.. note:: + + Since Python may define some pre-processor definitions which affect the standard + headers on some systems, you *must* include :file:`Python.h` before any standard +Index: Doc/c-api/sequence.rst +=================================================================== +--- Doc/c-api/sequence.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/sequence.rst (.../branches/release26-maint) (Revision 74094) +@@ -13,6 +13,7 @@ + + + .. cfunction:: Py_ssize_t PySequence_Size(PyObject *o) ++ Py_ssize_t PySequence_Length(PyObject *o) + + .. index:: builtin: len + +@@ -20,12 +21,11 @@ + For objects that do not provide sequence protocol, this is equivalent to the + Python expression ``len(o)``. + ++ .. versionchanged:: 2.5 ++ These functions returned an :ctype:`int` type. This might require ++ changes in your code for properly supporting 64-bit systems. + +-.. cfunction:: Py_ssize_t PySequence_Length(PyObject *o) + +- Alternate name for :cfunc:`PySequence_Size`. +- +- + .. cfunction:: PyObject* PySequence_Concat(PyObject *o1, PyObject *o2) + + Return the concatenation of *o1* and *o2* on success, and *NULL* on failure. +@@ -37,7 +37,11 @@ + Return the result of repeating sequence object *o* *count* times, or *NULL* on + failure. This is the equivalent of the Python expression ``o * count``. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *count*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PySequence_InPlaceConcat(PyObject *o1, PyObject *o2) + + Return the concatenation of *o1* and *o2* on success, and *NULL* on failure. +@@ -51,51 +55,83 @@ + failure. The operation is done *in-place* when *o* supports it. This is the + equivalent of the Python expression ``o *= count``. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *count*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PySequence_GetItem(PyObject *o, Py_ssize_t i) + + Return the *i*th element of *o*, or *NULL* on failure. This is the equivalent of + the Python expression ``o[i]``. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *i*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PySequence_GetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2) + + Return the slice of sequence object *o* between *i1* and *i2*, or *NULL* on + failure. This is the equivalent of the Python expression ``o[i1:i2]``. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *i1* and *i2*. This might ++ require changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v) + + Assign object *v* to the *i*th element of *o*. Returns ``-1`` on failure. This + is the equivalent of the Python statement ``o[i] = v``. This function *does + not* steal a reference to *v*. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *i*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PySequence_DelItem(PyObject *o, Py_ssize_t i) + + Delete the *i*th element of object *o*. Returns ``-1`` on failure. This is the + equivalent of the Python statement ``del o[i]``. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *i*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PySequence_SetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2, PyObject *v) + + Assign the sequence object *v* to the slice in sequence object *o* from *i1* to + *i2*. This is the equivalent of the Python statement ``o[i1:i2] = v``. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *i1* and *i2*. This might ++ require changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PySequence_DelSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2) + + Delete the slice in sequence object *o* from *i1* to *i2*. Returns ``-1`` on + failure. This is the equivalent of the Python statement ``del o[i1:i2]``. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *i1* and *i2*. This might ++ require changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: Py_ssize_t PySequence_Count(PyObject *o, PyObject *value) + + Return the number of occurrences of *value* in *o*, that is, return the number + of keys for which ``o[key] == value``. On failure, return ``-1``. This is + equivalent to the Python expression ``o.count(value)``. + ++ .. versionchanged:: 2.5 ++ This function returned an :ctype:`int` type. This might require changes ++ in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PySequence_Contains(PyObject *o, PyObject *value) + + Determine if *o* contains *value*. If an item in *o* is equal to *value*, +@@ -108,7 +144,11 @@ + Return the first index *i* for which ``o[i] == value``. On error, return + ``-1``. This is equivalent to the Python expression ``o.index(value)``. + ++ .. versionchanged:: 2.5 ++ This function returned an :ctype:`int` type. This might require changes ++ in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PySequence_List(PyObject *o) + + Return a list object with the same contents as the arbitrary sequence *o*. The +@@ -138,7 +178,11 @@ + Return the *i*th element of *o*, assuming that *o* was returned by + :cfunc:`PySequence_Fast`, *o* is not *NULL*, and that *i* is within bounds. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *i*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject** PySequence_Fast_ITEMS(PyObject *o) + + Return the underlying array of PyObject pointers. Assumes that *o* was returned +@@ -160,7 +204,11 @@ + + .. versionadded:: 2.3 + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *i*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: Py_ssize_t PySequence_Fast_GET_SIZE(PyObject *o) + + Returns the length of *o*, assuming that *o* was returned by +Index: Doc/c-api/buffer.rst +=================================================================== +--- Doc/c-api/buffer.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/buffer.rst (.../branches/release26-maint) (Revision 74094) +@@ -13,9 +13,10 @@ + single: buffer interface + + Python objects implemented in C can export a group of functions called the +-"buffer interface." These functions can be used by an object to expose its data +-in a raw, byte-oriented format. Clients of the object can use the buffer +-interface to access the object data directly, without needing to copy it first. ++"buffer interface." These functions can be used by an object to expose its ++data in a raw, byte-oriented format. Clients of the object can use the buffer ++interface to access the object data directly, without needing to copy it ++first. + + Two examples of objects that support the buffer interface are strings and + arrays. The string object exposes the character contents in the buffer +@@ -28,6 +29,280 @@ + :cfunc:`PyArg_ParseTuple` that operate against an object's buffer interface, + returning data from the target object. + ++Starting from version 1.6, Python has been providing Python-level buffer ++objects and a C-level buffer API so that any builtin or used-defined type can ++expose its characteristics. Both, however, have been deprecated because of ++various shortcomings, and have been officially removed in Python 3.0 in favour ++of a new C-level buffer API and a new Python-level object named ++:class:`memoryview`. ++ ++The new buffer API has been backported to Python 2.6, and the ++:class:`memoryview` object has been backported to Python 2.7. It is strongly ++advised to use them rather than the old APIs, unless you are blocked from ++doing so for compatibility reasons. ++ ++ ++The new-style Py_buffer struct ++============================== ++ ++ ++.. ctype:: Py_buffer ++ ++ .. cmember:: void *buf ++ ++ A pointer to the start of the memory for the object. ++ ++ .. cmember:: Py_ssize_t len ++ :noindex: ++ ++ The total length of the memory in bytes. ++ ++ .. cmember:: int readonly ++ ++ An indicator of whether the buffer is read only. ++ ++ .. cmember:: const char *format ++ :noindex: ++ ++ A *NULL* terminated string in :mod:`struct` module style syntax giving ++ the contents of the elements available through the buffer. If this is ++ *NULL*, ``"B"`` (unsigned bytes) is assumed. ++ ++ .. cmember:: int ndim ++ ++ The number of dimensions the memory represents as a multi-dimensional ++ array. If it is 0, :cdata:`strides` and :cdata:`suboffsets` must be ++ *NULL*. ++ ++ .. cmember:: Py_ssize_t *shape ++ ++ An array of :ctype:`Py_ssize_t`\s the length of :cdata:`ndim` giving the ++ shape of the memory as a multi-dimensional array. Note that ++ ``((*shape)[0] * ... * (*shape)[ndims-1])*itemsize`` should be equal to ++ :cdata:`len`. ++ ++ .. cmember:: Py_ssize_t *strides ++ ++ An array of :ctype:`Py_ssize_t`\s the length of :cdata:`ndim` giving the ++ number of bytes to skip to get to a new element in each dimension. ++ ++ .. cmember:: Py_ssize_t *suboffsets ++ ++ An array of :ctype:`Py_ssize_t`\s the length of :cdata:`ndim`. If these ++ suboffset numbers are greater than or equal to 0, then the value stored ++ along the indicated dimension is a pointer and the suboffset value ++ dictates how many bytes to add to the pointer after de-referencing. A ++ suboffset value that it negative indicates that no de-referencing should ++ occur (striding in a contiguous memory block). ++ ++ Here is a function that returns a pointer to the element in an N-D array ++ pointed to by an N-dimesional index when there are both non-NULL strides ++ and suboffsets:: ++ ++ void *get_item_pointer(int ndim, void *buf, Py_ssize_t *strides, ++ Py_ssize_t *suboffsets, Py_ssize_t *indices) { ++ char *pointer = (char*)buf; ++ int i; ++ for (i = 0; i < ndim; i++) { ++ pointer += strides[i] * indices[i]; ++ if (suboffsets[i] >=0 ) { ++ pointer = *((char**)pointer) + suboffsets[i]; ++ } ++ } ++ return (void*)pointer; ++ } ++ ++ ++ .. cmember:: Py_ssize_t itemsize ++ ++ This is a storage for the itemsize (in bytes) of each element of the ++ shared memory. It is technically un-necessary as it can be obtained ++ using :cfunc:`PyBuffer_SizeFromFormat`, however an exporter may know ++ this information without parsing the format string and it is necessary ++ to know the itemsize for proper interpretation of striding. Therefore, ++ storing it is more convenient and faster. ++ ++ .. cmember:: void *internal ++ ++ This is for use internally by the exporting object. For example, this ++ might be re-cast as an integer by the exporter and used to store flags ++ about whether or not the shape, strides, and suboffsets arrays must be ++ freed when the buffer is released. The consumer should never alter this ++ value. ++ ++ ++Buffer related functions ++======================== ++ ++ ++.. cfunction:: int PyObject_CheckBuffer(PyObject *obj) ++ ++ Return 1 if *obj* supports the buffer interface otherwise 0. ++ ++ ++.. cfunction:: int PyObject_GetBuffer(PyObject *obj, PyObject *view, int flags) ++ ++ Export *obj* into a :ctype:`Py_buffer`, *view*. These arguments must ++ never be *NULL*. The *flags* argument is a bit field indicating what ++ kind of buffer the caller is prepared to deal with and therefore what ++ kind of buffer the exporter is allowed to return. The buffer interface ++ allows for complicated memory sharing possibilities, but some caller may ++ not be able to handle all the complexibity but may want to see if the ++ exporter will let them take a simpler view to its memory. ++ ++ Some exporters may not be able to share memory in every possible way and ++ may need to raise errors to signal to some consumers that something is ++ just not possible. These errors should be a :exc:`BufferError` unless ++ there is another error that is actually causing the problem. The ++ exporter can use flags information to simplify how much of the ++ :cdata:`Py_buffer` structure is filled in with non-default values and/or ++ raise an error if the object can't support a simpler view of its memory. ++ ++ 0 is returned on success and -1 on error. ++ ++ The following table gives possible values to the *flags* arguments. ++ ++ +------------------------------+---------------------------------------------------+ ++ | Flag | Description | ++ +==============================+===================================================+ ++ | :cmacro:`PyBUF_SIMPLE` | This is the default flag state. The returned | ++ | | buffer may or may not have writable memory. The | ++ | | format of the data will be assumed to be unsigned | ++ | | bytes. This is a "stand-alone" flag constant. It | ++ | | never needs to be '|'d to the others. The exporter| ++ | | will raise an error if it cannot provide such a | ++ | | contiguous buffer of bytes. | ++ | | | ++ +------------------------------+---------------------------------------------------+ ++ | :cmacro:`PyBUF_WRITABLE` | The returned buffer must be writable. If it is | ++ | | not writable, then raise an error. | ++ +------------------------------+---------------------------------------------------+ ++ | :cmacro:`PyBUF_STRIDES` | This implies :cmacro:`PyBUF_ND`. The returned | ++ | | buffer must provide strides information (i.e. the | ++ | | strides cannot be NULL). This would be used when | ++ | | the consumer can handle strided, discontiguous | ++ | | arrays. Handling strides automatically assumes | ++ | | you can handle shape. The exporter can raise an | ++ | | error if a strided representation of the data is | ++ | | not possible (i.e. without the suboffsets). | ++ | | | ++ +------------------------------+---------------------------------------------------+ ++ | :cmacro:`PyBUF_ND` | The returned buffer must provide shape | ++ | | information. The memory will be assumed C-style | ++ | | contiguous (last dimension varies the | ++ | | fastest). The exporter may raise an error if it | ++ | | cannot provide this kind of contiguous buffer. If | ++ | | this is not given then shape will be *NULL*. | ++ | | | ++ | | | ++ | | | ++ +------------------------------+---------------------------------------------------+ ++ |:cmacro:`PyBUF_C_CONTIGUOUS` | These flags indicate that the contiguity returned | ++ |:cmacro:`PyBUF_F_CONTIGUOUS` | buffer must be respectively, C-contiguous (last | ++ |:cmacro:`PyBUF_ANY_CONTIGUOUS`| dimension varies the fastest), Fortran contiguous | ++ | | (first dimension varies the fastest) or either | ++ | | one. All of these flags imply | ++ | | :cmacro:`PyBUF_STRIDES` and guarantee that the | ++ | | strides buffer info structure will be filled in | ++ | | correctly. | ++ | | | ++ +------------------------------+---------------------------------------------------+ ++ | :cmacro:`PyBUF_INDIRECT` | This flag indicates the returned buffer must have | ++ | | suboffsets information (which can be NULL if no | ++ | | suboffsets are needed). This can be used when | ++ | | the consumer can handle indirect array | ++ | | referencing implied by these suboffsets. This | ++ | | implies :cmacro:`PyBUF_STRIDES`. | ++ | | | ++ | | | ++ | | | ++ +------------------------------+---------------------------------------------------+ ++ | :cmacro:`PyBUF_FORMAT` | The returned buffer must have true format | ++ | | information if this flag is provided. This would | ++ | | be used when the consumer is going to be checking | ++ | | for what 'kind' of data is actually stored. An | ++ | | exporter should always be able to provide this | ++ | | information if requested. If format is not | ++ | | explicitly requested then the format must be | ++ | | returned as *NULL* (which means ``'B'``, or | ++ | | unsigned bytes) | ++ +------------------------------+---------------------------------------------------+ ++ | :cmacro:`PyBUF_STRIDED` | This is equivalent to ``(PyBUF_STRIDES | | ++ | | PyBUF_WRITABLE)``. | ++ +------------------------------+---------------------------------------------------+ ++ | :cmacro:`PyBUF_STRIDED_RO` | This is equivalent to ``(PyBUF_STRIDES)``. | ++ | | | ++ +------------------------------+---------------------------------------------------+ ++ | :cmacro:`PyBUF_RECORDS` | This is equivalent to ``(PyBUF_STRIDES | | ++ | | PyBUF_FORMAT | PyBUF_WRITABLE)``. | ++ +------------------------------+---------------------------------------------------+ ++ | :cmacro:`PyBUF_RECORDS_RO` | This is equivalent to ``(PyBUF_STRIDES | | ++ | | PyBUF_FORMAT)``. | ++ +------------------------------+---------------------------------------------------+ ++ | :cmacro:`PyBUF_FULL` | This is equivalent to ``(PyBUF_INDIRECT | | ++ | | PyBUF_FORMAT | PyBUF_WRITABLE)``. | ++ +------------------------------+---------------------------------------------------+ ++ | :cmacro:`PyBUF_FULL_RO` | This is equivalent to ``(PyBUF_INDIRECT | | ++ | | PyBUF_FORMAT)``. | ++ +------------------------------+---------------------------------------------------+ ++ | :cmacro:`PyBUF_CONTIG` | This is equivalent to ``(PyBUF_ND | | ++ | | PyBUF_WRITABLE)``. | ++ +------------------------------+---------------------------------------------------+ ++ | :cmacro:`PyBUF_CONTIG_RO` | This is equivalent to ``(PyBUF_ND)``. | ++ | | | ++ +------------------------------+---------------------------------------------------+ ++ ++ ++.. cfunction:: void PyBuffer_Release(PyObject *obj, Py_buffer *view) ++ ++ Release the buffer *view* over *obj*. This shouldd be called when the buffer ++ is no longer being used as it may free memory from it. ++ ++ ++.. cfunction:: Py_ssize_t PyBuffer_SizeFromFormat(const char *) ++ ++ Return the implied :cdata:`~Py_buffer.itemsize` from the struct-stype ++ :cdata:`~Py_buffer.format`. ++ ++ ++.. cfunction:: int PyObject_CopyToObject(PyObject *obj, void *buf, Py_ssize_t len, char fortran) ++ ++ Copy *len* bytes of data pointed to by the contiguous chunk of memory ++ pointed to by *buf* into the buffer exported by obj. The buffer must of ++ course be writable. Return 0 on success and return -1 and raise an error ++ on failure. If the object does not have a writable buffer, then an error ++ is raised. If *fortran* is ``'F'``, then if the object is ++ multi-dimensional, then the data will be copied into the array in ++ Fortran-style (first dimension varies the fastest). If *fortran* is ++ ``'C'``, then the data will be copied into the array in C-style (last ++ dimension varies the fastest). If *fortran* is ``'A'``, then it does not ++ matter and the copy will be made in whatever way is more efficient. ++ ++ ++.. cfunction:: int PyBuffer_IsContiguous(Py_buffer *view, char fortran) ++ ++ Return 1 if the memory defined by the *view* is C-style (*fortran* is ++ ``'C'``) or Fortran-style (*fortran* is ``'F'``) contiguous or either one ++ (*fortran* is ``'A'``). Return 0 otherwise. ++ ++ ++.. cfunction:: void PyBuffer_FillContiguousStrides(int ndim, Py_ssize_t *shape, Py_ssize_t *strides, Py_ssize_t itemsize, char fortran) ++ ++ Fill the *strides* array with byte-strides of a contiguous (C-style if ++ *fortran* is ``'C'`` or Fortran-style if *fortran* is ``'F'`` array of the ++ given shape with the given number of bytes per element. ++ ++ ++.. cfunction:: int PyBuffer_FillInfo(Py_buffer *view, void *buf, Py_ssize_t len, int readonly, int infoflags) ++ ++ Fill in a buffer-info structure, *view*, correctly for an exporter that can ++ only share a contiguous chunk of memory of "unsigned bytes" of the given ++ length. Return 0 on success and -1 (with raising an error) on error. ++ ++ ++Old-style buffer objects ++======================== ++ + .. index:: single: PyBufferProcs + + More information on the buffer interface is provided in the section +@@ -36,17 +311,18 @@ + A "buffer object" is defined in the :file:`bufferobject.h` header (included by + :file:`Python.h`). These objects look very similar to string objects at the + Python programming level: they support slicing, indexing, concatenation, and +-some other standard string operations. However, their data can come from one of +-two sources: from a block of memory, or from another object which exports the +-buffer interface. ++some other standard string operations. However, their data can come from one ++of two sources: from a block of memory, or from another object which exports ++the buffer interface. + + Buffer objects are useful as a way to expose the data from another object's +-buffer interface to the Python programmer. They can also be used as a zero-copy +-slicing mechanism. Using their ability to reference a block of memory, it is +-possible to expose any data to the Python programmer quite easily. The memory +-could be a large, constant array in a C extension, it could be a raw block of +-memory for manipulation before passing to an operating system library, or it +-could be used to pass around structured data in its native, in-memory format. ++buffer interface to the Python programmer. They can also be used as a ++zero-copy slicing mechanism. Using their ability to reference a block of ++memory, it is possible to expose any data to the Python programmer quite ++easily. The memory could be a large, constant array in a C extension, it could ++be a raw block of memory for manipulation before passing to an operating ++system library, or it could be used to pass around structured data in its ++native, in-memory format. + + + .. ctype:: PyBufferObject +@@ -67,9 +343,10 @@ + + This constant may be passed as the *size* parameter to + :cfunc:`PyBuffer_FromObject` or :cfunc:`PyBuffer_FromReadWriteObject`. It +- indicates that the new :ctype:`PyBufferObject` should refer to *base* object +- from the specified *offset* to the end of its exported buffer. Using this +- enables the caller to avoid querying the *base* object for its length. ++ indicates that the new :ctype:`PyBufferObject` should refer to *base* ++ object from the specified *offset* to the end of its exported buffer. ++ Using this enables the caller to avoid querying the *base* object for its ++ length. + + + .. cfunction:: int PyBuffer_Check(PyObject *p) +@@ -79,41 +356,64 @@ + + .. cfunction:: PyObject* PyBuffer_FromObject(PyObject *base, Py_ssize_t offset, Py_ssize_t size) + +- Return a new read-only buffer object. This raises :exc:`TypeError` if *base* +- doesn't support the read-only buffer protocol or doesn't provide exactly one +- buffer segment, or it raises :exc:`ValueError` if *offset* is less than zero. +- The buffer will hold a reference to the *base* object, and the buffer's contents +- will refer to the *base* object's buffer interface, starting as position +- *offset* and extending for *size* bytes. If *size* is :const:`Py_END_OF_BUFFER`, +- then the new buffer's contents extend to the length of the *base* object's +- exported buffer data. ++ Return a new read-only buffer object. This raises :exc:`TypeError` if ++ *base* doesn't support the read-only buffer protocol or doesn't provide ++ exactly one buffer segment, or it raises :exc:`ValueError` if *offset* is ++ less than zero. The buffer will hold a reference to the *base* object, and ++ the buffer's contents will refer to the *base* object's buffer interface, ++ starting as position *offset* and extending for *size* bytes. If *size* is ++ :const:`Py_END_OF_BUFFER`, then the new buffer's contents extend to the ++ length of the *base* object's exported buffer data. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *offset* and *size*. This ++ might require changes in your code for properly supporting 64-bit ++ systems. + ++ + .. cfunction:: PyObject* PyBuffer_FromReadWriteObject(PyObject *base, Py_ssize_t offset, Py_ssize_t size) + +- Return a new writable buffer object. Parameters and exceptions are similar to +- those for :cfunc:`PyBuffer_FromObject`. If the *base* object does not export +- the writeable buffer protocol, then :exc:`TypeError` is raised. ++ Return a new writable buffer object. Parameters and exceptions are similar ++ to those for :cfunc:`PyBuffer_FromObject`. If the *base* object does not ++ export the writeable buffer protocol, then :exc:`TypeError` is raised. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *offset* and *size*. This ++ might require changes in your code for properly supporting 64-bit ++ systems. + ++ + .. cfunction:: PyObject* PyBuffer_FromMemory(void *ptr, Py_ssize_t size) + +- Return a new read-only buffer object that reads from a specified location in +- memory, with a specified size. The caller is responsible for ensuring that the +- memory buffer, passed in as *ptr*, is not deallocated while the returned buffer +- object exists. Raises :exc:`ValueError` if *size* is less than zero. Note that +- :const:`Py_END_OF_BUFFER` may *not* be passed for the *size* parameter; +- :exc:`ValueError` will be raised in that case. ++ Return a new read-only buffer object that reads from a specified location ++ in memory, with a specified size. The caller is responsible for ensuring ++ that the memory buffer, passed in as *ptr*, is not deallocated while the ++ returned buffer object exists. Raises :exc:`ValueError` if *size* is less ++ than zero. Note that :const:`Py_END_OF_BUFFER` may *not* be passed for the ++ *size* parameter; :exc:`ValueError` will be raised in that case. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyBuffer_FromReadWriteMemory(void *ptr, Py_ssize_t size) + +- Similar to :cfunc:`PyBuffer_FromMemory`, but the returned buffer is writable. ++ Similar to :cfunc:`PyBuffer_FromMemory`, but the returned buffer is ++ writable. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyBuffer_New(Py_ssize_t size) + + Return a new writable buffer object that maintains its own memory buffer of +- *size* bytes. :exc:`ValueError` is returned if *size* is not zero or positive. +- Note that the memory buffer (as returned by :cfunc:`PyObject_AsWriteBuffer`) is +- not specifically aligned. ++ *size* bytes. :exc:`ValueError` is returned if *size* is not zero or ++ positive. Note that the memory buffer (as returned by ++ :cfunc:`PyObject_AsWriteBuffer`) is not specifically aligned. ++ ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. +Index: Doc/c-api/list.rst +=================================================================== +--- Doc/c-api/list.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/list.rst (.../branches/release26-maint) (Revision 74094) +@@ -17,8 +17,9 @@ + + .. index:: single: ListType (in module types) + +- This instance of :ctype:`PyTypeObject` represents the Python list type. This is +- the same object as ``list`` and ``types.ListType`` in the Python layer. ++ This instance of :ctype:`PyTypeObject` represents the Python list type. ++ This is the same object as ``list`` and ``types.ListType`` in the Python ++ layer. + + + .. cfunction:: int PyList_Check(PyObject *p) +@@ -32,8 +33,8 @@ + + .. cfunction:: int PyList_CheckExact(PyObject *p) + +- Return true if *p* is a list object, but not an instance of a subtype of the +- list type. ++ Return true if *p* is a list object, but not an instance of a subtype of ++ the list type. + + .. versionadded:: 2.2 + +@@ -44,12 +45,16 @@ + + .. note:: + +- If *length* is greater than zero, the returned list object's items are set to +- ``NULL``. Thus you cannot use abstract API functions such as +- :cfunc:`PySequence_SetItem` or expose the object to Python code before setting +- all items to a real object with :cfunc:`PyList_SetItem`. ++ If *length* is greater than zero, the returned list object's items are ++ set to ``NULL``. Thus you cannot use abstract API functions such as ++ :cfunc:`PySequence_SetItem` or expose the object to Python code before ++ setting all items to a real object with :cfunc:`PyList_SetItem`. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: Py_ssize_t PyList_Size(PyObject *list) + + .. index:: builtin: len +@@ -57,80 +62,118 @@ + Return the length of the list object in *list*; this is equivalent to + ``len(list)`` on a list object. + ++ .. versionchanged:: 2.5 ++ This function returned an :ctype:`int`. This might require changes in ++ your code for properly supporting 64-bit systems. + ++ + .. cfunction:: Py_ssize_t PyList_GET_SIZE(PyObject *list) + + Macro form of :cfunc:`PyList_Size` without error checking. + ++ .. versionchanged:: 2.5 ++ This macro returned an :ctype:`int`. This might require changes in your ++ code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyList_GetItem(PyObject *list, Py_ssize_t index) + +- Return the object at position *pos* in the list pointed to by *p*. The position +- must be positive, indexing from the end of the list is not supported. If *pos* +- is out of bounds, return *NULL* and set an :exc:`IndexError` exception. ++ Return the object at position *pos* in the list pointed to by *p*. The ++ position must be positive, indexing from the end of the list is not ++ supported. If *pos* is out of bounds, return *NULL* and set an ++ :exc:`IndexError` exception. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` for *index*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyList_GET_ITEM(PyObject *list, Py_ssize_t i) + + Macro form of :cfunc:`PyList_GetItem` without error checking. + ++ .. versionchanged:: 2.5 ++ This macro used an :ctype:`int` for *i*. This might require changes in ++ your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PyList_SetItem(PyObject *list, Py_ssize_t index, PyObject *item) + +- Set the item at index *index* in list to *item*. Return ``0`` on success or +- ``-1`` on failure. ++ Set the item at index *index* in list to *item*. Return ``0`` on success ++ or ``-1`` on failure. + + .. note:: + +- This function "steals" a reference to *item* and discards a reference to an item +- already in the list at the affected position. ++ This function "steals" a reference to *item* and discards a reference to ++ an item already in the list at the affected position. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` for *index*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: void PyList_SET_ITEM(PyObject *list, Py_ssize_t i, PyObject *o) + +- Macro form of :cfunc:`PyList_SetItem` without error checking. This is normally +- only used to fill in new lists where there is no previous content. ++ Macro form of :cfunc:`PyList_SetItem` without error checking. This is ++ normally only used to fill in new lists where there is no previous content. + + .. note:: + +- This function "steals" a reference to *item*, and, unlike +- :cfunc:`PyList_SetItem`, does *not* discard a reference to any item that it +- being replaced; any reference in *list* at position *i* will be leaked. ++ This macro "steals" a reference to *item*, and, unlike ++ :cfunc:`PyList_SetItem`, does *not* discard a reference to any item that ++ it being replaced; any reference in *list* at position *i* will be ++ leaked. + ++ .. versionchanged:: 2.5 ++ This macro used an :ctype:`int` for *i*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PyList_Insert(PyObject *list, Py_ssize_t index, PyObject *item) + +- Insert the item *item* into list *list* in front of index *index*. Return ``0`` +- if successful; return ``-1`` and set an exception if unsuccessful. Analogous to +- ``list.insert(index, item)``. ++ Insert the item *item* into list *list* in front of index *index*. Return ++ ``0`` if successful; return ``-1`` and set an exception if unsuccessful. ++ Analogous to ``list.insert(index, item)``. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` for *index*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PyList_Append(PyObject *list, PyObject *item) + +- Append the object *item* at the end of list *list*. Return ``0`` if successful; +- return ``-1`` and set an exception if unsuccessful. Analogous to +- ``list.append(item)``. ++ Append the object *item* at the end of list *list*. Return ``0`` if ++ successful; return ``-1`` and set an exception if unsuccessful. Analogous ++ to ``list.append(item)``. + + + .. cfunction:: PyObject* PyList_GetSlice(PyObject *list, Py_ssize_t low, Py_ssize_t high) + +- Return a list of the objects in *list* containing the objects *between* *low* +- and *high*. Return *NULL* and set an exception if unsuccessful. Analogous to +- ``list[low:high]``. ++ Return a list of the objects in *list* containing the objects *between* ++ *low* and *high*. Return *NULL* and set an exception if unsuccessful. ++ Analogous to ``list[low:high]``. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` for *low* and *high*. This might ++ require changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PyList_SetSlice(PyObject *list, Py_ssize_t low, Py_ssize_t high, PyObject *itemlist) + +- Set the slice of *list* between *low* and *high* to the contents of *itemlist*. +- Analogous to ``list[low:high] = itemlist``. The *itemlist* may be *NULL*, +- indicating the assignment of an empty list (slice deletion). Return ``0`` on +- success, ``-1`` on failure. ++ Set the slice of *list* between *low* and *high* to the contents of ++ *itemlist*. Analogous to ``list[low:high] = itemlist``. The *itemlist* may ++ be *NULL*, indicating the assignment of an empty list (slice deletion). ++ Return ``0`` on success, ``-1`` on failure. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` for *low* and *high*. This might ++ require changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PyList_Sort(PyObject *list) + +- Sort the items of *list* in place. Return ``0`` on success, ``-1`` on failure. +- This is equivalent to ``list.sort()``. ++ Sort the items of *list* in place. Return ``0`` on success, ``-1`` on ++ failure. This is equivalent to ``list.sort()``. + + + .. cfunction:: int PyList_Reverse(PyObject *list) +Index: Doc/c-api/structures.rst +=================================================================== +--- Doc/c-api/structures.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/structures.rst (.../branches/release26-maint) (Revision 74094) +@@ -9,28 +9,29 @@ + object types for Python. This section describes these structures and how they + are used. + +-All Python objects ultimately share a small number of fields at the beginning of +-the object's representation in memory. These are represented by the +-:ctype:`PyObject` and :ctype:`PyVarObject` types, which are defined, in turn, by +-the expansions of some macros also used, whether directly or indirectly, in the +-definition of all other Python objects. ++All Python objects ultimately share a small number of fields at the beginning ++of the object's representation in memory. These are represented by the ++:ctype:`PyObject` and :ctype:`PyVarObject` types, which are defined, in turn, ++by the expansions of some macros also used, whether directly or indirectly, in ++the definition of all other Python objects. + + + .. ctype:: PyObject + +- All object types are extensions of this type. This is a type which contains the +- information Python needs to treat a pointer to an object as an object. In a +- normal "release" build, it contains only the object's reference count and a +- pointer to the corresponding type object. It corresponds to the fields defined +- by the expansion of the ``PyObject_HEAD`` macro. ++ All object types are extensions of this type. This is a type which ++ contains the information Python needs to treat a pointer to an object as an ++ object. In a normal "release" build, it contains only the object's ++ reference count and a pointer to the corresponding type object. It ++ corresponds to the fields defined by the expansion of the ``PyObject_HEAD`` ++ macro. + + + .. ctype:: PyVarObject + +- This is an extension of :ctype:`PyObject` that adds the :attr:`ob_size` field. +- This is only used for objects that have some notion of *length*. This type does +- not often appear in the Python/C API. It corresponds to the fields defined by +- the expansion of the ``PyObject_VAR_HEAD`` macro. ++ This is an extension of :ctype:`PyObject` that adds the :attr:`ob_size` ++ field. This is only used for objects that have some notion of *length*. ++ This type does not often appear in the Python/C API. It corresponds to the ++ fields defined by the expansion of the ``PyObject_VAR_HEAD`` macro. + + These macros are used in the definition of :ctype:`PyObject` and + :ctype:`PyVarObject`: +@@ -40,9 +41,9 @@ + + This is a macro which expands to the declarations of the fields of the + :ctype:`PyObject` type; it is used when declaring new types which represent +- objects without a varying length. The specific fields it expands to depend on +- the definition of :cmacro:`Py_TRACE_REFS`. By default, that macro is not +- defined, and :cmacro:`PyObject_HEAD` expands to:: ++ objects without a varying length. The specific fields it expands to depend ++ on the definition of :cmacro:`Py_TRACE_REFS`. By default, that macro is ++ not defined, and :cmacro:`PyObject_HEAD` expands to:: + + Py_ssize_t ob_refcnt; + PyTypeObject *ob_type; +@@ -57,9 +58,9 @@ + .. cmacro:: PyObject_VAR_HEAD + + This is a macro which expands to the declarations of the fields of the +- :ctype:`PyVarObject` type; it is used when declaring new types which represent +- objects with a length that varies from instance to instance. This macro always +- expands to:: ++ :ctype:`PyVarObject` type; it is used when declaring new types which ++ represent objects with a length that varies from instance to instance. ++ This macro always expands to:: + + PyObject_HEAD + Py_ssize_t ob_size; +@@ -67,16 +68,34 @@ + Note that :cmacro:`PyObject_HEAD` is part of the expansion, and that its own + expansion varies depending on the definition of :cmacro:`Py_TRACE_REFS`. + +-PyObject_HEAD_INIT + ++.. cmacro:: PyObject_HEAD_INIT(type) + ++ This is a macro which expands to initialization values for a new ++ :ctype:`PyObject` type. This macro expands to:: ++ ++ _PyObject_EXTRA_INIT ++ 1, type, ++ ++ ++.. cmacro:: PyVarObject_HEAD_INIT(type, size) ++ ++ This is a macro which expands to initialization values for a new ++ :ctype:`PyVarObject` type, including the :attr:`ob_size` field. ++ This macro expands to:: ++ ++ _PyObject_EXTRA_INIT ++ 1, type, size, ++ ++ + .. ctype:: PyCFunction + +- Type of the functions used to implement most Python callables in C. Functions of +- this type take two :ctype:`PyObject\*` parameters and return one such value. If +- the return value is *NULL*, an exception shall have been set. If not *NULL*, +- the return value is interpreted as the return value of the function as exposed +- in Python. The function must return a new reference. ++ Type of the functions used to implement most Python callables in C. ++ Functions of this type take two :ctype:`PyObject\*` parameters and return ++ one such value. If the return value is *NULL*, an exception shall have ++ been set. If not *NULL*, the return value is interpreted as the return ++ value of the function as exposed in Python. The function must return a new ++ reference. + + + .. ctype:: PyMethodDef +@@ -117,20 +136,21 @@ + .. data:: METH_VARARGS + + This is the typical calling convention, where the methods have the type +- :ctype:`PyCFunction`. The function expects two :ctype:`PyObject\*` values. The +- first one is the *self* object for methods; for module functions, it has the +- value given to :cfunc:`Py_InitModule4` (or *NULL* if :cfunc:`Py_InitModule` was +- used). The second parameter (often called *args*) is a tuple object +- representing all arguments. This parameter is typically processed using +- :cfunc:`PyArg_ParseTuple` or :cfunc:`PyArg_UnpackTuple`. ++ :ctype:`PyCFunction`. The function expects two :ctype:`PyObject\*` values. ++ The first one is the *self* object for methods; for module functions, it ++ has the value given to :cfunc:`Py_InitModule4` (or *NULL* if ++ :cfunc:`Py_InitModule` was used). The second parameter (often called ++ *args*) is a tuple object representing all arguments. This parameter is ++ typically processed using :cfunc:`PyArg_ParseTuple` or ++ :cfunc:`PyArg_UnpackTuple`. + + + .. data:: METH_KEYWORDS + +- Methods with these flags must be of type :ctype:`PyCFunctionWithKeywords`. The +- function expects three parameters: *self*, *args*, and a dictionary of all the +- keyword arguments. The flag is typically combined with :const:`METH_VARARGS`, +- and the parameters are typically processed using ++ Methods with these flags must be of type :ctype:`PyCFunctionWithKeywords`. ++ The function expects three parameters: *self*, *args*, and a dictionary of ++ all the keyword arguments. The flag is typically combined with ++ :const:`METH_VARARGS`, and the parameters are typically processed using + :cfunc:`PyArg_ParseTupleAndKeywords`. + + +@@ -139,8 +159,8 @@ + Methods without parameters don't need to check whether arguments are given if + they are listed with the :const:`METH_NOARGS` flag. They need to be of type + :ctype:`PyCFunction`. When used with object methods, the first parameter is +- typically named ``self`` and will hold a reference to the object instance. In +- all cases the second parameter will be *NULL*. ++ typically named ``self`` and will hold a reference to the object instance. ++ In all cases the second parameter will be *NULL*. + + + .. data:: METH_O +@@ -154,11 +174,11 @@ + .. data:: METH_OLDARGS + + This calling convention is deprecated. The method must be of type +- :ctype:`PyCFunction`. The second argument is *NULL* if no arguments are given, +- a single object if exactly one argument is given, and a tuple of objects if more +- than one argument is given. There is no way for a function using this +- convention to distinguish between a call with multiple arguments and a call with +- a tuple as the only argument. ++ :ctype:`PyCFunction`. The second argument is *NULL* if no arguments are ++ given, a single object if exactly one argument is given, and a tuple of ++ objects if more than one argument is given. There is no way for a function ++ using this convention to distinguish between a call with multiple arguments ++ and a call with a tuple as the only argument. + + These two constants are not used to indicate the calling convention but the + binding when use with methods of classes. These may not be used for functions +@@ -170,9 +190,10 @@ + + .. index:: builtin: classmethod + +- The method will be passed the type object as the first parameter rather than an +- instance of the type. This is used to create *class methods*, similar to what +- is created when using the :func:`classmethod` built-in function. ++ The method will be passed the type object as the first parameter rather ++ than an instance of the type. This is used to create *class methods*, ++ similar to what is created when using the :func:`classmethod` built-in ++ function. + + .. versionadded:: 2.3 + +@@ -181,9 +202,9 @@ + + .. index:: builtin: staticmethod + +- The method will be passed *NULL* as the first parameter rather than an instance +- of the type. This is used to create *static methods*, similar to what is +- created when using the :func:`staticmethod` built-in function. ++ The method will be passed *NULL* as the first parameter rather than an ++ instance of the type. This is used to create *static methods*, similar to ++ what is created when using the :func:`staticmethod` built-in function. + + .. versionadded:: 2.3 + +@@ -195,12 +216,13 @@ + + The method will be loaded in place of existing definitions. Without + *METH_COEXIST*, the default is to skip repeated definitions. Since slot +- wrappers are loaded before the method table, the existence of a *sq_contains* +- slot, for example, would generate a wrapped method named :meth:`__contains__` +- and preclude the loading of a corresponding PyCFunction with the same name. +- With the flag defined, the PyCFunction will be loaded in place of the wrapper +- object and will co-exist with the slot. This is helpful because calls to +- PyCFunctions are optimized more than wrapper object calls. ++ wrappers are loaded before the method table, the existence of a ++ *sq_contains* slot, for example, would generate a wrapped method named ++ :meth:`__contains__` and preclude the loading of a corresponding ++ PyCFunction with the same name. With the flag defined, the PyCFunction ++ will be loaded in place of the wrapper object and will co-exist with the ++ slot. This is helpful because calls to PyCFunctions are optimized more ++ than wrapper object calls. + + .. versionadded:: 2.4 + +@@ -269,6 +291,7 @@ + + .. cfunction:: PyObject* Py_FindMethod(PyMethodDef table[], PyObject *ob, char *name) + +- Return a bound method object for an extension type implemented in C. This can +- be useful in the implementation of a :attr:`tp_getattro` or :attr:`tp_getattr` +- handler that does not use the :cfunc:`PyObject_GenericGetAttr` function. ++ Return a bound method object for an extension type implemented in C. This ++ can be useful in the implementation of a :attr:`tp_getattro` or ++ :attr:`tp_getattr` handler that does not use the ++ :cfunc:`PyObject_GenericGetAttr` function. +Index: Doc/c-api/gcsupport.rst +=================================================================== +--- Doc/c-api/gcsupport.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/gcsupport.rst (.../branches/release26-maint) (Revision 74094) +@@ -9,7 +9,8 @@ + references requires support from object types which are "containers" for other + objects which may also be containers. Types which do not store references to + other objects, or which only store references to atomic types (such as numbers +-or strings), do not need to provide any explicit support for garbage collection. ++or strings), do not need to provide any explicit support for garbage ++collection. + + .. An example showing the use of these interfaces can be found in "Supporting the + .. Cycle Collector (XXX not found: ../ext/example-cycle-support.html)". +@@ -23,13 +24,14 @@ + .. data:: Py_TPFLAGS_HAVE_GC + :noindex: + +- Objects with a type with this flag set must conform with the rules documented +- here. For convenience these objects will be referred to as container objects. ++ Objects with a type with this flag set must conform with the rules ++ documented here. For convenience these objects will be referred to as ++ container objects. + + Constructors for container types must conform to two rules: + +-#. The memory for the object must be allocated using :cfunc:`PyObject_GC_New` or +- :cfunc:`PyObject_GC_VarNew`. ++#. The memory for the object must be allocated using :cfunc:`PyObject_GC_New` ++ or :cfunc:`PyObject_GC_VarNew`. + + #. Once all the fields which may contain references to other containers are + initialized, it must call :cfunc:`PyObject_GC_Track`. +@@ -46,20 +48,28 @@ + Analogous to :cfunc:`PyObject_NewVar` but for container objects with the + :const:`Py_TPFLAGS_HAVE_GC` flag set. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + +-.. cfunction:: PyVarObject * PyObject_GC_Resize(PyVarObject *op, Py_ssize_t) + +- Resize an object allocated by :cfunc:`PyObject_NewVar`. Returns the resized +- object or *NULL* on failure. ++.. cfunction:: TYPE* PyObject_GC_Resize(TYPE, PyVarObject *op, Py_ssize_t newsize) + ++ Resize an object allocated by :cfunc:`PyObject_NewVar`. Returns the ++ resized object or *NULL* on failure. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *newsize*. This might ++ require changes in your code for properly supporting 64-bit systems. ++ ++ + .. cfunction:: void PyObject_GC_Track(PyObject *op) + +- Adds the object *op* to the set of container objects tracked by the collector. +- The collector can run at unexpected times so objects must be valid while being +- tracked. This should be called once all the fields followed by the +- :attr:`tp_traverse` handler become valid, usually near the end of the +- constructor. ++ Adds the object *op* to the set of container objects tracked by the ++ collector. The collector can run at unexpected times so objects must be ++ valid while being tracked. This should be called once all the fields ++ followed by the :attr:`tp_traverse` handler become valid, usually near the ++ end of the constructor. + + + .. cfunction:: void _PyObject_GC_TRACK(PyObject *op) +@@ -85,10 +95,10 @@ + .. cfunction:: void PyObject_GC_UnTrack(void *op) + + Remove the object *op* from the set of container objects tracked by the +- collector. Note that :cfunc:`PyObject_GC_Track` can be called again on this +- object to add it back to the set of tracked objects. The deallocator +- (:attr:`tp_dealloc` handler) should call this for the object before any of the +- fields used by the :attr:`tp_traverse` handler become invalid. ++ collector. Note that :cfunc:`PyObject_GC_Track` can be called again on ++ this object to add it back to the set of tracked objects. The deallocator ++ (:attr:`tp_dealloc` handler) should call this for the object before any of ++ the fields used by the :attr:`tp_traverse` handler become invalid. + + + .. cfunction:: void _PyObject_GC_UNTRACK(PyObject *op) +@@ -101,11 +111,12 @@ + + .. ctype:: int (*visitproc)(PyObject *object, void *arg) + +- Type of the visitor function passed to the :attr:`tp_traverse` handler. The +- function should be called with an object to traverse as *object* and the third +- parameter to the :attr:`tp_traverse` handler as *arg*. The Python core uses +- several visitor functions to implement cyclic garbage detection; it's not +- expected that users will need to write their own visitor functions. ++ Type of the visitor function passed to the :attr:`tp_traverse` handler. ++ The function should be called with an object to traverse as *object* and ++ the third parameter to the :attr:`tp_traverse` handler as *arg*. The ++ Python core uses several visitor functions to implement cyclic garbage ++ detection; it's not expected that users will need to write their own ++ visitor functions. + + The :attr:`tp_traverse` handler must have the following type: + +@@ -114,10 +125,10 @@ + + Traversal function for a container object. Implementations must call the + *visit* function for each object directly contained by *self*, with the +- parameters to *visit* being the contained object and the *arg* value passed to +- the handler. The *visit* function must not be called with a *NULL* object +- argument. If *visit* returns a non-zero value that value should be returned +- immediately. ++ parameters to *visit* being the contained object and the *arg* value passed ++ to the handler. The *visit* function must not be called with a *NULL* ++ object argument. If *visit* returns a non-zero value that value should be ++ returned immediately. + + To simplify writing :attr:`tp_traverse` handlers, a :cfunc:`Py_VISIT` macro is + provided. In order to use this macro, the :attr:`tp_traverse` implementation +@@ -126,9 +137,9 @@ + + .. cfunction:: void Py_VISIT(PyObject *o) + +- Call the *visit* callback, with arguments *o* and *arg*. If *visit* returns a +- non-zero value, then return it. Using this macro, :attr:`tp_traverse` handlers +- look like:: ++ Call the *visit* callback, with arguments *o* and *arg*. If *visit* returns ++ a non-zero value, then return it. Using this macro, :attr:`tp_traverse` ++ handlers look like:: + + static int + my_traverse(Noddy *self, visitproc visit, void *arg) +@@ -140,14 +151,15 @@ + + .. versionadded:: 2.4 + +-The :attr:`tp_clear` handler must be of the :ctype:`inquiry` type, or *NULL* if +-the object is immutable. ++The :attr:`tp_clear` handler must be of the :ctype:`inquiry` type, or *NULL* ++if the object is immutable. + + + .. ctype:: int (*inquiry)(PyObject *self) + +- Drop references that may have created reference cycles. Immutable objects do +- not have to define this method since they can never directly create reference +- cycles. Note that the object must still be valid after calling this method +- (don't just call :cfunc:`Py_DECREF` on a reference). The collector will call +- this method if it detects that this object is involved in a reference cycle. ++ Drop references that may have created reference cycles. Immutable objects ++ do not have to define this method since they can never directly create ++ reference cycles. Note that the object must still be valid after calling ++ this method (don't just call :cfunc:`Py_DECREF` on a reference). The ++ collector will call this method if it detects that this object is involved ++ in a reference cycle. +Index: Doc/c-api/intro.rst +=================================================================== +--- Doc/c-api/intro.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/intro.rst (.../branches/release26-maint) (Revision 74094) +@@ -44,7 +44,7 @@ + ````, ````, ````, and ```` (if + available). + +-.. warning:: ++.. note:: + + Since Python may define some pre-processor definitions which affect the standard + headers on some systems, you *must* include :file:`Python.h` before any standard +Index: Doc/c-api/set.rst +=================================================================== +--- Doc/c-api/set.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/set.rst (.../branches/release26-maint) (Revision 74094) +@@ -116,7 +116,11 @@ + ``len(anyset)``. Raises a :exc:`PyExc_SystemError` if *anyset* is not a + :class:`set`, :class:`frozenset`, or an instance of a subtype. + ++ .. versionchanged:: 2.5 ++ This function returned an :ctype:`int`. This might require changes in ++ your code for properly supporting 64-bit systems. + ++ + .. cfunction:: Py_ssize_t PySet_GET_SIZE(PyObject *anyset) + + Macro form of :cfunc:`PySet_Size` without error checking. +Index: Doc/c-api/slice.rst +=================================================================== +--- Doc/c-api/slice.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/slice.rst (.../branches/release26-maint) (Revision 74094) +@@ -22,35 +22,47 @@ + .. cfunction:: PyObject* PySlice_New(PyObject *start, PyObject *stop, PyObject *step) + + Return a new slice object with the given values. The *start*, *stop*, and +- *step* parameters are used as the values of the slice object attributes of the +- same names. Any of the values may be *NULL*, in which case the ``None`` will be +- used for the corresponding attribute. Return *NULL* if the new object could not +- be allocated. ++ *step* parameters are used as the values of the slice object attributes of ++ the same names. Any of the values may be *NULL*, in which case the ++ ``None`` will be used for the corresponding attribute. Return *NULL* if ++ the new object could not be allocated. + + + .. cfunction:: int PySlice_GetIndices(PySliceObject *slice, Py_ssize_t length, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step) + + Retrieve the start, stop and step indices from the slice object *slice*, +- assuming a sequence of length *length*. Treats indices greater than *length* as +- errors. ++ assuming a sequence of length *length*. Treats indices greater than ++ *length* as errors. + +- Returns 0 on success and -1 on error with no exception set (unless one of the +- indices was not :const:`None` and failed to be converted to an integer, in which +- case -1 is returned with an exception set). ++ Returns 0 on success and -1 on error with no exception set (unless one of ++ the indices was not :const:`None` and failed to be converted to an integer, ++ in which case -1 is returned with an exception set). + +- You probably do not want to use this function. If you want to use slice objects +- in versions of Python prior to 2.3, you would probably do well to incorporate +- the source of :cfunc:`PySlice_GetIndicesEx`, suitably renamed, in the source of +- your extension. ++ You probably do not want to use this function. If you want to use slice ++ objects in versions of Python prior to 2.3, you would probably do well to ++ incorporate the source of :cfunc:`PySlice_GetIndicesEx`, suitably renamed, ++ in the source of your extension. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *length* and an ++ :ctype:`int *` type for *start*, *stop*, and *step*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PySlice_GetIndicesEx(PySliceObject *slice, Py_ssize_t length, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, Py_ssize_t *slicelength) + +- Usable replacement for :cfunc:`PySlice_GetIndices`. Retrieve the start, stop, +- and step indices from the slice object *slice* assuming a sequence of length +- *length*, and store the length of the slice in *slicelength*. Out of bounds +- indices are clipped in a manner consistent with the handling of normal slices. ++ Usable replacement for :cfunc:`PySlice_GetIndices`. Retrieve the start, ++ stop, and step indices from the slice object *slice* assuming a sequence of ++ length *length*, and store the length of the slice in *slicelength*. Out ++ of bounds indices are clipped in a manner consistent with the handling of ++ normal slices. + + Returns 0 on success and -1 on error with exception set. + + .. versionadded:: 2.3 ++ ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *length* and an ++ :ctype:`int *` type for *start*, *stop*, *step*, and *slicelength*. This ++ might require changes in your code for properly supporting 64-bit ++ systems. +Index: Doc/c-api/long.rst +=================================================================== +--- Doc/c-api/long.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/long.rst (.../branches/release26-maint) (Revision 74094) +@@ -106,7 +106,11 @@ + + .. versionadded:: 1.6 + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` for *length*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyLong_FromVoidPtr(void *p) + + Create a Python integer or long integer from the pointer *p*. The pointer value +Index: Doc/c-api/init.rst +=================================================================== +--- Doc/c-api/init.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/init.rst (.../branches/release26-maint) (Revision 74094) +@@ -419,10 +419,9 @@ + The Python interpreter needs to keep some bookkeeping information separate per + thread --- for this it uses a data structure called :ctype:`PyThreadState`. + There's one global variable, however: the pointer to the current +-:ctype:`PyThreadState` structure. While most thread packages have a way to +-store "per-thread global data," Python's internal platform independent thread +-abstraction doesn't support this yet. Therefore, the current thread state must +-be manipulated explicitly. ++:ctype:`PyThreadState` structure. Before the addition of :dfn:`thread-local ++storage` (:dfn:`TLS`) the current thread state had to be manipulated ++explicitly. + + This is easy enough in most cases. Most code manipulating the global + interpreter lock has the following simple structure:: +@@ -492,13 +491,13 @@ + global variable). Conversely, when acquiring the lock and restoring the thread + state, the lock must be acquired before storing the thread state pointer. + +-Why am I going on with so much detail about this? Because when threads are +-created from C, they don't have the global interpreter lock, nor is there a +-thread state data structure for them. Such threads must bootstrap themselves +-into existence, by first creating a thread state data structure, then acquiring +-the lock, and finally storing their thread state pointer, before they can start +-using the Python/C API. When they are done, they should reset the thread state +-pointer, release the lock, and finally free their thread state data structure. ++It is important to note that when threads are created from C, they don't have ++the global interpreter lock, nor is there a thread state data structure for ++them. Such threads must bootstrap themselves into existence, by first ++creating a thread state data structure, then acquiring the lock, and finally ++storing their thread state pointer, before they can start using the Python/C ++API. When they are done, they should reset the thread state pointer, release ++the lock, and finally free their thread state data structure. + + Beginning with version 2.3, threads can now take advantage of the + :cfunc:`PyGILState_\*` functions to do all of the above automatically. The +Index: Doc/c-api/string.rst +=================================================================== +--- Doc/c-api/string.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/string.rst (.../branches/release26-maint) (Revision 74094) +@@ -58,7 +58,11 @@ + *len* on success, and *NULL* on failure. If *v* is *NULL*, the contents of the + string are uninitialized. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *len*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyString_FromFormat(const char *format, ...) + + Take a C :cfunc:`printf`\ -style *format* string and a variable number of +@@ -132,12 +136,20 @@ + + Return the length of the string in string object *string*. + ++ .. versionchanged:: 2.5 ++ This function returned an :ctype:`int` type. This might require changes ++ in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: Py_ssize_t PyString_GET_SIZE(PyObject *string) + + Macro form of :cfunc:`PyString_Size` but without error checking. + ++ .. versionchanged:: 2.5 ++ This macro returned an :ctype:`int` type. This might require changes in ++ your code for properly supporting 64-bit systems. + ++ + .. cfunction:: char* PyString_AsString(PyObject *string) + + Return a NUL-terminated representation of the contents of *string*. The pointer +@@ -172,7 +184,11 @@ + *string* and operates on that. If *string* is not a string object at all, + :cfunc:`PyString_AsStringAndSize` returns ``-1`` and raises :exc:`TypeError`. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int *` type for *length*. This might ++ require changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: void PyString_Concat(PyObject **string, PyObject *newpart) + + Create a new string object in *\*string* containing the contents of *newpart* +@@ -200,6 +216,9 @@ + fails, the original string object at *\*string* is deallocated, *\*string* is + set to *NULL*, a memory exception is set, and ``-1`` is returned. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *newsize*. This might ++ require changes in your code for properly supporting 64-bit systems. + + .. cfunction:: PyObject* PyString_Format(PyObject *format, PyObject *args) + +@@ -236,7 +255,11 @@ + The codec to be used is looked up using the Python codec registry. Return + *NULL* if an exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyString_AsDecodedObject(PyObject *str, const char *encoding, const char *errors) + + Decode a string object by passing it to the codec registered for *encoding* and +@@ -254,7 +277,11 @@ + :meth:`encode` method. The codec to be used is looked up using the Python codec + registry. Return *NULL* if an exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyString_AsEncodedObject(PyObject *str, const char *encoding, const char *errors) + + Encode a string object using the codec registered for *encoding* and return the +Index: Doc/c-api/object.rst +=================================================================== +--- Doc/c-api/object.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/object.rst (.../branches/release26-maint) (Revision 74094) +@@ -351,7 +351,11 @@ + and mapping protocols, the sequence length is returned. On error, ``-1`` is + returned. This is the equivalent to the Python expression ``len(o)``. + ++ .. versionchanged:: 2.5 ++ These functions returned an :ctype:`int` type. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyObject_GetItem(PyObject *o, PyObject *key) + + Return element of *o* corresponding to the object *key* or *NULL* on failure. +Index: Doc/c-api/arg.rst +=================================================================== +--- Doc/c-api/arg.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/arg.rst (.../branches/release26-maint) (Revision 74094) +@@ -10,46 +10,48 @@ + :ref:`extending-index`. + + The first three of these functions described, :cfunc:`PyArg_ParseTuple`, +-:cfunc:`PyArg_ParseTupleAndKeywords`, and :cfunc:`PyArg_Parse`, all use *format +-strings* which are used to tell the function about the expected arguments. The +-format strings use the same syntax for each of these functions. ++:cfunc:`PyArg_ParseTupleAndKeywords`, and :cfunc:`PyArg_Parse`, all use ++*format strings* which are used to tell the function about the expected ++arguments. The format strings use the same syntax for each of these ++functions. + + A format string consists of zero or more "format units." A format unit +-describes one Python object; it is usually a single character or a parenthesized +-sequence of format units. With a few exceptions, a format unit that is not a +-parenthesized sequence normally corresponds to a single address argument to +-these functions. In the following description, the quoted form is the format +-unit; the entry in (round) parentheses is the Python object type that matches +-the format unit; and the entry in [square] brackets is the type of the C +-variable(s) whose address should be passed. ++describes one Python object; it is usually a single character or a ++parenthesized sequence of format units. With a few exceptions, a format unit ++that is not a parenthesized sequence normally corresponds to a single address ++argument to these functions. In the following description, the quoted form is ++the format unit; the entry in (round) parentheses is the Python object type ++that matches the format unit; and the entry in [square] brackets is the type ++of the C variable(s) whose address should be passed. + + ``s`` (string or Unicode object) [const char \*] +- Convert a Python string or Unicode object to a C pointer to a character string. +- You must not provide storage for the string itself; a pointer to an existing +- string is stored into the character pointer variable whose address you pass. +- The C string is NUL-terminated. The Python string must not contain embedded NUL +- bytes; if it does, a :exc:`TypeError` exception is raised. Unicode objects are +- converted to C strings using the default encoding. If this conversion fails, a +- :exc:`UnicodeError` is raised. ++ Convert a Python string or Unicode object to a C pointer to a character ++ string. You must not provide storage for the string itself; a pointer to ++ an existing string is stored into the character pointer variable whose ++ address you pass. The C string is NUL-terminated. The Python string must ++ not contain embedded NUL bytes; if it does, a :exc:`TypeError` exception is ++ raised. Unicode objects are converted to C strings using the default ++ encoding. If this conversion fails, a :exc:`UnicodeError` is raised. + + ``s#`` (string, Unicode or any read buffer compatible object) [const char \*, int (or :ctype:`Py_ssize_t`, see below)] +- This variant on ``s`` stores into two C variables, the first one a pointer to a +- character string, the second one its length. In this case the Python string may +- contain embedded null bytes. Unicode objects pass back a pointer to the default +- encoded string version of the object if such a conversion is possible. All +- other read-buffer compatible objects pass back a reference to the raw internal +- data representation. ++ This variant on ``s`` stores into two C variables, the first one a pointer ++ to a character string, the second one its length. In this case the Python ++ string may contain embedded null bytes. Unicode objects pass back a ++ pointer to the default encoded string version of the object if such a ++ conversion is possible. All other read-buffer compatible objects pass back ++ a reference to the raw internal data representation. + +- Starting with Python 2.5 the type of the length argument can be +- controlled by defining the macro :cmacro:`PY_SSIZE_T_CLEAN` before +- including :file:`Python.h`. If the macro is defined, length is a +- :ctype:`Py_ssize_t` rather than an int. ++ Starting with Python 2.5 the type of the length argument can be controlled ++ by defining the macro :cmacro:`PY_SSIZE_T_CLEAN` before including ++ :file:`Python.h`. If the macro is defined, length is a :ctype:`Py_ssize_t` ++ rather than an int. + + ``s*`` (string, Unicode, or any buffer compatible object) [Py_buffer \*] +- Similar to ``s#``, this code fills a Py_buffer structure provided by the caller. +- The buffer gets locked, so that the caller can subsequently use the buffer even +- inside a ``Py_BEGIN_ALLOW_THREADS`` block; the caller is responsible for calling +- ``PyBuffer_Release`` with the structure after it has processed the data. ++ Similar to ``s#``, this code fills a Py_buffer structure provided by the ++ caller. The buffer gets locked, so that the caller can subsequently use ++ the buffer even inside a ``Py_BEGIN_ALLOW_THREADS`` block; the caller is ++ responsible for calling ``PyBuffer_Release`` with the structure after it ++ has processed the data. + + .. versionadded:: 2.6 + +@@ -66,83 +68,86 @@ + .. versionadded:: 2.6 + + ``u`` (Unicode object) [Py_UNICODE \*] +- Convert a Python Unicode object to a C pointer to a NUL-terminated buffer of +- 16-bit Unicode (UTF-16) data. As with ``s``, there is no need to provide +- storage for the Unicode data buffer; a pointer to the existing Unicode data is +- stored into the :ctype:`Py_UNICODE` pointer variable whose address you pass. ++ Convert a Python Unicode object to a C pointer to a NUL-terminated buffer ++ of 16-bit Unicode (UTF-16) data. As with ``s``, there is no need to ++ provide storage for the Unicode data buffer; a pointer to the existing ++ Unicode data is stored into the :ctype:`Py_UNICODE` pointer variable whose ++ address you pass. + + ``u#`` (Unicode object) [Py_UNICODE \*, int] +- This variant on ``u`` stores into two C variables, the first one a pointer to a +- Unicode data buffer, the second one its length. Non-Unicode objects are handled +- by interpreting their read-buffer pointer as pointer to a :ctype:`Py_UNICODE` +- array. ++ This variant on ``u`` stores into two C variables, the first one a pointer ++ to a Unicode data buffer, the second one its length. Non-Unicode objects ++ are handled by interpreting their read-buffer pointer as pointer to a ++ :ctype:`Py_UNICODE` array. + + ``es`` (string, Unicode object or character buffer compatible object) [const char \*encoding, char \*\*buffer] +- This variant on ``s`` is used for encoding Unicode and objects convertible to +- Unicode into a character buffer. It only works for encoded data without embedded +- NUL bytes. ++ This variant on ``s`` is used for encoding Unicode and objects convertible ++ to Unicode into a character buffer. It only works for encoded data without ++ embedded NUL bytes. + + This format requires two arguments. The first is only used as input, and +- must be a :ctype:`const char\*` which points to the name of an encoding as a +- NUL-terminated string, or *NULL*, in which case the default encoding is used. +- An exception is raised if the named encoding is not known to Python. The +- second argument must be a :ctype:`char\*\*`; the value of the pointer it +- references will be set to a buffer with the contents of the argument text. +- The text will be encoded in the encoding specified by the first argument. ++ must be a :ctype:`const char\*` which points to the name of an encoding as ++ a NUL-terminated string, or *NULL*, in which case the default encoding is ++ used. An exception is raised if the named encoding is not known to Python. ++ The second argument must be a :ctype:`char\*\*`; the value of the pointer ++ it references will be set to a buffer with the contents of the argument ++ text. The text will be encoded in the encoding specified by the first ++ argument. + +- :cfunc:`PyArg_ParseTuple` will allocate a buffer of the needed size, copy the +- encoded data into this buffer and adjust *\*buffer* to reference the newly +- allocated storage. The caller is responsible for calling :cfunc:`PyMem_Free` to +- free the allocated buffer after use. ++ :cfunc:`PyArg_ParseTuple` will allocate a buffer of the needed size, copy ++ the encoded data into this buffer and adjust *\*buffer* to reference the ++ newly allocated storage. The caller is responsible for calling ++ :cfunc:`PyMem_Free` to free the allocated buffer after use. + + ``et`` (string, Unicode object or character buffer compatible object) [const char \*encoding, char \*\*buffer] + Same as ``es`` except that 8-bit string objects are passed through without +- recoding them. Instead, the implementation assumes that the string object uses +- the encoding passed in as parameter. ++ recoding them. Instead, the implementation assumes that the string object ++ uses the encoding passed in as parameter. + + ``es#`` (string, Unicode object or character buffer compatible object) [const char \*encoding, char \*\*buffer, int \*buffer_length] +- This variant on ``s#`` is used for encoding Unicode and objects convertible to +- Unicode into a character buffer. Unlike the ``es`` format, this variant allows +- input data which contains NUL characters. ++ This variant on ``s#`` is used for encoding Unicode and objects convertible ++ to Unicode into a character buffer. Unlike the ``es`` format, this variant ++ allows input data which contains NUL characters. + +- It requires three arguments. The first is only used as input, and must be a +- :ctype:`const char\*` which points to the name of an encoding as a +- NUL-terminated string, or *NULL*, in which case the default encoding is used. +- An exception is raised if the named encoding is not known to Python. The +- second argument must be a :ctype:`char\*\*`; the value of the pointer it +- references will be set to a buffer with the contents of the argument text. +- The text will be encoded in the encoding specified by the first argument. +- The third argument must be a pointer to an integer; the referenced integer +- will be set to the number of bytes in the output buffer. ++ It requires three arguments. The first is only used as input, and must be ++ a :ctype:`const char\*` which points to the name of an encoding as a ++ NUL-terminated string, or *NULL*, in which case the default encoding is ++ used. An exception is raised if the named encoding is not known to Python. ++ The second argument must be a :ctype:`char\*\*`; the value of the pointer ++ it references will be set to a buffer with the contents of the argument ++ text. The text will be encoded in the encoding specified by the first ++ argument. The third argument must be a pointer to an integer; the ++ referenced integer will be set to the number of bytes in the output buffer. + + There are two modes of operation: + +- If *\*buffer* points a *NULL* pointer, the function will allocate a buffer of +- the needed size, copy the encoded data into this buffer and set *\*buffer* to +- reference the newly allocated storage. The caller is responsible for calling +- :cfunc:`PyMem_Free` to free the allocated buffer after usage. ++ If *\*buffer* points a *NULL* pointer, the function will allocate a buffer ++ of the needed size, copy the encoded data into this buffer and set ++ *\*buffer* to reference the newly allocated storage. The caller is ++ responsible for calling :cfunc:`PyMem_Free` to free the allocated buffer ++ after usage. + + If *\*buffer* points to a non-*NULL* pointer (an already allocated buffer), +- :cfunc:`PyArg_ParseTuple` will use this location as the buffer and interpret the +- initial value of *\*buffer_length* as the buffer size. It will then copy the +- encoded data into the buffer and NUL-terminate it. If the buffer is not large +- enough, a :exc:`ValueError` will be set. ++ :cfunc:`PyArg_ParseTuple` will use this location as the buffer and ++ interpret the initial value of *\*buffer_length* as the buffer size. It ++ will then copy the encoded data into the buffer and NUL-terminate it. If ++ the buffer is not large enough, a :exc:`ValueError` will be set. + + In both cases, *\*buffer_length* is set to the length of the encoded data + without the trailing NUL byte. + + ``et#`` (string, Unicode object or character buffer compatible object) [const char \*encoding, char \*\*buffer] +- Same as ``es#`` except that string objects are passed through without recoding +- them. Instead, the implementation assumes that the string object uses the +- encoding passed in as parameter. ++ Same as ``es#`` except that string objects are passed through without ++ recoding them. Instead, the implementation assumes that the string object ++ uses the encoding passed in as parameter. + + ``b`` (integer) [unsigned char] + Convert a nonnegative Python integer to an unsigned tiny int, stored in a C + :ctype:`unsigned char`. + + ``B`` (integer) [unsigned char] +- Convert a Python integer to a tiny int without overflow checking, stored in a C +- :ctype:`unsigned char`. ++ Convert a Python integer to a tiny int without overflow checking, stored in ++ a C :ctype:`unsigned char`. + + .. versionadded:: 2.3 + +@@ -150,8 +155,8 @@ + Convert a Python integer to a C :ctype:`short int`. + + ``H`` (integer) [unsigned short int] +- Convert a Python integer to a C :ctype:`unsigned short int`, without overflow +- checking. ++ Convert a Python integer to a C :ctype:`unsigned short int`, without ++ overflow checking. + + .. versionadded:: 2.3 + +@@ -168,20 +173,21 @@ + Convert a Python integer to a C :ctype:`long int`. + + ``k`` (integer) [unsigned long] +- Convert a Python integer or long integer to a C :ctype:`unsigned long` without +- overflow checking. ++ Convert a Python integer or long integer to a C :ctype:`unsigned long` ++ without overflow checking. + + .. versionadded:: 2.3 + + ``L`` (integer) [PY_LONG_LONG] + Convert a Python integer to a C :ctype:`long long`. This format is only +- available on platforms that support :ctype:`long long` (or :ctype:`_int64` on +- Windows). ++ available on platforms that support :ctype:`long long` (or :ctype:`_int64` ++ on Windows). + + ``K`` (integer) [unsigned PY_LONG_LONG] + Convert a Python integer or long integer to a C :ctype:`unsigned long long` + without overflow checking. This format is only available on platforms that +- support :ctype:`unsigned long long` (or :ctype:`unsigned _int64` on Windows). ++ support :ctype:`unsigned long long` (or :ctype:`unsigned _int64` on ++ Windows). + + .. versionadded:: 2.3 + +@@ -204,60 +210,61 @@ + Convert a Python complex number to a C :ctype:`Py_complex` structure. + + ``O`` (object) [PyObject \*] +- Store a Python object (without any conversion) in a C object pointer. The C +- program thus receives the actual object that was passed. The object's reference +- count is not increased. The pointer stored is not *NULL*. ++ Store a Python object (without any conversion) in a C object pointer. The ++ C program thus receives the actual object that was passed. The object's ++ reference count is not increased. The pointer stored is not *NULL*. + + ``O!`` (object) [*typeobject*, PyObject \*] + Store a Python object in a C object pointer. This is similar to ``O``, but +- takes two C arguments: the first is the address of a Python type object, the +- second is the address of the C variable (of type :ctype:`PyObject\*`) into which +- the object pointer is stored. If the Python object does not have the required +- type, :exc:`TypeError` is raised. ++ takes two C arguments: the first is the address of a Python type object, ++ the second is the address of the C variable (of type :ctype:`PyObject\*`) ++ into which the object pointer is stored. If the Python object does not ++ have the required type, :exc:`TypeError` is raised. + + ``O&`` (object) [*converter*, *anything*] +- Convert a Python object to a C variable through a *converter* function. This +- takes two arguments: the first is a function, the second is the address of a C +- variable (of arbitrary type), converted to :ctype:`void \*`. The *converter* +- function in turn is called as follows:: ++ Convert a Python object to a C variable through a *converter* function. ++ This takes two arguments: the first is a function, the second is the ++ address of a C variable (of arbitrary type), converted to :ctype:`void \*`. ++ The *converter* function in turn is called as follows:: + + status = converter(object, address); + + where *object* is the Python object to be converted and *address* is the +- :ctype:`void\*` argument that was passed to the :cfunc:`PyArg_Parse\*` function. +- The returned *status* should be ``1`` for a successful conversion and ``0`` if +- the conversion has failed. When the conversion fails, the *converter* function +- should raise an exception and leave the content of *address* unmodified. ++ :ctype:`void\*` argument that was passed to the :cfunc:`PyArg_Parse\*` ++ function. The returned *status* should be ``1`` for a successful ++ conversion and ``0`` if the conversion has failed. When the conversion ++ fails, the *converter* function should raise an exception and leave the ++ content of *address* unmodified. + + ``S`` (string) [PyStringObject \*] + Like ``O`` but requires that the Python object is a string object. Raises +- :exc:`TypeError` if the object is not a string object. The C variable may also +- be declared as :ctype:`PyObject\*`. ++ :exc:`TypeError` if the object is not a string object. The C variable may ++ also be declared as :ctype:`PyObject\*`. + + ``U`` (Unicode string) [PyUnicodeObject \*] + Like ``O`` but requires that the Python object is a Unicode object. Raises +- :exc:`TypeError` if the object is not a Unicode object. The C variable may also +- be declared as :ctype:`PyObject\*`. ++ :exc:`TypeError` if the object is not a Unicode object. The C variable may ++ also be declared as :ctype:`PyObject\*`. + + ``t#`` (read-only character buffer) [char \*, int] + Like ``s#``, but accepts any object which implements the read-only buffer +- interface. The :ctype:`char\*` variable is set to point to the first byte of +- the buffer, and the :ctype:`int` is set to the length of the buffer. Only +- single-segment buffer objects are accepted; :exc:`TypeError` is raised for all +- others. ++ interface. The :ctype:`char\*` variable is set to point to the first byte ++ of the buffer, and the :ctype:`int` is set to the length of the buffer. ++ Only single-segment buffer objects are accepted; :exc:`TypeError` is raised ++ for all others. + + ``w`` (read-write character buffer) [char \*] +- Similar to ``s``, but accepts any object which implements the read-write buffer +- interface. The caller must determine the length of the buffer by other means, +- or use ``w#`` instead. Only single-segment buffer objects are accepted; +- :exc:`TypeError` is raised for all others. ++ Similar to ``s``, but accepts any object which implements the read-write ++ buffer interface. The caller must determine the length of the buffer by ++ other means, or use ``w#`` instead. Only single-segment buffer objects are ++ accepted; :exc:`TypeError` is raised for all others. + + ``w#`` (read-write character buffer) [char \*, Py_ssize_t] + Like ``s#``, but accepts any object which implements the read-write buffer +- interface. The :ctype:`char \*` variable is set to point to the first byte of +- the buffer, and the :ctype:`int` is set to the length of the buffer. Only +- single-segment buffer objects are accepted; :exc:`TypeError` is raised for all +- others. ++ interface. The :ctype:`char \*` variable is set to point to the first byte ++ of the buffer, and the :ctype:`Py_ssize_t` is set to the length of the ++ buffer. Only single-segment buffer objects are accepted; :exc:`TypeError` ++ is raised for all others. + + ``w*`` (read-write byte-oriented buffer) [Py_buffer \*] + This is to ``w`` what ``s*`` is to ``s``. +@@ -265,72 +272,72 @@ + .. versionadded:: 2.6 + + ``(items)`` (tuple) [*matching-items*] +- The object must be a Python sequence whose length is the number of format units +- in *items*. The C arguments must correspond to the individual format units in +- *items*. Format units for sequences may be nested. ++ The object must be a Python sequence whose length is the number of format ++ units in *items*. The C arguments must correspond to the individual format ++ units in *items*. Format units for sequences may be nested. + + .. note:: + +- Prior to Python version 1.5.2, this format specifier only accepted a tuple +- containing the individual parameters, not an arbitrary sequence. Code which +- previously caused :exc:`TypeError` to be raised here may now proceed without an +- exception. This is not expected to be a problem for existing code. ++ Prior to Python version 1.5.2, this format specifier only accepted a ++ tuple containing the individual parameters, not an arbitrary sequence. ++ Code which previously caused :exc:`TypeError` to be raised here may now ++ proceed without an exception. This is not expected to be a problem for ++ existing code. + + It is possible to pass Python long integers where integers are requested; + however no proper range checking is done --- the most significant bits are + silently truncated when the receiving field is too small to receive the value +-(actually, the semantics are inherited from downcasts in C --- your mileage may +-vary). ++(actually, the semantics are inherited from downcasts in C --- your mileage ++may vary). + + A few other characters have a meaning in a format string. These may not occur + inside nested parentheses. They are: + + ``|`` +- Indicates that the remaining arguments in the Python argument list are optional. +- The C variables corresponding to optional arguments should be initialized to +- their default value --- when an optional argument is not specified, +- :cfunc:`PyArg_ParseTuple` does not touch the contents of the corresponding C +- variable(s). ++ Indicates that the remaining arguments in the Python argument list are ++ optional. The C variables corresponding to optional arguments should be ++ initialized to their default value --- when an optional argument is not ++ specified, :cfunc:`PyArg_ParseTuple` does not touch the contents of the ++ corresponding C variable(s). + + ``:`` +- The list of format units ends here; the string after the colon is used as the +- function name in error messages (the "associated value" of the exception that +- :cfunc:`PyArg_ParseTuple` raises). ++ The list of format units ends here; the string after the colon is used as ++ the function name in error messages (the "associated value" of the ++ exception that :cfunc:`PyArg_ParseTuple` raises). + + ``;`` +- The list of format units ends here; the string after the semicolon is used as +- the error message *instead* of the default error message. ``:`` and ``;`` +- mutually exclude each other. ++ The list of format units ends here; the string after the semicolon is used ++ as the error message *instead* of the default error message. ``:`` and ++ ``;`` mutually exclude each other. + + Note that any Python object references which are provided to the caller are + *borrowed* references; do not decrement their reference count! + + Additional arguments passed to these functions must be addresses of variables + whose type is determined by the format string; these are used to store values +-from the input tuple. There are a few cases, as described in the list of format +-units above, where these parameters are used as input values; they should match +-what is specified for the corresponding format unit in that case. ++from the input tuple. There are a few cases, as described in the list of ++format units above, where these parameters are used as input values; they ++should match what is specified for the corresponding format unit in that case. + +-For the conversion to succeed, the *arg* object must match the format +-and the format must be exhausted. On success, the +-:cfunc:`PyArg_Parse\*` functions return true, otherwise they return +-false and raise an appropriate exception. When the +-:cfunc:`PyArg_Parse\*` functions fail due to conversion failure in one +-of the format units, the variables at the addresses corresponding to that ++For the conversion to succeed, the *arg* object must match the format and the ++format must be exhausted. On success, the :cfunc:`PyArg_Parse\*` functions ++return true, otherwise they return false and raise an appropriate exception. ++When the :cfunc:`PyArg_Parse\*` functions fail due to conversion failure in ++one of the format units, the variables at the addresses corresponding to that + and the following format units are left untouched. + + + .. cfunction:: int PyArg_ParseTuple(PyObject *args, const char *format, ...) + +- Parse the parameters of a function that takes only positional parameters into +- local variables. Returns true on success; on failure, it returns false and +- raises the appropriate exception. ++ Parse the parameters of a function that takes only positional parameters ++ into local variables. Returns true on success; on failure, it returns ++ false and raises the appropriate exception. + + + .. cfunction:: int PyArg_VaParse(PyObject *args, const char *format, va_list vargs) + +- Identical to :cfunc:`PyArg_ParseTuple`, except that it accepts a va_list rather +- than a variable number of arguments. ++ Identical to :cfunc:`PyArg_ParseTuple`, except that it accepts a va_list ++ rather than a variable number of arguments. + + + .. cfunction:: int PyArg_ParseTupleAndKeywords(PyObject *args, PyObject *kw, const char *format, char *keywords[], ...) +@@ -348,32 +355,33 @@ + + .. cfunction:: int PyArg_Parse(PyObject *args, const char *format, ...) + +- Function used to deconstruct the argument lists of "old-style" functions --- +- these are functions which use the :const:`METH_OLDARGS` parameter parsing +- method. This is not recommended for use in parameter parsing in new code, and +- most code in the standard interpreter has been modified to no longer use this +- for that purpose. It does remain a convenient way to decompose other tuples, +- however, and may continue to be used for that purpose. ++ Function used to deconstruct the argument lists of "old-style" functions ++ --- these are functions which use the :const:`METH_OLDARGS` parameter ++ parsing method. This is not recommended for use in parameter parsing in ++ new code, and most code in the standard interpreter has been modified to no ++ longer use this for that purpose. It does remain a convenient way to ++ decompose other tuples, however, and may continue to be used for that ++ purpose. + + + .. cfunction:: int PyArg_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, ...) + + A simpler form of parameter retrieval which does not use a format string to +- specify the types of the arguments. Functions which use this method to retrieve +- their parameters should be declared as :const:`METH_VARARGS` in function or +- method tables. The tuple containing the actual parameters should be passed as +- *args*; it must actually be a tuple. The length of the tuple must be at least +- *min* and no more than *max*; *min* and *max* may be equal. Additional +- arguments must be passed to the function, each of which should be a pointer to a +- :ctype:`PyObject\*` variable; these will be filled in with the values from +- *args*; they will contain borrowed references. The variables which correspond +- to optional parameters not given by *args* will not be filled in; these should +- be initialized by the caller. This function returns true on success and false if +- *args* is not a tuple or contains the wrong number of elements; an exception +- will be set if there was a failure. ++ specify the types of the arguments. Functions which use this method to ++ retrieve their parameters should be declared as :const:`METH_VARARGS` in ++ function or method tables. The tuple containing the actual parameters ++ should be passed as *args*; it must actually be a tuple. The length of the ++ tuple must be at least *min* and no more than *max*; *min* and *max* may be ++ equal. Additional arguments must be passed to the function, each of which ++ should be a pointer to a :ctype:`PyObject\*` variable; these will be filled ++ in with the values from *args*; they will contain borrowed references. The ++ variables which correspond to optional parameters not given by *args* will ++ not be filled in; these should be initialized by the caller. This function ++ returns true on success and false if *args* is not a tuple or contains the ++ wrong number of elements; an exception will be set if there was a failure. + +- This is an example of the use of this function, taken from the sources for the +- :mod:`_weakref` helper module for weak references:: ++ This is an example of the use of this function, taken from the sources for ++ the :mod:`_weakref` helper module for weak references:: + + static PyObject * + weakref_ref(PyObject *self, PyObject *args) +@@ -388,50 +396,56 @@ + return result; + } + +- The call to :cfunc:`PyArg_UnpackTuple` in this example is entirely equivalent to +- this call to :cfunc:`PyArg_ParseTuple`:: ++ The call to :cfunc:`PyArg_UnpackTuple` in this example is entirely ++ equivalent to this call to :cfunc:`PyArg_ParseTuple`:: + + PyArg_ParseTuple(args, "O|O:ref", &object, &callback) + + .. versionadded:: 2.2 + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *min* and *max*. This might ++ require changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* Py_BuildValue(const char *format, ...) + +- Create a new value based on a format string similar to those accepted by the +- :cfunc:`PyArg_Parse\*` family of functions and a sequence of values. Returns +- the value or *NULL* in the case of an error; an exception will be raised if +- *NULL* is returned. ++ Create a new value based on a format string similar to those accepted by ++ the :cfunc:`PyArg_Parse\*` family of functions and a sequence of values. ++ Returns the value or *NULL* in the case of an error; an exception will be ++ raised if *NULL* is returned. + +- :cfunc:`Py_BuildValue` does not always build a tuple. It builds a tuple only if +- its format string contains two or more format units. If the format string is +- empty, it returns ``None``; if it contains exactly one format unit, it returns +- whatever object is described by that format unit. To force it to return a tuple +- of size 0 or one, parenthesize the format string. ++ :cfunc:`Py_BuildValue` does not always build a tuple. It builds a tuple ++ only if its format string contains two or more format units. If the format ++ string is empty, it returns ``None``; if it contains exactly one format ++ unit, it returns whatever object is described by that format unit. To ++ force it to return a tuple of size 0 or one, parenthesize the format ++ string. + +- When memory buffers are passed as parameters to supply data to build objects, as +- for the ``s`` and ``s#`` formats, the required data is copied. Buffers provided +- by the caller are never referenced by the objects created by +- :cfunc:`Py_BuildValue`. In other words, if your code invokes :cfunc:`malloc` +- and passes the allocated memory to :cfunc:`Py_BuildValue`, your code is +- responsible for calling :cfunc:`free` for that memory once ++ When memory buffers are passed as parameters to supply data to build ++ objects, as for the ``s`` and ``s#`` formats, the required data is copied. ++ Buffers provided by the caller are never referenced by the objects created ++ by :cfunc:`Py_BuildValue`. In other words, if your code invokes ++ :cfunc:`malloc` and passes the allocated memory to :cfunc:`Py_BuildValue`, ++ your code is responsible for calling :cfunc:`free` for that memory once + :cfunc:`Py_BuildValue` returns. + +- In the following description, the quoted form is the format unit; the entry in +- (round) parentheses is the Python object type that the format unit will return; +- and the entry in [square] brackets is the type of the C value(s) to be passed. ++ In the following description, the quoted form is the format unit; the entry ++ in (round) parentheses is the Python object type that the format unit will ++ return; and the entry in [square] brackets is the type of the C value(s) to ++ be passed. + +- The characters space, tab, colon and comma are ignored in format strings (but +- not within format units such as ``s#``). This can be used to make long format +- strings a tad more readable. ++ The characters space, tab, colon and comma are ignored in format strings ++ (but not within format units such as ``s#``). This can be used to make ++ long format strings a tad more readable. + + ``s`` (string) [char \*] +- Convert a null-terminated C string to a Python object. If the C string pointer +- is *NULL*, ``None`` is used. ++ Convert a null-terminated C string to a Python object. If the C string ++ pointer is *NULL*, ``None`` is used. + + ``s#`` (string) [char \*, int] +- Convert a C string and its length to a Python object. If the C string pointer +- is *NULL*, the length is ignored and ``None`` is returned. ++ Convert a C string and its length to a Python object. If the C string ++ pointer is *NULL*, the length is ignored and ``None`` is returned. + + ``z`` (string or ``None``) [char \*] + Same as ``s``. +@@ -440,13 +454,14 @@ + Same as ``s#``. + + ``u`` (Unicode string) [Py_UNICODE \*] +- Convert a null-terminated buffer of Unicode (UCS-2 or UCS-4) data to a Python +- Unicode object. If the Unicode buffer pointer is *NULL*, ``None`` is returned. ++ Convert a null-terminated buffer of Unicode (UCS-2 or UCS-4) data to a ++ Python Unicode object. If the Unicode buffer pointer is *NULL*, ++ ``None`` is returned. + + ``u#`` (Unicode string) [Py_UNICODE \*, int] +- Convert a Unicode (UCS-2 or UCS-4) data buffer and its length to a Python +- Unicode object. If the Unicode buffer pointer is *NULL*, the length is ignored +- and ``None`` is returned. ++ Convert a Unicode (UCS-2 or UCS-4) data buffer and its length to a ++ Python Unicode object. If the Unicode buffer pointer is *NULL*, the ++ length is ignored and ``None`` is returned. + + ``i`` (integer) [int] + Convert a plain C :ctype:`int` to a Python integer object. +@@ -467,20 +482,20 @@ + Convert a C :ctype:`unsigned short int` to a Python integer object. + + ``I`` (integer/long) [unsigned int] +- Convert a C :ctype:`unsigned int` to a Python integer object or a Python long +- integer object, if it is larger than ``sys.maxint``. ++ Convert a C :ctype:`unsigned int` to a Python integer object or a Python ++ long integer object, if it is larger than ``sys.maxint``. + + ``k`` (integer/long) [unsigned long] +- Convert a C :ctype:`unsigned long` to a Python integer object or a Python long +- integer object, if it is larger than ``sys.maxint``. ++ Convert a C :ctype:`unsigned long` to a Python integer object or a ++ Python long integer object, if it is larger than ``sys.maxint``. + + ``L`` (long) [PY_LONG_LONG] +- Convert a C :ctype:`long long` to a Python long integer object. Only available +- on platforms that support :ctype:`long long`. ++ Convert a C :ctype:`long long` to a Python long integer object. Only ++ available on platforms that support :ctype:`long long`. + + ``K`` (long) [unsigned PY_LONG_LONG] +- Convert a C :ctype:`unsigned long long` to a Python long integer object. Only +- available on platforms that support :ctype:`unsigned long long`. ++ Convert a C :ctype:`unsigned long long` to a Python long integer object. ++ Only available on platforms that support :ctype:`unsigned long long`. + + ``n`` (int) [Py_ssize_t] + Convert a C :ctype:`Py_ssize_t` to a Python integer or long integer. +@@ -488,8 +503,8 @@ + .. versionadded:: 2.5 + + ``c`` (string of length 1) [char] +- Convert a C :ctype:`int` representing a character to a Python string of length +- 1. ++ Convert a C :ctype:`int` representing a character to a Python string of ++ length 1. + + ``d`` (float) [double] + Convert a C :ctype:`double` to a Python floating point number. +@@ -502,39 +517,41 @@ + + ``O`` (object) [PyObject \*] + Pass a Python object untouched (except for its reference count, which is +- incremented by one). If the object passed in is a *NULL* pointer, it is assumed +- that this was caused because the call producing the argument found an error and +- set an exception. Therefore, :cfunc:`Py_BuildValue` will return *NULL* but won't +- raise an exception. If no exception has been raised yet, :exc:`SystemError` is +- set. ++ incremented by one). If the object passed in is a *NULL* pointer, it is ++ assumed that this was caused because the call producing the argument ++ found an error and set an exception. Therefore, :cfunc:`Py_BuildValue` ++ will return *NULL* but won't raise an exception. If no exception has ++ been raised yet, :exc:`SystemError` is set. + + ``S`` (object) [PyObject \*] + Same as ``O``. + + ``N`` (object) [PyObject \*] +- Same as ``O``, except it doesn't increment the reference count on the object. +- Useful when the object is created by a call to an object constructor in the +- argument list. ++ Same as ``O``, except it doesn't increment the reference count on the ++ object. Useful when the object is created by a call to an object ++ constructor in the argument list. + + ``O&`` (object) [*converter*, *anything*] +- Convert *anything* to a Python object through a *converter* function. The +- function is called with *anything* (which should be compatible with :ctype:`void +- \*`) as its argument and should return a "new" Python object, or *NULL* if an +- error occurred. ++ Convert *anything* to a Python object through a *converter* function. ++ The function is called with *anything* (which should be compatible with ++ :ctype:`void \*`) as its argument and should return a "new" Python ++ object, or *NULL* if an error occurred. + + ``(items)`` (tuple) [*matching-items*] +- Convert a sequence of C values to a Python tuple with the same number of items. ++ Convert a sequence of C values to a Python tuple with the same number of ++ items. + + ``[items]`` (list) [*matching-items*] +- Convert a sequence of C values to a Python list with the same number of items. ++ Convert a sequence of C values to a Python list with the same number of ++ items. + + ``{items}`` (dictionary) [*matching-items*] +- Convert a sequence of C values to a Python dictionary. Each pair of consecutive +- C values adds one item to the dictionary, serving as key and value, +- respectively. ++ Convert a sequence of C values to a Python dictionary. Each pair of ++ consecutive C values adds one item to the dictionary, serving as key and ++ value, respectively. + +- If there is an error in the format string, the :exc:`SystemError` exception is +- set and *NULL* returned. ++ If there is an error in the format string, the :exc:`SystemError` exception ++ is set and *NULL* returned. + + .. cfunction:: PyObject* Py_VaBuildValue(const char *format, va_list vargs) + +Index: Doc/c-api/typeobj.rst +=================================================================== +--- Doc/c-api/typeobj.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/typeobj.rst (.../branches/release26-maint) (Revision 74094) +@@ -64,7 +64,11 @@ + + This field is not inherited by subtypes. + ++ .. versionchanged:: 2.5 ++ This field used to be an :ctype:`int` type. This might require changes ++ in your code for properly supporting 64-bit systems. + ++ + .. cmember:: PyTypeObject* PyObject.ob_type + + This is the type's type, in other words its metatype. It is initialized by the +Index: Doc/c-api/type.rst +=================================================================== +--- Doc/c-api/type.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/type.rst (.../branches/release26-maint) (Revision 74094) +@@ -76,7 +76,11 @@ + + .. versionadded:: 2.2 + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *nitems*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyType_GenericNew(PyTypeObject *type, PyObject *args, PyObject *kwds) + + .. versionadded:: 2.2 +Index: Doc/c-api/dict.rst +=================================================================== +--- Doc/c-api/dict.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/dict.rst (.../branches/release26-maint) (Revision 74094) +@@ -19,8 +19,9 @@ + single: DictType (in module types) + single: DictionaryType (in module types) + +- This instance of :ctype:`PyTypeObject` represents the Python dictionary type. +- This is exposed to Python programs as ``dict`` and ``types.DictType``. ++ This instance of :ctype:`PyTypeObject` represents the Python dictionary ++ type. This is exposed to Python programs as ``dict`` and ++ ``types.DictType``. + + + .. cfunction:: int PyDict_Check(PyObject *p) +@@ -34,8 +35,8 @@ + + .. cfunction:: int PyDict_CheckExact(PyObject *p) + +- Return true if *p* is a dict object, but not an instance of a subtype of the +- dict type. ++ Return true if *p* is a dict object, but not an instance of a subtype of ++ the dict type. + + .. versionadded:: 2.4 + +@@ -47,9 +48,9 @@ + + .. cfunction:: PyObject* PyDictProxy_New(PyObject *dict) + +- Return a proxy object for a mapping which enforces read-only behavior. This is +- normally used to create a proxy to prevent modification of the dictionary for +- non-dynamic class types. ++ Return a proxy object for a mapping which enforces read-only behavior. ++ This is normally used to create a proxy to prevent modification of the ++ dictionary for non-dynamic class types. + + .. versionadded:: 2.2 + +@@ -61,9 +62,9 @@ + + .. cfunction:: int PyDict_Contains(PyObject *p, PyObject *key) + +- Determine if dictionary *p* contains *key*. If an item in *p* is matches *key*, +- return ``1``, otherwise return ``0``. On error, return ``-1``. This is +- equivalent to the Python expression ``key in p``. ++ Determine if dictionary *p* contains *key*. If an item in *p* is matches ++ *key*, return ``1``, otherwise return ``0``. On error, return ``-1``. ++ This is equivalent to the Python expression ``key in p``. + + .. versionadded:: 2.4 + +@@ -78,24 +79,25 @@ + .. cfunction:: int PyDict_SetItem(PyObject *p, PyObject *key, PyObject *val) + + Insert *value* into the dictionary *p* with a key of *key*. *key* must be +- :term:`hashable`; if it isn't, :exc:`TypeError` will be raised. Return ``0`` +- on success or ``-1`` on failure. ++ :term:`hashable`; if it isn't, :exc:`TypeError` will be raised. Return ++ ``0`` on success or ``-1`` on failure. + + + .. cfunction:: int PyDict_SetItemString(PyObject *p, const char *key, PyObject *val) + + .. index:: single: PyString_FromString() + +- Insert *value* into the dictionary *p* using *key* as a key. *key* should be a +- :ctype:`char\*`. The key object is created using ``PyString_FromString(key)``. +- Return ``0`` on success or ``-1`` on failure. ++ Insert *value* into the dictionary *p* using *key* as a key. *key* should ++ be a :ctype:`char\*`. The key object is created using ++ ``PyString_FromString(key)``. Return ``0`` on success or ``-1`` on ++ failure. + + + .. cfunction:: int PyDict_DelItem(PyObject *p, PyObject *key) + +- Remove the entry in dictionary *p* with key *key*. *key* must be hashable; if it +- isn't, :exc:`TypeError` is raised. Return ``0`` on success or ``-1`` on +- failure. ++ Remove the entry in dictionary *p* with key *key*. *key* must be hashable; ++ if it isn't, :exc:`TypeError` is raised. Return ``0`` on success or ``-1`` ++ on failure. + + + .. cfunction:: int PyDict_DelItemString(PyObject *p, char *key) +@@ -106,8 +108,8 @@ + + .. cfunction:: PyObject* PyDict_GetItem(PyObject *p, PyObject *key) + +- Return the object from dictionary *p* which has a key *key*. Return *NULL* if +- the key *key* is not present, but *without* setting an exception. ++ Return the object from dictionary *p* which has a key *key*. Return *NULL* ++ if the key *key* is not present, but *without* setting an exception. + + + .. cfunction:: PyObject* PyDict_GetItemString(PyObject *p, const char *key) +@@ -118,41 +120,46 @@ + + .. cfunction:: PyObject* PyDict_Items(PyObject *p) + +- Return a :ctype:`PyListObject` containing all the items from the dictionary, as +- in the dictionary method :meth:`dict.items`. ++ Return a :ctype:`PyListObject` containing all the items from the ++ dictionary, as in the dictionary method :meth:`dict.items`. + + + .. cfunction:: PyObject* PyDict_Keys(PyObject *p) + +- Return a :ctype:`PyListObject` containing all the keys from the dictionary, as +- in the dictionary method :meth:`dict.keys`. ++ Return a :ctype:`PyListObject` containing all the keys from the dictionary, ++ as in the dictionary method :meth:`dict.keys`. + + + .. cfunction:: PyObject* PyDict_Values(PyObject *p) + +- Return a :ctype:`PyListObject` containing all the values from the dictionary +- *p*, as in the dictionary method :meth:`dict.values`. ++ Return a :ctype:`PyListObject` containing all the values from the ++ dictionary *p*, as in the dictionary method :meth:`dict.values`. + + + .. cfunction:: Py_ssize_t PyDict_Size(PyObject *p) + + .. index:: builtin: len + +- Return the number of items in the dictionary. This is equivalent to ``len(p)`` +- on a dictionary. ++ Return the number of items in the dictionary. This is equivalent to ++ ``len(p)`` on a dictionary. + ++ .. versionchanged:: 2.5 ++ This function returned an :ctype:`int` type. This might require changes ++ in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PyDict_Next(PyObject *p, Py_ssize_t *ppos, PyObject **pkey, PyObject **pvalue) + +- Iterate over all key-value pairs in the dictionary *p*. The :ctype:`int` +- referred to by *ppos* must be initialized to ``0`` prior to the first call to +- this function to start the iteration; the function returns true for each pair in +- the dictionary, and false once all pairs have been reported. The parameters +- *pkey* and *pvalue* should either point to :ctype:`PyObject\*` variables that +- will be filled in with each key and value, respectively, or may be *NULL*. Any +- references returned through them are borrowed. *ppos* should not be altered +- during iteration. Its value represents offsets within the internal dictionary +- structure, and since the structure is sparse, the offsets are not consecutive. ++ Iterate over all key-value pairs in the dictionary *p*. The ++ :ctype:`Py_ssize_t` referred to by *ppos* must be initialized to ``0`` ++ prior to the first call to this function to start the iteration; the ++ function returns true for each pair in the dictionary, and false once all ++ pairs have been reported. The parameters *pkey* and *pvalue* should either ++ point to :ctype:`PyObject\*` variables that will be filled in with each key ++ and value, respectively, or may be *NULL*. Any references returned through ++ them are borrowed. *ppos* should not be altered during iteration. Its ++ value represents offsets within the internal dictionary structure, and ++ since the structure is sparse, the offsets are not consecutive. + + For example:: + +@@ -164,9 +171,10 @@ + ... + } + +- The dictionary *p* should not be mutated during iteration. It is safe (since +- Python 2.1) to modify the values of the keys as you iterate over the dictionary, +- but only so long as the set of keys does not change. For example:: ++ The dictionary *p* should not be mutated during iteration. It is safe ++ (since Python 2.1) to modify the values of the keys as you iterate over the ++ dictionary, but only so long as the set of keys does not change. For ++ example:: + + PyObject *key, *value; + Py_ssize_t pos = 0; +@@ -183,15 +191,19 @@ + Py_DECREF(o); + } + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int *` type for *ppos*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PyDict_Merge(PyObject *a, PyObject *b, int override) + +- Iterate over mapping object *b* adding key-value pairs to dictionary *a*. *b* +- may be a dictionary, or any object supporting :func:`PyMapping_Keys` and +- :func:`PyObject_GetItem`. If *override* is true, existing pairs in *a* will be +- replaced if a matching key is found in *b*, otherwise pairs will only be added +- if there is not a matching key in *a*. Return ``0`` on success or ``-1`` if an +- exception was raised. ++ Iterate over mapping object *b* adding key-value pairs to dictionary *a*. ++ *b* may be a dictionary, or any object supporting :func:`PyMapping_Keys` ++ and :func:`PyObject_GetItem`. If *override* is true, existing pairs in *a* ++ will be replaced if a matching key is found in *b*, otherwise pairs will ++ only be added if there is not a matching key in *a*. Return ``0`` on ++ success or ``-1`` if an exception was raised. + + .. versionadded:: 2.2 + +@@ -206,11 +218,12 @@ + + .. cfunction:: int PyDict_MergeFromSeq2(PyObject *a, PyObject *seq2, int override) + +- Update or merge into dictionary *a*, from the key-value pairs in *seq2*. *seq2* +- must be an iterable object producing iterable objects of length 2, viewed as +- key-value pairs. In case of duplicate keys, the last wins if *override* is +- true, else the first wins. Return ``0`` on success or ``-1`` if an exception was +- raised. Equivalent Python (except for the return value):: ++ Update or merge into dictionary *a*, from the key-value pairs in *seq2*. ++ *seq2* must be an iterable object producing iterable objects of length 2, ++ viewed as key-value pairs. In case of duplicate keys, the last wins if ++ *override* is true, else the first wins. Return ``0`` on success or ``-1`` ++ if an exception was raised. Equivalent Python (except for the return ++ value):: + + def PyDict_MergeFromSeq2(a, seq2, override): + for key, value in seq2: +Index: Doc/c-api/allocation.rst +=================================================================== +--- Doc/c-api/allocation.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/allocation.rst (.../branches/release26-maint) (Revision 74094) +@@ -11,16 +11,21 @@ + + .. cfunction:: PyVarObject* _PyObject_NewVar(PyTypeObject *type, Py_ssize_t size) + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: void _PyObject_Del(PyObject *op) + + + .. cfunction:: PyObject* PyObject_Init(PyObject *op, PyTypeObject *type) + +- Initialize a newly-allocated object *op* with its type and initial reference. +- Returns the initialized object. If *type* indicates that the object +- participates in the cyclic garbage detector, it is added to the detector's set +- of observed objects. Other fields of the object are not affected. ++ Initialize a newly-allocated object *op* with its type and initial ++ reference. Returns the initialized object. If *type* indicates that the ++ object participates in the cyclic garbage detector, it is added to the ++ detector's set of observed objects. Other fields of the object are not ++ affected. + + + .. cfunction:: PyVarObject* PyObject_InitVar(PyVarObject *op, PyTypeObject *type, Py_ssize_t size) +@@ -28,77 +33,90 @@ + This does everything :cfunc:`PyObject_Init` does, and also initializes the + length information for a variable-size object. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: TYPE* PyObject_New(TYPE, PyTypeObject *type) + +- Allocate a new Python object using the C structure type *TYPE* and the Python +- type object *type*. Fields not defined by the Python object header are not +- initialized; the object's reference count will be one. The size of the memory +- allocation is determined from the :attr:`tp_basicsize` field of the type object. ++ Allocate a new Python object using the C structure type *TYPE* and the ++ Python type object *type*. Fields not defined by the Python object header ++ are not initialized; the object's reference count will be one. The size of ++ the memory allocation is determined from the :attr:`tp_basicsize` field of ++ the type object. + + + .. cfunction:: TYPE* PyObject_NewVar(TYPE, PyTypeObject *type, Py_ssize_t size) + +- Allocate a new Python object using the C structure type *TYPE* and the Python +- type object *type*. Fields not defined by the Python object header are not +- initialized. The allocated memory allows for the *TYPE* structure plus *size* +- fields of the size given by the :attr:`tp_itemsize` field of *type*. This is +- useful for implementing objects like tuples, which are able to determine their +- size at construction time. Embedding the array of fields into the same +- allocation decreases the number of allocations, improving the memory management +- efficiency. ++ Allocate a new Python object using the C structure type *TYPE* and the ++ Python type object *type*. Fields not defined by the Python object header ++ are not initialized. The allocated memory allows for the *TYPE* structure ++ plus *size* fields of the size given by the :attr:`tp_itemsize` field of ++ *type*. This is useful for implementing objects like tuples, which are ++ able to determine their size at construction time. Embedding the array of ++ fields into the same allocation decreases the number of allocations, ++ improving the memory management efficiency. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: void PyObject_Del(PyObject *op) + + Releases memory allocated to an object using :cfunc:`PyObject_New` or +- :cfunc:`PyObject_NewVar`. This is normally called from the :attr:`tp_dealloc` +- handler specified in the object's type. The fields of the object should not be +- accessed after this call as the memory is no longer a valid Python object. ++ :cfunc:`PyObject_NewVar`. This is normally called from the ++ :attr:`tp_dealloc` handler specified in the object's type. The fields of ++ the object should not be accessed after this call as the memory is no ++ longer a valid Python object. + + + .. cfunction:: PyObject* Py_InitModule(char *name, PyMethodDef *methods) + +- Create a new module object based on a name and table of functions, returning the +- new module object. ++ Create a new module object based on a name and table of functions, ++ returning the new module object. + + .. versionchanged:: 2.3 +- Older versions of Python did not support *NULL* as the value for the *methods* +- argument. ++ Older versions of Python did not support *NULL* as the value for the ++ *methods* argument. + + + .. cfunction:: PyObject* Py_InitModule3(char *name, PyMethodDef *methods, char *doc) + +- Create a new module object based on a name and table of functions, returning the +- new module object. If *doc* is non-*NULL*, it will be used to define the +- docstring for the module. ++ Create a new module object based on a name and table of functions, ++ returning the new module object. If *doc* is non-*NULL*, it will be used ++ to define the docstring for the module. + + .. versionchanged:: 2.3 +- Older versions of Python did not support *NULL* as the value for the *methods* +- argument. ++ Older versions of Python did not support *NULL* as the value for the ++ *methods* argument. + + + .. cfunction:: PyObject* Py_InitModule4(char *name, PyMethodDef *methods, char *doc, PyObject *self, int apiver) + +- Create a new module object based on a name and table of functions, returning the +- new module object. If *doc* is non-*NULL*, it will be used to define the +- docstring for the module. If *self* is non-*NULL*, it will passed to the +- functions of the module as their (otherwise *NULL*) first parameter. (This was +- added as an experimental feature, and there are no known uses in the current +- version of Python.) For *apiver*, the only value which should be passed is +- defined by the constant :const:`PYTHON_API_VERSION`. ++ Create a new module object based on a name and table of functions, ++ returning the new module object. If *doc* is non-*NULL*, it will be used ++ to define the docstring for the module. If *self* is non-*NULL*, it will ++ passed to the functions of the module as their (otherwise *NULL*) first ++ parameter. (This was added as an experimental feature, and there are no ++ known uses in the current version of Python.) For *apiver*, the only value ++ which should be passed is defined by the constant ++ :const:`PYTHON_API_VERSION`. + + .. note:: + +- Most uses of this function should probably be using the :cfunc:`Py_InitModule3` +- instead; only use this if you are sure you need it. ++ Most uses of this function should probably be using the ++ :cfunc:`Py_InitModule3` instead; only use this if you are sure you need ++ it. + + .. versionchanged:: 2.3 +- Older versions of Python did not support *NULL* as the value for the *methods* +- argument. ++ Older versions of Python did not support *NULL* as the value for the ++ *methods* argument. + + + .. cvar:: PyObject _Py_NoneStruct + +- Object which is visible in Python as ``None``. This should only be accessed +- using the ``Py_None`` macro, which evaluates to a pointer to this object. ++ Object which is visible in Python as ``None``. This should only be ++ accessed using the ``Py_None`` macro, which evaluates to a pointer to this ++ object. +Index: Doc/c-api/unicode.rst +=================================================================== +--- Doc/c-api/unicode.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/unicode.rst (.../branches/release26-maint) (Revision 74094) +@@ -71,13 +71,21 @@ + Return the size of the object. *o* has to be a :ctype:`PyUnicodeObject` (not + checked). + ++ .. versionchanged:: 2.5 ++ This function returned an :ctype:`int` type. This might require changes ++ in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: Py_ssize_t PyUnicode_GET_DATA_SIZE(PyObject *o) + + Return the size of the object's internal buffer in bytes. *o* has to be a + :ctype:`PyUnicodeObject` (not checked). + ++ .. versionchanged:: 2.5 ++ This function returned an :ctype:`int` type. This might require changes ++ in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: Py_UNICODE* PyUnicode_AS_UNICODE(PyObject *o) + + Return a pointer to the internal :ctype:`Py_UNICODE` buffer of the object. *o* +@@ -202,7 +210,11 @@ + Therefore, modification of the resulting Unicode object is only allowed when *u* + is *NULL*. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: Py_UNICODE* PyUnicode_AsUnicode(PyObject *unicode) + + Return a read-only pointer to the Unicode object's internal :ctype:`Py_UNICODE` +@@ -213,7 +225,11 @@ + + Return the length of the Unicode object. + ++ .. versionchanged:: 2.5 ++ This function returned an :ctype:`int` type. This might require changes ++ in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_FromEncodedObject(PyObject *obj, const char *encoding, const char *errors) + + Coerce an encoded object *obj* to an Unicode object and return a reference with +@@ -249,7 +265,11 @@ + Create a Unicode object from the :ctype:`wchar_t` buffer *w* of the given size. + Return *NULL* on failure. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: Py_ssize_t PyUnicode_AsWideChar(PyUnicodeObject *unicode, wchar_t *w, Py_ssize_t size) + + Copy the Unicode object contents into the :ctype:`wchar_t` buffer *w*. At most +@@ -260,7 +280,12 @@ + to make sure that the :ctype:`wchar_t` string is 0-terminated in case this is + required by the application. + ++ .. versionchanged:: 2.5 ++ This function returned an :ctype:`int` type and used an :ctype:`int` ++ type for *size*. This might require changes in your code for properly ++ supporting 64-bit systems. + ++ + .. _builtincodecs: + + Built-in Codecs +@@ -299,7 +324,11 @@ + using the Python codec registry. Return *NULL* if an exception was raised by + the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_Encode(const Py_UNICODE *s, Py_ssize_t size, const char *encoding, const char *errors) + + Encode the :ctype:`Py_UNICODE` buffer of the given size and return a Python +@@ -308,7 +337,11 @@ + looked up using the Python codec registry. Return *NULL* if an exception was + raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_AsEncodedString(PyObject *unicode, const char *encoding, const char *errors) + + Encode a Unicode object and return the result as Python string object. +@@ -327,7 +360,11 @@ + Create a Unicode object by decoding *size* bytes of the UTF-8 encoded string + *s*. Return *NULL* if an exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_DecodeUTF8Stateful(const char *s, Py_ssize_t size, const char *errors, Py_ssize_t *consumed) + + If *consumed* is *NULL*, behave like :cfunc:`PyUnicode_DecodeUTF8`. If +@@ -337,13 +374,21 @@ + + .. versionadded:: 2.4 + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_EncodeUTF8(const Py_UNICODE *s, Py_ssize_t size, const char *errors) + + Encode the :ctype:`Py_UNICODE` buffer of the given size using UTF-8 and return a + Python string object. Return *NULL* if an exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_AsUTF8String(PyObject *unicode) + + Encode a Unicode object using UTF-8 and return the result as Python string +@@ -450,7 +495,11 @@ + + Return *NULL* if an exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_DecodeUTF16Stateful(const char *s, Py_ssize_t size, const char *errors, int *byteorder, Py_ssize_t *consumed) + + If *consumed* is *NULL*, behave like :cfunc:`PyUnicode_DecodeUTF16`. If +@@ -461,7 +510,12 @@ + + .. versionadded:: 2.4 + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size* and an :ctype:`int *` ++ type for *consumed*. This might require changes in your code for ++ properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_EncodeUTF16(const Py_UNICODE *s, Py_ssize_t size, const char *errors, int byteorder) + + Return a Python string object holding the UTF-16 encoded value of the Unicode +@@ -481,7 +535,11 @@ + + Return *NULL* if an exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_AsUTF16String(PyObject *unicode) + + Return a Python string using the UTF-16 encoding in native byte order. The +@@ -498,14 +556,22 @@ + Create a Unicode object by decoding *size* bytes of the Unicode-Escape encoded + string *s*. Return *NULL* if an exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_EncodeUnicodeEscape(const Py_UNICODE *s, Py_ssize_t size) + + Encode the :ctype:`Py_UNICODE` buffer of the given size using Unicode-Escape and + return a Python string object. Return *NULL* if an exception was raised by the + codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_AsUnicodeEscapeString(PyObject *unicode) + + Encode a Unicode object using Unicode-Escape and return the result as Python +@@ -522,14 +588,22 @@ + Create a Unicode object by decoding *size* bytes of the Raw-Unicode-Escape + encoded string *s*. Return *NULL* if an exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_EncodeRawUnicodeEscape(const Py_UNICODE *s, Py_ssize_t size, const char *errors) + + Encode the :ctype:`Py_UNICODE` buffer of the given size using Raw-Unicode-Escape + and return a Python string object. Return *NULL* if an exception was raised by + the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_AsRawUnicodeEscapeString(PyObject *unicode) + + Encode a Unicode object using Raw-Unicode-Escape and return the result as +@@ -547,13 +621,21 @@ + Create a Unicode object by decoding *size* bytes of the Latin-1 encoded string + *s*. Return *NULL* if an exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_EncodeLatin1(const Py_UNICODE *s, Py_ssize_t size, const char *errors) + + Encode the :ctype:`Py_UNICODE` buffer of the given size using Latin-1 and return + a Python string object. Return *NULL* if an exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_AsLatin1String(PyObject *unicode) + + Encode a Unicode object using Latin-1 and return the result as Python string +@@ -571,13 +653,21 @@ + Create a Unicode object by decoding *size* bytes of the ASCII encoded string + *s*. Return *NULL* if an exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_EncodeASCII(const Py_UNICODE *s, Py_ssize_t size, const char *errors) + + Encode the :ctype:`Py_UNICODE` buffer of the given size using ASCII and return a + Python string object. Return *NULL* if an exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_AsASCIIString(PyObject *unicode) + + Encode a Unicode object using ASCII and return the result as Python string +@@ -622,14 +712,22 @@ + .. versionchanged:: 2.4 + Allowed unicode string as mapping argument. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_EncodeCharmap(const Py_UNICODE *s, Py_ssize_t size, PyObject *mapping, const char *errors) + + Encode the :ctype:`Py_UNICODE` buffer of the given size using the given + *mapping* object and return a Python string object. Return *NULL* if an + exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_AsCharmapString(PyObject *unicode, PyObject *mapping) + + Encode a Unicode object using the given *mapping* object and return the result +@@ -652,6 +750,10 @@ + and sequences work well. Unmapped character ordinals (ones which cause a + :exc:`LookupError`) are left untouched and are copied as-is. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. ++ + These are the MBCS codec APIs. They are currently only available on Windows and + use the Win32 MBCS converters to implement the conversions. Note that MBCS (or + DBCS) is a class of encodings, not just one. The target encoding is defined by +@@ -665,7 +767,11 @@ + Create a Unicode object by decoding *size* bytes of the MBCS encoded string *s*. + Return *NULL* if an exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_DecodeMBCSStateful(const char *s, int size, const char *errors, int *consumed) + + If *consumed* is *NULL*, behave like :cfunc:`PyUnicode_DecodeMBCS`. If +@@ -681,7 +787,11 @@ + Encode the :ctype:`Py_UNICODE` buffer of the given size using MBCS and return a + Python string object. Return *NULL* if an exception was raised by the codec. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *size*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_AsMBCSString(PyObject *unicode) + + Encode a Unicode object using MBCS and return the result as Python string +@@ -715,7 +825,11 @@ + separator. At most *maxsplit* splits will be done. If negative, no limit is + set. Separators are not included in the resulting list. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *maxsplit*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_Splitlines(PyObject *s, int keepend) + + Split a Unicode string at line breaks, returning a list of Unicode strings. +@@ -751,7 +865,12 @@ + (*direction* == -1 means to do a prefix match, *direction* == 1 a suffix match), + 0 otherwise. Return ``-1`` if an error occurred. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *start* and *end*. This ++ might require changes in your code for properly supporting 64-bit ++ systems. + ++ + .. cfunction:: Py_ssize_t PyUnicode_Find(PyObject *str, PyObject *substr, Py_ssize_t start, Py_ssize_t end, int direction) + + Return the first position of *substr* in *str*[*start*:*end*] using the given +@@ -760,20 +879,34 @@ + ``-1`` indicates that no match was found, and ``-2`` indicates that an error + occurred and an exception has been set. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *start* and *end*. This ++ might require changes in your code for properly supporting 64-bit ++ systems. + ++ + .. cfunction:: Py_ssize_t PyUnicode_Count(PyObject *str, PyObject *substr, Py_ssize_t start, Py_ssize_t end) + + Return the number of non-overlapping occurrences of *substr* in + ``str[start:end]``. Return ``-1`` if an error occurred. + ++ .. versionchanged:: 2.5 ++ This function returned an :ctype:`int` type and used an :ctype:`int` ++ type for *start* and *end*. This might require changes in your code for ++ properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyUnicode_Replace(PyObject *str, PyObject *substr, PyObject *replstr, Py_ssize_t maxcount) + + Replace at most *maxcount* occurrences of *substr* in *str* with *replstr* and + return the resulting Unicode object. *maxcount* == -1 means replace all + occurrences. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *maxcount*. This might ++ require changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PyUnicode_Compare(PyObject *left, PyObject *right) + + Compare two strings and return -1, 0, 1 for less than, equal, and greater than, +Index: Doc/c-api/marshal.rst +=================================================================== +--- Doc/c-api/marshal.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/marshal.rst (.../branches/release26-maint) (Revision 74094) +@@ -5,25 +5,26 @@ + Data marshalling support + ======================== + +-These routines allow C code to work with serialized objects using the same data +-format as the :mod:`marshal` module. There are functions to write data into the +-serialization format, and additional functions that can be used to read the data +-back. Files used to store marshalled data must be opened in binary mode. ++These routines allow C code to work with serialized objects using the same ++data format as the :mod:`marshal` module. There are functions to write data ++into the serialization format, and additional functions that can be used to ++read the data back. Files used to store marshalled data must be opened in ++binary mode. + + Numeric values are stored with the least significant byte first. + +-The module supports two versions of the data format: version 0 is the historical +-version, version 1 (new in Python 2.4) shares interned strings in the file, and +-upon unmarshalling. Version 2 (new in Python 2.5) uses a binary format for +-floating point numbers. +-*Py_MARSHAL_VERSION* indicates the current file format (currently 2). ++The module supports two versions of the data format: version 0 is the ++historical version, version 1 (new in Python 2.4) shares interned strings in ++the file, and upon unmarshalling. Version 2 (new in Python 2.5) uses a binary ++format for floating point numbers. *Py_MARSHAL_VERSION* indicates the current ++file format (currently 2). + + + .. cfunction:: void PyMarshal_WriteLongToFile(long value, FILE *file, int version) + +- Marshal a :ctype:`long` integer, *value*, to *file*. This will only write the +- least-significant 32 bits of *value*; regardless of the size of the native +- :ctype:`long` type. ++ Marshal a :ctype:`long` integer, *value*, to *file*. This will only write ++ the least-significant 32 bits of *value*; regardless of the size of the ++ native :ctype:`long` type. + + .. versionchanged:: 2.4 + *version* indicates the file format. +@@ -48,24 +49,24 @@ + The following functions allow marshalled values to be read back in. + + XXX What about error detection? It appears that reading past the end of the +-file will always result in a negative numeric value (where that's relevant), but +-it's not clear that negative values won't be handled properly when there's no +-error. What's the right way to tell? Should only non-negative values be written +-using these routines? ++file will always result in a negative numeric value (where that's relevant), ++but it's not clear that negative values won't be handled properly when there's ++no error. What's the right way to tell? Should only non-negative values be ++written using these routines? + + + .. cfunction:: long PyMarshal_ReadLongFromFile(FILE *file) + +- Return a C :ctype:`long` from the data stream in a :ctype:`FILE\*` opened for +- reading. Only a 32-bit value can be read in using this function, regardless of +- the native size of :ctype:`long`. ++ Return a C :ctype:`long` from the data stream in a :ctype:`FILE\*` opened ++ for reading. Only a 32-bit value can be read in using this function, ++ regardless of the native size of :ctype:`long`. + + + .. cfunction:: int PyMarshal_ReadShortFromFile(FILE *file) + +- Return a C :ctype:`short` from the data stream in a :ctype:`FILE\*` opened for +- reading. Only a 16-bit value can be read in using this function, regardless of +- the native size of :ctype:`short`. ++ Return a C :ctype:`short` from the data stream in a :ctype:`FILE\*` opened ++ for reading. Only a 16-bit value can be read in using this function, ++ regardless of the native size of :ctype:`short`. + + + .. cfunction:: PyObject* PyMarshal_ReadObjectFromFile(FILE *file) +@@ -78,17 +79,22 @@ + .. cfunction:: PyObject* PyMarshal_ReadLastObjectFromFile(FILE *file) + + Return a Python object from the data stream in a :ctype:`FILE\*` opened for +- reading. Unlike :cfunc:`PyMarshal_ReadObjectFromFile`, this function assumes +- that no further objects will be read from the file, allowing it to aggressively +- load file data into memory so that the de-serialization can operate from data in +- memory rather than reading a byte at a time from the file. Only use these +- variant if you are certain that you won't be reading anything else from the +- file. On error, sets the appropriate exception (:exc:`EOFError` or +- :exc:`TypeError`) and returns *NULL*. ++ reading. Unlike :cfunc:`PyMarshal_ReadObjectFromFile`, this function ++ assumes that no further objects will be read from the file, allowing it to ++ aggressively load file data into memory so that the de-serialization can ++ operate from data in memory rather than reading a byte at a time from the ++ file. Only use these variant if you are certain that you won't be reading ++ anything else from the file. On error, sets the appropriate exception ++ (:exc:`EOFError` or :exc:`TypeError`) and returns *NULL*. + + + .. cfunction:: PyObject* PyMarshal_ReadObjectFromString(char *string, Py_ssize_t len) + +- Return a Python object from the data stream in a character buffer containing +- *len* bytes pointed to by *string*. On error, sets the appropriate exception +- (:exc:`EOFError` or :exc:`TypeError`) and returns *NULL*. ++ Return a Python object from the data stream in a character buffer ++ containing *len* bytes pointed to by *string*. On error, sets the ++ appropriate exception (:exc:`EOFError` or :exc:`TypeError`) and returns ++ *NULL*. ++ ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *len*. This might require ++ changes in your code for properly supporting 64-bit systems. +Index: Doc/c-api/tuple.rst +=================================================================== +--- Doc/c-api/tuple.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/tuple.rst (.../branches/release26-maint) (Revision 74094) +@@ -42,7 +42,11 @@ + + Return a new tuple object of size *len*, or *NULL* on failure. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *len*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyTuple_Pack(Py_ssize_t n, ...) + + Return a new tuple object of size *n*, or *NULL* on failure. The tuple values +@@ -51,35 +55,59 @@ + + .. versionadded:: 2.4 + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *n*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: Py_ssize_t PyTuple_Size(PyObject *p) + + Take a pointer to a tuple object, and return the size of that tuple. + ++ .. versionchanged:: 2.5 ++ This function returned an :ctype:`int` type. This might require changes ++ in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: Py_ssize_t PyTuple_GET_SIZE(PyObject *p) + + Return the size of the tuple *p*, which must be non-*NULL* and point to a tuple; + no error checking is performed. + ++ .. versionchanged:: 2.5 ++ This function returned an :ctype:`int` type. This might require changes ++ in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyTuple_GetItem(PyObject *p, Py_ssize_t pos) + + Return the object at position *pos* in the tuple pointed to by *p*. If *pos* is + out of bounds, return *NULL* and sets an :exc:`IndexError` exception. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *pos*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyTuple_GET_ITEM(PyObject *p, Py_ssize_t pos) + + Like :cfunc:`PyTuple_GetItem`, but does no checking of its arguments. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *pos*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: PyObject* PyTuple_GetSlice(PyObject *p, Py_ssize_t low, Py_ssize_t high) + + Take a slice of the tuple pointed to by *p* from *low* to *high* and return it + as a new tuple. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *low* and *high*. This might ++ require changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PyTuple_SetItem(PyObject *p, Py_ssize_t pos, PyObject *o) + + Insert a reference to object *o* at position *pos* of the tuple pointed to by +@@ -89,7 +117,11 @@ + + This function "steals" a reference to *o*. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *pos*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: void PyTuple_SET_ITEM(PyObject *p, Py_ssize_t pos, PyObject *o) + + Like :cfunc:`PyTuple_SetItem`, but does no error checking, and should *only* be +@@ -99,7 +131,11 @@ + + This function "steals" a reference to *o*. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *pos*. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int _PyTuple_Resize(PyObject **p, Py_ssize_t newsize) + + Can be used to resize a tuple. *newsize* will be the new length of the tuple. +@@ -116,7 +152,11 @@ + .. versionchanged:: 2.2 + Removed unused third parameter, *last_is_sticky*. + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int` type for *newsize*. This might ++ require changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PyTuple_ClearFreeList(void) + + Clear the free list. Return the total number of freed items. +Index: Doc/c-api/mapping.rst +=================================================================== +--- Doc/c-api/mapping.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/mapping.rst (.../branches/release26-maint) (Revision 74094) +@@ -12,7 +12,8 @@ + function always succeeds. + + +-.. cfunction:: Py_ssize_t PyMapping_Length(PyObject *o) ++.. cfunction:: Py_ssize_t PyMapping_Size(PyObject *o) ++ Py_ssize_t PyMapping_Length(PyObject *o) + + .. index:: builtin: len + +@@ -20,7 +21,11 @@ + objects that do not provide mapping protocol, this is equivalent to the Python + expression ``len(o)``. + ++ .. versionchanged:: 2.5 ++ These functions returned an :ctype:`int` type. This might require ++ changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PyMapping_DelItemString(PyObject *o, char *key) + + Remove the mapping for object *key* from the object *o*. Return ``-1`` on +Index: Doc/c-api/objbuffer.rst +=================================================================== +--- Doc/c-api/objbuffer.rst (.../tags/r262) (Revision 74094) ++++ Doc/c-api/objbuffer.rst (.../branches/release26-maint) (Revision 74094) +@@ -2,31 +2,47 @@ + + .. _abstract-buffer: + +-Buffer Protocol +-=============== ++Old Buffer Protocol ++=================== + + ++This section describes the legacy buffer protocol, which has been introduced ++in Python 1.6. It is still supported but deprecated in the Python 2.x series. ++Python 3.0 introduces a new buffer protocol which fixes weaknesses and ++shortcomings of the protocol, and has been backported to Python 2.6. See ++:ref:`bufferobjects` for more information. ++ ++ + .. cfunction:: int PyObject_AsCharBuffer(PyObject *obj, const char **buffer, Py_ssize_t *buffer_len) + + Returns a pointer to a read-only memory location usable as character-based + input. The *obj* argument must support the single-segment character buffer +- interface. On success, returns ``0``, sets *buffer* to the memory location and +- *buffer_len* to the buffer length. Returns ``-1`` and sets a :exc:`TypeError` +- on error. ++ interface. On success, returns ``0``, sets *buffer* to the memory location ++ and *buffer_len* to the buffer length. Returns ``-1`` and sets a ++ :exc:`TypeError` on error. + + .. versionadded:: 1.6 + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int *` type for *buffer_len*. This might ++ require changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PyObject_AsReadBuffer(PyObject *obj, const void **buffer, Py_ssize_t *buffer_len) + +- Returns a pointer to a read-only memory location containing arbitrary data. The +- *obj* argument must support the single-segment readable buffer interface. On +- success, returns ``0``, sets *buffer* to the memory location and *buffer_len* to +- the buffer length. Returns ``-1`` and sets a :exc:`TypeError` on error. ++ Returns a pointer to a read-only memory location containing arbitrary data. ++ The *obj* argument must support the single-segment readable buffer ++ interface. On success, returns ``0``, sets *buffer* to the memory location ++ and *buffer_len* to the buffer length. Returns ``-1`` and sets a ++ :exc:`TypeError` on error. + + .. versionadded:: 1.6 + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int *` type for *buffer_len*. This might ++ require changes in your code for properly supporting 64-bit systems. + ++ + .. cfunction:: int PyObject_CheckReadBuffer(PyObject *o) + + Returns ``1`` if *o* supports the single-segment readable buffer interface. +@@ -38,9 +54,13 @@ + .. cfunction:: int PyObject_AsWriteBuffer(PyObject *obj, void **buffer, Py_ssize_t *buffer_len) + + Returns a pointer to a writeable memory location. The *obj* argument must +- support the single-segment, character buffer interface. On success, returns +- ``0``, sets *buffer* to the memory location and *buffer_len* to the buffer +- length. Returns ``-1`` and sets a :exc:`TypeError` on error. ++ support the single-segment, character buffer interface. On success, ++ returns ``0``, sets *buffer* to the memory location and *buffer_len* to the ++ buffer length. Returns ``-1`` and sets a :exc:`TypeError` on error. + + .. versionadded:: 1.6 + ++ .. versionchanged:: 2.5 ++ This function used an :ctype:`int *` type for *buffer_len*. This might ++ require changes in your code for properly supporting 64-bit systems. ++ +Index: Doc/reference/datamodel.rst +=================================================================== +--- Doc/reference/datamodel.rst (.../tags/r262) (Revision 74094) ++++ Doc/reference/datamodel.rst (.../branches/release26-maint) (Revision 74094) +@@ -1858,11 +1858,11 @@ + reverse iteration. It should return a new iterator object that iterates + over all the objects in the container in reverse order. + +- If the :meth:`__reversed__` method is not provided, the +- :func:`reversed` builtin will fall back to using the sequence protocol +- (:meth:`__len__` and :meth:`__getitem__`). Objects should normally +- only provide :meth:`__reversed__` if they do not support the sequence +- protocol and an efficient implementation of reverse iteration is possible. ++ If the :meth:`__reversed__` method is not provided, the :func:`reversed` ++ builtin will fall back to using the sequence protocol (:meth:`__len__` and ++ :meth:`__getitem__`). Objects that support the sequence protocol should ++ only provide :meth:`__reversed__` if they can provide an implementation ++ that is more efficient than the one provided by :func:`reversed`. + + .. versionadded:: 2.6 + +Index: Doc/reference/compound_stmts.rst +=================================================================== +--- Doc/reference/compound_stmts.rst (.../tags/r262) (Revision 74094) ++++ Doc/reference/compound_stmts.rst (.../branches/release26-maint) (Revision 74094) +@@ -1,4 +1,3 @@ +- + .. _compound: + + ******************* +@@ -179,7 +178,7 @@ + effect of Pascal's ``for i := a to b do``; e.g., ``range(3)`` returns the list + ``[0, 1, 2]``. + +-.. warning:: ++.. note:: + + .. index:: + single: loop; over mutable sequence +@@ -195,14 +194,12 @@ + inserts an item in the sequence before the current item, the current item will + be treated again the next time through the loop. This can lead to nasty bugs + that can be avoided by making a temporary copy using a slice of the whole +- sequence, e.g., ++ sequence, e.g., :: + +-:: ++ for x in a[:]: ++ if x < 0: a.remove(x) + +- for x in a[:]: +- if x < 0: a.remove(x) + +- + .. _try: + .. _except: + .. _finally: +Index: Doc/reference/expressions.rst +=================================================================== +--- Doc/reference/expressions.rst (.../tags/r262) (Revision 74094) ++++ Doc/reference/expressions.rst (.../branches/release26-maint) (Revision 74094) +@@ -1177,6 +1177,7 @@ + + + .. _lambdas: ++.. _lambda: + + Lambdas + ======= +@@ -1201,9 +1202,7 @@ + See section :ref:`function` for the syntax of parameter lists. Note that + functions created with lambda forms cannot contain statements. + +-.. _lambda: + +- + .. _exprlists: + + Expression lists +Index: Doc/reference/simple_stmts.rst +=================================================================== +--- Doc/reference/simple_stmts.rst (.../tags/r262) (Revision 74094) ++++ Doc/reference/simple_stmts.rst (.../branches/release26-maint) (Revision 74094) +@@ -386,9 +386,10 @@ + object is (converted and) written, unless the output system believes it is + positioned at the beginning of a line. This is the case (1) when no characters + have yet been written to standard output, (2) when the last character written to +-standard output is ``'\n'``, or (3) when the last write operation on standard +-output was not a :keyword:`print` statement. (In some cases it may be +-functional to write an empty string to standard output for this reason.) ++standard output is a whitespace character except ``' '``, or (3) when the last ++write operation on standard output was not a :keyword:`print` statement. ++(In some cases it may be functional to write an empty string to standard output ++for this reason.) + + .. note:: + +@@ -907,7 +908,12 @@ + a future statement, it will be in effect in the interactive session started + after the script is executed. + ++.. seealso:: + ++ :pep:`236` - Back to the __future__ ++ The original proposal for the __future__ mechanism. ++ ++ + .. _global: + + The :keyword:`global` statement +Index: Doc/reference/executionmodel.rst +=================================================================== +--- Doc/reference/executionmodel.rst (.../tags/r262) (Revision 74094) ++++ Doc/reference/executionmodel.rst (.../branches/release26-maint) (Revision 74094) +@@ -231,7 +231,7 @@ + :keyword:`except` clause is selected by object identity. An arbitrary value can + be raised along with the identifying string which can be passed to the handler. + +-.. warning:: ++.. note:: + + Messages to exceptions are not part of the Python API. Their contents may + change from one version of Python to the next without warning and should not be +Index: Doc/reference/lexical_analysis.rst +=================================================================== +--- Doc/reference/lexical_analysis.rst (.../tags/r262) (Revision 74094) ++++ Doc/reference/lexical_analysis.rst (.../branches/release26-maint) (Revision 74094) +@@ -339,8 +339,10 @@ + + The following identifiers are used as reserved words, or *keywords* of the + language, and cannot be used as ordinary identifiers. They must be spelled +-exactly as written here:: ++exactly as written here: + ++.. sourcecode:: text ++ + and del from not while + as elif global or with + assert else if pass yield +Index: Doc/tools/sphinxext/indexsidebar.html +=================================================================== +--- Doc/tools/sphinxext/indexsidebar.html (.../tags/r262) (Revision 74094) ++++ Doc/tools/sphinxext/indexsidebar.html (.../branches/release26-maint) (Revision 74094) +@@ -2,9 +2,9 @@ +

Download these documents

+

Docs for other versions

+ + +@@ -12,12 +12,10 @@ +