diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-07-21 06:55:02 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-07-21 06:55:02 +0000 |
| commit | 6819210b9e4e5719a6f7f9c1725f8fa70a8936f6 (patch) | |
| tree | 456e2e6b3d9d71e966f3b0e419ecfe44ce3c1fdd /Modules/_ssl.c | |
| parent | b1994b4a5d0139a010eb0af1d6615a3df92fe786 (diff) | |
| download | cpython-git-6819210b9e4e5719a6f7f9c1725f8fa70a8936f6.tar.gz | |
PEP 3123: Provide forward compatibility with Python 3.0, while keeping
backwards compatibility. Add Py_Refcnt, Py_Type, Py_Size, and
PyVarObject_HEAD_INIT.
Diffstat (limited to 'Modules/_ssl.c')
| -rw-r--r-- | Modules/_ssl.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index f1e1092ac7..d0f71159d4 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -72,7 +72,7 @@ static PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args); static int check_socket_and_wait_for_timeout(PySocketSockObject *s, int writing); -#define PySSLObject_Check(v) ((v)->ob_type == &PySSL_Type) +#define PySSLObject_Check(v) (Py_Type(v) == &PySSL_Type) typedef enum { SOCKET_IS_NONBLOCKING, @@ -570,8 +570,7 @@ static PyObject *PySSL_getattr(PySSLObject *self, char *name) } static PyTypeObject PySSL_Type = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(NULL, 0) "socket.SSL", /*tp_name*/ sizeof(PySSLObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -632,7 +631,7 @@ PySSL_RAND_egd(PyObject *self, PyObject *arg) if (!PyString_Check(arg)) return PyErr_Format(PyExc_TypeError, "RAND_egd() expected string, found %s", - arg->ob_type->tp_name); + Py_Type(arg)->tp_name); bytes = RAND_egd(PyString_AS_STRING(arg)); if (bytes == -1) { PyErr_SetString(PySSLErrorObject, @@ -678,7 +677,7 @@ init_ssl(void) { PyObject *m, *d; - PySSL_Type.ob_type = &PyType_Type; + Py_Type(&PySSL_Type) = &PyType_Type; m = Py_InitModule3("_ssl", PySSL_methods, module_doc); if (m == NULL) |