From 6a1b16642bd239e1eb15f644e367526590316540 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 5 Aug 2011 14:24:10 +0000
Subject: [PATCH]  * python/py-breakpoint.c (gdbpy_initialize_breakpoints):
 Move the  initialization of the tp_new member to the corresponding 
 gdbpy_initialize_* function.  * python/py-cmd.c (gdbpy_initialize_commands):
 Likewise.  * python/py-frame.c (gdbpy_initialize_frames): Likewise.  *
 python/py-function.c (gdbpy_initialize_functions): Likewise.  *
 python/py-inferior.c (gdbpy_initialize_inferior): Likewise.  *
 python/py-param.c (gdbpy_initialize_parameters): Likewise.

---
 gdb/ChangeLog              | 11 +++++++++++
 gdb/python/py-breakpoint.c |  2 +-
 gdb/python/py-cmd.c        |  2 +-
 gdb/python/py-frame.c      |  2 +-
 gdb/python/py-function.c   |  2 +-
 gdb/python/py-inferior.c   |  2 +-
 gdb/python/py-param.c      |  2 +-
 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 893a0b4..a911a3b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2011-08-05  Eli Zaretskii  <eliz@gnu.org>
+
+	* python/py-breakpoint.c (gdbpy_initialize_breakpoints): Move the
+	initialization of the tp_new member to the corresponding
+	gdbpy_initialize_* function.
+	* python/py-cmd.c (gdbpy_initialize_commands): Likewise.
+	* python/py-frame.c (gdbpy_initialize_frames): Likewise.
+	* python/py-function.c (gdbpy_initialize_functions): Likewise.
+	* python/py-inferior.c (gdbpy_initialize_inferior): Likewise.
+	* python/py-param.c (gdbpy_initialize_parameters): Likewise.
+
 2011-08-05  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* spu-tdep.c (info_spu_event_command, info_spu_signal_command)
diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c
index 126957c..3dc0fca 100644
--- a/gdb/python/py-breakpoint.c
+++ b/gdb/python/py-breakpoint.c
@@ -862,6 +862,7 @@ gdbpy_initialize_breakpoints (void)
 {
   int i;
 
+  breakpoint_object_type.tp_new = PyType_GenericNew;
   if (PyType_Ready (&breakpoint_object_type) < 0)
     return;
 
@@ -1016,5 +1017,4 @@ static PyTypeObject breakpoint_object_type =
   0,				  /* tp_dictoffset */
   bppy_init,			  /* tp_init */
   0,				  /* tp_alloc */
-  PyType_GenericNew		  /* tp_new */
 };
diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c
index 20933fd..9ff8eaa 100644
--- a/gdb/python/py-cmd.c
+++ b/gdb/python/py-cmd.c
@@ -559,6 +559,7 @@ gdbpy_initialize_commands (void)
 {
   int i;
 
+  cmdpy_object_type.tp_new = PyType_GenericNew;
   if (PyType_Ready (&cmdpy_object_type) < 0)
     return;
 
@@ -646,7 +647,6 @@ static PyTypeObject cmdpy_object_type =
   0,				  /* tp_dictoffset */
   cmdpy_init,			  /* tp_init */
   0,				  /* tp_alloc */
-  PyType_GenericNew		  /* tp_new */
 };
 
 
diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c
index d7128a9..7efd13f 100644
--- a/gdb/python/py-frame.c
+++ b/gdb/python/py-frame.c
@@ -593,6 +593,7 @@ frapy_richcompare (PyObject *self, PyObject *other, int op)
 void
 gdbpy_initialize_frames (void)
 {
+  frame_object_type.tp_new = PyType_GenericNew;
   if (PyType_Ready (&frame_object_type) < 0)
     return;
 
@@ -702,5 +703,4 @@ static PyTypeObject frame_object_type = {
   0,				  /* tp_dictoffset */
   0,				  /* tp_init */
   0,				  /* tp_alloc */
-  PyType_GenericNew		  /* tp_new */
 };
diff --git a/gdb/python/py-function.c b/gdb/python/py-function.c
index 5cdf190..dc78b29 100644
--- a/gdb/python/py-function.c
+++ b/gdb/python/py-function.c
@@ -182,6 +182,7 @@ fnpy_init (PyObject *self, PyObject *args, PyObject *kwds)
 void
 gdbpy_initialize_functions (void)
 {
+  fnpy_object_type.tp_new = PyType_GenericNew;
   if (PyType_Ready (&fnpy_object_type) < 0)
     return;
 
@@ -231,5 +232,4 @@ static PyTypeObject fnpy_object_type =
   0,				  /* tp_dictoffset */
   fnpy_init,			  /* tp_init */
   0,				  /* tp_alloc */
-  PyType_GenericNew		  /* tp_new */
 };
diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c
index ab9ee8e..6add681 100644
--- a/gdb/python/py-inferior.c
+++ b/gdb/python/py-inferior.c
@@ -702,6 +702,7 @@ gdbpy_initialize_inferior (void)
   observer_attach_target_resumed (python_on_resume);
   observer_attach_inferior_exit (python_inferior_exit);
 
+  membuf_object_type.tp_new = PyType_GenericNew;
   if (PyType_Ready (&membuf_object_type) < 0)
     return;
 
@@ -839,5 +840,4 @@ static PyTypeObject membuf_object_type = {
   0,				  /* tp_dictoffset */
   0,				  /* tp_init */
   0,				  /* tp_alloc */
-  PyType_GenericNew		  /* tp_new */
 };
diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c
index 5c726d6..747d85b 100644
--- a/gdb/python/py-param.c
+++ b/gdb/python/py-param.c
@@ -749,6 +749,7 @@ gdbpy_initialize_parameters (void)
 {
   int i;
 
+  parmpy_object_type.tp_new = PyType_GenericNew;
   if (PyType_Ready (&parmpy_object_type) < 0)
     return;
 
@@ -814,5 +815,4 @@ static PyTypeObject parmpy_object_type =
   0,				  /* tp_dictoffset */
   parmpy_init,			  /* tp_init */
   0,				  /* tp_alloc */
-  PyType_GenericNew		  /* tp_new */
 };
-- 
2.7.4