merge
diff --git a/Doc/howto/descriptor.rst b/Doc/howto/descriptor.rst
index 0b513f9..923bbe8 100644
--- a/Doc/howto/descriptor.rst
+++ b/Doc/howto/descriptor.rst
@@ -210,25 +210,36 @@
self.fget = fget
self.fset = fset
self.fdel = fdel
+ if doc is None and fget is not None:
+ doc = fget.__doc__
self.__doc__ = doc
def __get__(self, obj, objtype=None):
if obj is None:
return self
if self.fget is None:
- raise AttributeError, "unreadable attribute"
+ raise AttributeError("unreadable attribute")
return self.fget(obj)
def __set__(self, obj, value):
if self.fset is None:
- raise AttributeError, "can't set attribute"
+ raise AttributeError("can't set attribute")
self.fset(obj, value)
def __delete__(self, obj):
if self.fdel is None:
- raise AttributeError, "can't delete attribute"
+ raise AttributeError("can't delete attribute")
self.fdel(obj)
+ def getter(self, fget):
+ return type(self)(fget, self.fset, self.fdel, self.__doc__)
+
+ def setter(self, fset):
+ return type(self)(self.fget, fset, self.fdel, self.__doc__)
+
+ def deleter(self, fdel):
+ return type(self)(self.fget, self.fset, fdel, self.__doc__)
+
The :func:`property` builtin helps whenever a user interface has granted
attribute access and then subsequent changes require the intervention of a
method.