diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2017-02-04 09:18:42 +0300 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2017-02-04 09:18:42 +0300 |
| commit | 678487eb345f9f9dea3d3818ecad7d39145bdc65 (patch) | |
| tree | 35c1a98d1ceadc6b67bf7119031d2a89f27f1cb1 /Python/structmember.c | |
| parent | 50a3761c130e9be725bacb5b99d624012c40414a (diff) | |
| parent | 19d8ebcbbd396ec603ed03bc79add9b049c31919 (diff) | |
| download | cpython-678487eb345f9f9dea3d3818ecad7d39145bdc65.tar.gz | |
Issue #29198: Merge from 3.5
Diffstat (limited to 'Python/structmember.c')
| -rw-r--r-- | Python/structmember.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/Python/structmember.c b/Python/structmember.c index af0296d802..be2737d405 100644 --- a/Python/structmember.c +++ b/Python/structmember.c @@ -74,14 +74,12 @@ PyMember_GetOne(const char *addr, PyMemberDef *l) PyErr_SetString(PyExc_AttributeError, l->name); Py_XINCREF(v); break; -#ifdef HAVE_LONG_LONG case T_LONGLONG: - v = PyLong_FromLongLong(*(PY_LONG_LONG *)addr); + v = PyLong_FromLongLong(*(long long *)addr); break; case T_ULONGLONG: - v = PyLong_FromUnsignedLongLong(*(unsigned PY_LONG_LONG *)addr); + v = PyLong_FromUnsignedLongLong(*(unsigned long long *)addr); break; -#endif /* HAVE_LONG_LONG */ case T_NONE: v = Py_None; Py_INCREF(v); @@ -254,7 +252,7 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) char *string; Py_ssize_t len; - string = _PyUnicode_AsStringAndSize(v, &len); + string = PyUnicode_AsUTF8AndSize(v, &len); if (string == NULL || len != 1) { PyErr_BadArgument(); return -1; @@ -266,27 +264,25 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) case T_STRING_INPLACE: PyErr_SetString(PyExc_TypeError, "readonly attribute"); return -1; -#ifdef HAVE_LONG_LONG case T_LONGLONG:{ - PY_LONG_LONG value; - *(PY_LONG_LONG*)addr = value = PyLong_AsLongLong(v); + long long value; + *(long long*)addr = value = PyLong_AsLongLong(v); if ((value == -1) && PyErr_Occurred()) return -1; break; } case T_ULONGLONG:{ - unsigned PY_LONG_LONG value; + unsigned long long value; /* ??? PyLong_AsLongLong accepts an int, but PyLong_AsUnsignedLongLong doesn't ??? */ if (PyLong_Check(v)) - *(unsigned PY_LONG_LONG*)addr = value = PyLong_AsUnsignedLongLong(v); + *(unsigned long long*)addr = value = PyLong_AsUnsignedLongLong(v); else - *(unsigned PY_LONG_LONG*)addr = value = PyLong_AsLong(v); - if ((value == (unsigned PY_LONG_LONG)-1) && PyErr_Occurred()) + *(unsigned long long*)addr = value = PyLong_AsLong(v); + if ((value == (unsigned long long)-1) && PyErr_Occurred()) return -1; break; } -#endif /* HAVE_LONG_LONG */ default: PyErr_Format(PyExc_SystemError, "bad memberdescr type for %s", l->name); |