[Python-checkins] r82876 - in python/branches/release27-maint: Doc/distutils/apiref.rst Tools/gdb/libpython.py

[georg.brandl]

Author: georg.brandl
Date: Wed Jul 14 10:55:55 2010
New Revision: 82876

Log:
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.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Doc/distutils/apiref.rst
   python/branches/release27-maint/Tools/gdb/libpython.py

Modified: python/branches/release27-maint/Doc/distutils/apiref.rst
==============================================================================
--- python/branches/release27-maint/Doc/distutils/apiref.rst	(original)
+++ python/branches/release27-maint/Doc/distutils/apiref.rst	Wed Jul 14 10:55:55 2010
@@ -21,7 +21,7 @@
 .. 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.

Modified: python/branches/release27-maint/Tools/gdb/libpython.py
==============================================================================
--- python/branches/release27-maint/Tools/gdb/libpython.py	(original)
+++ python/branches/release27-maint/Tools/gdb/libpython.py	Wed Jul 14 10:55:55 2010
@@ -41,6 +41,7 @@
 '''
 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*