From eefec7b85793b08ed5a6fc5d2cfd0eb214f7e139 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Wed, 14 Jul 2010 08:55:55 +0000 Subject: [PATCH] Merged revisions 82872,82874 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82872 | georg.brandl | 2010-07-14 10:53:18 +0200 (Mi, 14 Jul 2010) | 1 line Remove XXX from text. ........ r82874 | georg.brandl | 2010-07-14 10:54:40 +0200 (Mi, 14 Jul 2010) | 1 line #9235: fix missing import of sys. ........ --- Doc/distutils/apiref.rst | 2 +- Tools/gdb/libpython.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst index bce22bf1bd6..ae34565b8b0 100644 --- a/Doc/distutils/apiref.rst +++ b/Doc/distutils/apiref.rst @@ -21,7 +21,7 @@ setup script). Indirectly provides the :class:`distutils.dist.Distribution` and .. function:: setup(arguments) The basic do-everything function that does most everything you could ever ask - for from a Distutils method. See XXXXX + for from a Distutils method. The setup function takes a large number of arguments. These are laid out in the following table. diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py index 3481f71c155..22c00661208 100644 --- a/Tools/gdb/libpython.py +++ b/Tools/gdb/libpython.py @@ -41,6 +41,7 @@ The module also extends gdb with some python-specific commands. ''' from __future__ import with_statement import gdb +import sys # Look up the gdb.Type for some standard types: _type_char_ptr = gdb.lookup_type('char').pointer() # char*