Mercurial > cpython-lru_cache-weakref

diff Python/structmember.c @ 60209:fa641d605468

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ........
author Benjamin Peterson <benjamin@python.org>
date Sat, 03 Apr 2010 01:40:24 +0000
parents a7b58f1e8af0
children fb2d64a4d872
line wrap: on
line diff
--- a/Python/structmember.c	Sat Apr 03 01:02:00 2010 +0000
+++ b/Python/structmember.c	Sat Apr 03 01:40:24 2010 +0000
@@ -106,7 +106,7 @@
 
 	addr += l->offset;
 
-	if ((l->flags & READONLY) || l->type == T_STRING)
+	if ((l->flags & READONLY))
 	{
 		PyErr_SetString(PyExc_AttributeError, "readonly attribute");
 		return -1;
@@ -266,6 +266,10 @@
 		*(char*)addr = string[0];
 		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;