Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r59013:01f83f7aa7f6
Date: 2012-11-19 20:51 -0800
http://bitbucket.org/pypy/pypy/changeset/01f83f7aa7f6/
Log: this is now an AttributeError
diff --git a/pypy/interpreter/test/test_typedef.py
b/pypy/interpreter/test/test_typedef.py
--- a/pypy/interpreter/test/test_typedef.py
+++ b/pypy/interpreter/test/test_typedef.py
@@ -52,8 +52,8 @@
member = X.x
assert member.__name__ == 'x'
assert member.__objclass__ is X
- raises((TypeError, AttributeError), "member.__name__ = 'x'")
- raises((TypeError, AttributeError), "member.__objclass__ = X")
+ raises(AttributeError, "member.__name__ = 'x'")
+ raises(AttributeError, "member.__objclass__ = X")
def test_descr_getsetproperty(self):
from types import FrameType
diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -480,7 +480,7 @@
Change the value of the property of the given obj."""
fset = self.fset
if fset is None:
- raise OperationError(space.w_TypeError,
+ raise OperationError(space.w_AttributeError,
space.wrap("readonly attribute"))
try:
fset(self, space, w_obj, w_value)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
