Merge 3.5

Tools/gdb/libpython.py

@@ -59,7 +59,6 @@ if sys.version_info[0] >= 3:
 # 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 @@ def _type_unsigned_char_ptr():
     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_short_ptr():
 def _type_unsigned_int_ptr():
     return gdb.lookup_type('unsigned int').pointer()
 
-# value computed later, see PyUnicodeObjectPtr.proxy()
-_is_pep393 = None
-
 
 def _sizeof_void_p():
-    return _type_void_ptr().sizeof
+    return gdb.lookup_type('void').pointer().sizeof
 
 
-Py_TPFLAGS_HEAPTYPE = (1 << 9)
+# value computed later, see PyUnicodeObjectPtr.proxy()
+_is_pep393 = None
 
+Py_TPFLAGS_HEAPTYPE = (1 << 9)
 Py_TPFLAGS_LONG_SUBCLASS     = (1 << 24)
 Py_TPFLAGS_LIST_SUBCLASS     = (1 << 25)
 Py_TPFLAGS_TUPLE_SUBCLASS    = (1 << 26)