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

Wed Apr 20 12:27:21 EDT 2016

https://hg.python.org/cpython/rev/a94156400269
changeset: 101086:a94156400269
parent: 101084:b6d7645e4b0c
parent: 101085:a246047734b3
user: Victor Stinner <victor.stinner at gmail.com>
date: Wed Apr 20 18:26:40 2016 +0200
summary:
 Merge 3.5
files:
 Tools/gdb/libpython.py | 16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -59,7 +59,6 @@
 # Those need to be refreshed as types (pointer sizes) may change when
 # gdb loads different executables
 
-
 def _type_char_ptr():
 return gdb.lookup_type('char').pointer() # char*
 
@@ -68,10 +67,6 @@
 return gdb.lookup_type('unsigned char').pointer() # unsigned char*
 
 
-def _type_void_ptr():
- return gdb.lookup_type('void').pointer() # void*
-
-
 def _type_unsigned_short_ptr():
 return gdb.lookup_type('unsigned short').pointer()
 
@@ -79,16 +74,15 @@
 def _type_unsigned_int_ptr():
 return gdb.lookup_type('unsigned int').pointer()
 
+
+def _sizeof_void_p():
+ return gdb.lookup_type('void').pointer().sizeof
+
+
 # value computed later, see PyUnicodeObjectPtr.proxy()
 _is_pep393 = None
 
-
-def _sizeof_void_p():
- return _type_void_ptr().sizeof
-
-
 Py_TPFLAGS_HEAPTYPE = (1 << 9)
-
 Py_TPFLAGS_LONG_SUBCLASS = (1 << 24)
 Py_TPFLAGS_LIST_SUBCLASS = (1 << 25)
 Py_TPFLAGS_TUPLE_SUBCLASS = (1 << 26)
-- 
Repository URL: https://hg.python.org/cpython
