diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-04-03 01:40:44 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-04-03 01:40:44 +0000 |
| commit | 498289ef28284d99bd0d73bf3349c17977308693 (patch) | |
| tree | 665c68b40f0912f96a4f5ad8ffc9129afb322609 /Python | |
| parent | 8d837ab8695ec74b05bd99d63bb23deefa05d85f (diff) | |
| download | cpython-git-498289ef28284d99bd0d73bf3349c17977308693.tar.gz | |
Merged revisions 79642,79644 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79642 | benjamin.peterson | 2010-04-02 20:08:34 -0500 (Fri, 02 Apr 2010) | 1 line
split out large test function
........
r79644 | benjamin.peterson | 2010-04-02 20:28:57 -0500 (Fri, 02 Apr 2010) | 1 line
give TypeError when trying to set T_STRING_INPLACE
........
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/structmember.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Python/structmember.c b/Python/structmember.c index 9f87c076e3..d2efd14f5d 100644 --- a/Python/structmember.c +++ b/Python/structmember.c @@ -172,7 +172,7 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) addr += l->offset; - if ((l->flags & READONLY) || l->type == T_STRING) + if ((l->flags & READONLY)) { PyErr_SetString(PyExc_TypeError, "readonly attribute"); return -1; @@ -328,6 +328,10 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) return -1; } break; + case T_STRING: + case T_STRING_INPLACE: + PyErr_SetString(PyExc_TypeError, "readonly attribute"); + return -1; #ifdef HAVE_LONG_LONG case T_LONGLONG:{ PY_LONG_LONG value; |