102 lines
3.4 KiB
Diff
102 lines
3.4 KiB
Diff
From 1b2df1bd709c6fffc830bc3d5f5a06ebe2f7c8b5 Mon Sep 17 00:00:00 2001
|
|
From: Kamil Dudka <kdudka@redhat.com>
|
|
Date: Thu, 8 Aug 2013 13:56:50 +0200
|
|
Subject: [PATCH] python3: use Py_TYPE(obj) instead of obj->ob_type
|
|
|
|
---
|
|
src/pycurl.c | 22 +++++++++++-----------
|
|
1 files changed, 11 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/src/pycurl.c b/src/pycurl.c
|
|
index 87dac7e..fcd8880 100644
|
|
--- a/src/pycurl.c
|
|
+++ b/src/pycurl.c
|
|
@@ -382,7 +382,7 @@ get_thread_state(const CurlObject *self)
|
|
*/
|
|
if (self == NULL)
|
|
return NULL;
|
|
- assert(self->ob_type == p_Curl_Type);
|
|
+ assert(Py_TYPE(self) == p_Curl_Type);
|
|
if (self->state != NULL)
|
|
{
|
|
/* inside perform() */
|
|
@@ -412,7 +412,7 @@ get_thread_state_multi(const CurlMultiObject *self)
|
|
*/
|
|
if (self == NULL)
|
|
return NULL;
|
|
- assert(self->ob_type == p_CurlMulti_Type);
|
|
+ assert(Py_TYPE(self) == p_CurlMulti_Type);
|
|
if (self->state != NULL)
|
|
{
|
|
/* inside multi_perform() */
|
|
@@ -455,7 +455,7 @@ static void
|
|
assert_share_state(const CurlShareObject *self)
|
|
{
|
|
assert(self != NULL);
|
|
- assert(self->ob_type == p_CurlShare_Type);
|
|
+ assert(Py_TYPE(self) == p_CurlShare_Type);
|
|
#ifdef WITH_THREAD
|
|
assert(self->lock != NULL);
|
|
#endif
|
|
@@ -467,7 +467,7 @@ static void
|
|
assert_curl_state(const CurlObject *self)
|
|
{
|
|
assert(self != NULL);
|
|
- assert(self->ob_type == p_Curl_Type);
|
|
+ assert(Py_TYPE(self) == p_Curl_Type);
|
|
#ifdef WITH_THREAD
|
|
(void) get_thread_state(self);
|
|
#endif
|
|
@@ -479,7 +479,7 @@ static void
|
|
assert_multi_state(const CurlMultiObject *self)
|
|
{
|
|
assert(self != NULL);
|
|
- assert(self->ob_type == p_CurlMulti_Type);
|
|
+ assert(Py_TYPE(self) == p_CurlMulti_Type);
|
|
#ifdef WITH_THREAD
|
|
if (self->state != NULL) {
|
|
assert(self->multi_handle != NULL);
|
|
@@ -1061,7 +1061,7 @@ util_curl_close(CurlObject *self)
|
|
/* Zero handle and thread-state to disallow any operations to be run
|
|
* from now on */
|
|
assert(self != NULL);
|
|
- assert(self->ob_type == p_Curl_Type);
|
|
+ assert(Py_TYPE(self) == p_Curl_Type);
|
|
handle = self->handle;
|
|
self->handle = NULL;
|
|
if (handle == NULL) {
|
|
@@ -2351,7 +2351,7 @@ do_curl_setopt(CurlObject *self, PyObject *args)
|
|
return Py_None;
|
|
}
|
|
}
|
|
- if (obj->ob_type != p_CurlShare_Type) {
|
|
+ if (Py_TYPE(obj) != p_CurlShare_Type) {
|
|
PyErr_SetString(PyExc_TypeError, "invalid arguments to setopt");
|
|
return NULL;
|
|
}
|
|
@@ -3093,7 +3093,7 @@ do_multi_info_read(CurlMultiObject *self, PyObject *args)
|
|
Py_DECREF(ok_list);
|
|
CURLERROR_MSG("Unable to fetch curl handle from curl object");
|
|
}
|
|
- assert(co->ob_type == p_Curl_Type);
|
|
+ assert(Py_TYPE(co) == p_Curl_Type);
|
|
if (msg->msg != CURLMSG_DONE) {
|
|
/* FIXME: what does this mean ??? */
|
|
}
|
|
@@ -3684,9 +3684,9 @@ initpycurl(void)
|
|
p_Curl_Type = &Curl_Type;
|
|
p_CurlMulti_Type = &CurlMulti_Type;
|
|
p_CurlShare_Type = &CurlShare_Type;
|
|
- Curl_Type.ob_type = &PyType_Type;
|
|
- CurlMulti_Type.ob_type = &PyType_Type;
|
|
- CurlShare_Type.ob_type = &PyType_Type;
|
|
+ Py_TYPE(&Curl_Type) = &PyType_Type;
|
|
+ Py_TYPE(&CurlMulti_Type) = &PyType_Type;
|
|
+ Py_TYPE(&CurlShare_Type) = &PyType_Type;
|
|
|
|
/* Create the module and add the functions */
|
|
m = Py_InitModule3("pycurl", curl_methods, module_doc);
|
|
--
|
|
1.7.1
|
|
|