- Don't examine args for functions declared METH_NOARGS (#235017)

This commit is contained in:
David Zeuthen 2007-04-04 02:47:44 +00:00
parent a8876c74e9
commit 50afc3eeb4
2 changed files with 60 additions and 1 deletions

View File

@ -0,0 +1,54 @@
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 21 Feb 2007 12:31:15 +0000 (+0000)
Subject: Don't examine args for functions declared METH_NOARGS.
X-Git-Url: http://gitweb.freedesktop.org/?p=dbus/dbus-python.git;a=commitdiff;h=8dce2df1ceacffb2aa6e2cc8b1d4b58ee95ac5b1
Don't examine args for functions declared METH_NOARGS.
It's not guaranteed to be non-NULL, and Python checks there are no arguments
so we don't have to.
---
--- a/_dbus_bindings/conn-methods.c
+++ b/_dbus_bindings/conn-methods.c
@@ -226,10 +226,9 @@ PyDoc_STRVAR(Connection_close__doc__,
"close()\n\n"
"Close the connection.");
static PyObject *
-Connection_close (Connection *self, PyObject *args)
+Connection_close (Connection *self, PyObject *args UNUSED)
{
TRACE(self);
- if (!PyArg_ParseTuple(args, ":close")) return NULL;
/* Because the user explicitly asked to close the connection, we'll even
let them close shared connections. */
if (self->conn) {
@@ -244,13 +243,12 @@ PyDoc_STRVAR(Connection_get_is_connected
"get_is_connected() -> bool\n\n"
"Return true if this Connection is connected.\n");
static PyObject *
-Connection_get_is_connected (Connection *self, PyObject *args)
+Connection_get_is_connected (Connection *self, PyObject *args UNUSED)
{
dbus_bool_t ret;
TRACE(self);
DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn);
- if (!PyArg_ParseTuple(args, ":get_is_connected")) return NULL;
Py_BEGIN_ALLOW_THREADS
ret = dbus_connection_get_is_connected(self->conn);
Py_END_ALLOW_THREADS
@@ -261,13 +259,12 @@ PyDoc_STRVAR(Connection_get_is_authentic
"get_is_authenticated() -> bool\n\n"
"Return true if this Connection was ever authenticated.\n");
static PyObject *
-Connection_get_is_authenticated (Connection *self, PyObject *args)
+Connection_get_is_authenticated (Connection *self, PyObject *args UNUSED)
{
dbus_bool_t ret;
TRACE(self);
DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn);
- if (!PyArg_ParseTuple(args, ":get_is_authenticated")) return NULL;
Py_BEGIN_ALLOW_THREADS
ret = dbus_connection_get_is_authenticated(self->conn);
Py_END_ALLOW_THREADS

View File

@ -7,9 +7,10 @@
Summary: D-Bus Python Bindings
Name: dbus-python
Version: 0.80.2
Release: 1%{?dist}
Release: 2%{?dist}
URL: http://www.freedesktop.org/software/dbus/
Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
Patch0: dbus-python-0.80.2-examine-args.patch
License: AFL/GPL
Group: System Environment/Libraries
@ -34,6 +35,7 @@ bindings.
%prep
%setup -q
%patch -p 1 -b .examine-args
%build
%configure
@ -80,6 +82,9 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/dbus-python.pc
%changelog
* Tue Feb 13 2007 David Zeuthen <davidz@redhat.com> - 0.80.2-2
- Don't examine args for functions declared METH_NOARGS (#235017)
* Tue Feb 13 2007 John (J5) Palmieri <johnp@redhat.com> - 0.80.2-1
- upgrade to 0.80.2 which fixes some memleaks