[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3

[nick.coghlan]

http://hg.python.org/cpython/rev/ff7e3d9c24bd
changeset:   85773:ff7e3d9c24bd
parent:      85770:f2ec064a3f4d
parent:      85772:e8d4ed996447
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Sep 22 19:38:44 2013 +1000
summary:
  Merge from 3.3

files:
  Lib/test/test_gdb.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -65,7 +65,8 @@
 if not gdbpy_version:
     raise unittest.SkipTest("gdb not built with embedded python support")
 
-# Verify that "gdb" can load our custom hooks. In theory this should never fail.
+# Verify that "gdb" can load our custom hooks, as OS security settings may
+# disallow this without a customised .gdbinit.
 cmd = ['--args', sys.executable]
 _, gdbpy_errors = run_gdb('--args', sys.executable)
 if "auto-loading has been declined" in gdbpy_errors:

-- 
Repository URL: http://hg.python.org/cpython