updates

Author: jprzywoski

source/docs/bool/index.rst

@@ -8,8 +8,8 @@ Constructors
 ------------
 `bool()`_
     Returns an expression converted into a Boolean.
-`Literal Syntax`_
-
+`literal syntax`_
+    Initializes a new instance of the **bool** type.
 
 .. _literal syntax: literals.html
 .. _bool(): ../functions/bool.html

source/docs/complex/index.rst

@@ -10,7 +10,8 @@ Constructors
 ====
 `complex()`_
     Returns an expression converted into a complex number.
-`Literal Syntax`_
+`literal syntax`_
+    Initializes a new instance of the **complex** type.
 
 Properties
 ====

source/docs/dict/index.rst

@@ -13,34 +13,7 @@ Constructors
 `{} dict comprehension`_
     Returns a dictionary based on existing iterables.
 `literal syntax`_
-
-Misc
-====
-`[] (key lookup)`_
-    Returns the value associated with the given key.
-
-Functions
-====
-`len`_
-    Returns an int type specifying number of elements in the collection.
-`min`_
-    Returns the smallest item from a collection.
-`max`_
-    Returns the largest item in an iterable or the largest of two or more arguments.
-`sum`_
-    Returns a total of the items contained in the iterable object.
-`sorted`_
-    Returns a sorted list from the iterable.
-`reversed`_
-    Returns a reverse iterator over a sequence.
-`all`_
-    Returns a Boolean value that indicates whether the collection contains only values that evaluate to True.
-`any`_
-    Returns a Boolean value that indicates whether the collection contains any values that evaluate to True.
-`enumerate`_
-    Returns an enumerate object.
-`zip`_
-    Returns a list of tuples, where the i-th tuple contains the i-th element from each of the argument sequences or iterables.
+    Initializes a new instance of the **dict** type.
 
 Methods
 ====
@@ -110,6 +83,34 @@ Dictionary Views Operators
 `| (union)`_
     Returns all the elements that appear in the dictview and the specified iterable.
 
+Functions
+====
+`len`_
+    Returns an int type specifying number of elements in the collection.
+`min`_
+    Returns the smallest item from a collection.
+`max`_
+    Returns the largest item in an iterable or the largest of two or more arguments.
+`sum`_
+    Returns a total of the items contained in the iterable object.
+`sorted`_
+    Returns a sorted list from the iterable.
+`reversed`_
+    Returns a reverse iterator over a sequence.
+`all`_
+    Returns a Boolean value that indicates whether the collection contains only values that evaluate to True.
+`any`_
+    Returns a Boolean value that indicates whether the collection contains any values that evaluate to True.
+`enumerate`_
+    Returns an enumerate object.
+`zip`_
+    Returns a list of tuples, where the i-th tuple contains the i-th element from each of the argument sequences or iterables.
+
+Misc
+====
+`[] (key lookup)`_
+    Returns the value associated with the given key.
+    
 .. _dict(): ../functions/dict.html
 .. _[] (key lookup): ../brackets/key_lookup.html
 .. _{} dict comprehension: ../comprehensions/dict_comprehension.html

source/docs/dunders/delattr.rst renamed to source/docs/dunderattr/delattr.rst

@@ -1,8 +1,10 @@
 ====
-Double Underscore Methods and Variables
+Direct Attribute Access
 ====
 
-Direct Atribute Access
+The following methods can be defined to customize the meaning of attribute access (use of, assignment to, or deletion of x.name) for class instances.
+
+Methods
 ====
 `\__getattribute__`_
     Called unconditionally to implement attribute accesses for instances of the class.
@@ -13,31 +15,8 @@ Direct Atribute Access
 `\__delattr__`_
     Called when an attribute deletion is attempted.
 
-Descriptor Protocol
-====
-    Used to create object attributes overriding attribute access for class instances.
-
-Comparisons
-================
-
-Containers
-==========
-
-Context Managers
-================
-
-Numeric Methods
-===============
-
-Object Attributes
-=================
-
-Pickle Protocol
-===============
-
 .. _\__getattribute__: ./getattribute.html
 .. _\__getattr__: ./getattr.html
 .. _\__setattr__: ./setattr.html
 .. _\__delattr__: ./delattr.html
-
-.. _Descriptor ProtocolTODO: ./dscrpt.html
+    

source/docs/dunders/getattr.rst renamed to source/docs/dunderattr/getattr.rst

@@ -0,0 +1,55 @@
+====
+__delete__
+====
+
+Description
+====
+Called to delete the attribute on an instance instance of the owner class.
+
+Syntax
+====
+**object**. *__delete__(self, instance)*
+
+*self*
+    Required. Instance of the class, passed automatically on call.
+*instance*
+    Required. Instance is the instance that the attribute was accessed through, or None when the attribute is accessed through the owner.
+
+Remarks
+====
+The following method only apply to new-style classes.
+
+The following methods only apply when an instance of the class containing the method (a so-called descriptor class) appears in an owner class (the descriptor must be in either the owner’s class dictionary or in the class dictionary for one of its parents).
+
+This method should delete attribute value if found or raise an AttributeError exception otherwise.
+
+Example
+====
+::
+
+    # this is our descriptor object
+    class Bar(object):
+        def __init__(self):
+            self.value = ''
+        def __get__(self, instance, owner):
+            print "returned from descriptor object"
+            return self.value
+        def __set__(self, instance, value):
+            print "set in descriptor object"
+            self.value = value
+        def __delete__(self, instance):
+            print "deleted in descriptor object"
+            del self.value
+    
+    class Foo(object):
+        bar = Bar()
+
+    f = Foo()
+    f.bar = 10
+    print f.bar
+    del f.bar
+
+    set in descriptor object
+    returned from descriptor object
+    10
+    deleted in descriptor object

source/docs/dunders/getattribute.rst renamed to source/docs/dunderattr/getattribute.rst

@@ -0,0 +1,57 @@
+====
+__get__
+====
+
+Description
+====
+Called to get the attribute of the owner class (class attribute access) or of an instance of that class (instance attribute access).
+
+Syntax
+====
+**object**. *__get__(self, instance, owner)*
+
+*self*
+    Required. Instance of the class, passed automatically on call.
+*instance*
+    Required. Instance is the instance that the attribute was accessed through, or None when the attribute is accessed through the owner.
+*owner*
+    Required. Owner is always the owner class.
+
+Remarks
+====
+The following method only applies to new-style classes.
+
+The following methods only apply when an instance of the class containing the method (a so-called descriptor class) appears in an owner class (the descriptor must be in either the owner’s class dictionary or in the class dictionary for one of its parents).
+
+This method should return the (computed) attribute value or raise an AttributeError exception.
+
+Example
+====
+::
+
+    # this is our descriptor object
+    class Bar(object):
+        def __init__(self):
+            self.value = ''
+        def __get__(self, instance, owner):
+            print "returned from descriptor object"
+            return self.value
+        def __set__(self, instance, value):
+            print "set in descriptor object"
+            self.value = value
+        def __delete__(self, instance):
+            print "deleted in descriptor object"
+            del self.value
+
+    class Foo(object):
+        bar = Bar()
+
+    f = Foo()
+    f.bar = 10
+    print f.bar
+    del f.bar
+
+    set in descriptor object
+    returned from descriptor object
+    10
+    deleted in descriptor object

source/docs/dunders/index.rst renamed to source/docs/dunderattr/index.rst

@@ -0,0 +1,40 @@
+====
+Descriptor Protocol
+====
+
+In general, a descriptor is an object attribute with "binding behavior", one whose attribute access has been overridden by methods in the descriptor protocol: __get__(), __set__(), and __delete__(). If any of those methods are defined for an object, it is said to be a descriptor.
+
+The default behavior for attribute access is to get, set, or delete the attribute from an object’s dictionary. For instance, a.x has a lookup chain starting with a.__dict__['x'], then type(a).__dict__['x'], and continuing through the base classes of type(a) excluding metaclasses.
+
+However, if the looked-up value is an object defining one of the descriptor methods, then Python may override the default behavior and invoke the descriptor method instead. Where this occurs in the precedence chain depends on which descriptor methods were defined and how they were called. Note that descriptors are only invoked for new style objects or classes (ones that subclass object() or type()).
+
+The starting point for descriptor invocation is a binding, a.x. How the arguments are assembled depends on a:
+
+Direct Call
+    The simplest and least common call is when user code directly invokes a descriptor method: x.__get__(a).
+Instance Binding
+    If binding to a new-style object instance, a.x is transformed into the call: type(a).__dict__['x'].__get__(a, type(a)).
+Class Binding
+    If binding to a new-style class, A.x is transformed into the call: A.__dict__['x'].__get__(None, A).
+Super Binding
+    If a is an instance of super, then the binding super(B, obj).m() searches obj.__class__.__mro__ for the base class A immediately preceding B and then invokes the descriptor with the call: A.__dict__['m'].__get__(obj, obj.__class__).
+
+For instance bindings, the precedence of descriptor invocation depends on the which descriptor methods are defined. A descriptor can define any combination of __get__(), __set__() and __delete__(). If it does not define __get__(), then accessing the attribute will return the descriptor object itself unless there is a value in the object’s instance dictionary. If the descriptor defines __set__() and/or __delete__(), it is a data descriptor; if it defines neither, it is a non-data descriptor. Normally, data descriptors define both __get__() and __set__(), while non-data descriptors have just the __get__() method. Data descriptors with __set__() and __get__() defined always override a redefinition in an instance dictionary. In contrast, non-data descriptors can be overridden by instances.
+
+Python methods (including staticmethod() and classmethod()) are implemented as non-data descriptors. Accordingly, instances can redefine and override methods. This allows individual instances to acquire behaviors that differ from other instances of the same class.
+
+The property() function is implemented as a data descriptor. Accordingly, instances cannot override the behavior of a property.
+
+Methods
+====
+`\__get__`_
+    Called to get the attribute of the owner class (class attribute access) or of an instance of that class (instance attribute access).
+`\__set__`_
+    Called to set the attribute on an instance instance of the owner class to a new value, value.
+`\__delete__`_
+    Called to delete the attribute on an instance instance of the owner class.
+    
+    
+.. _\__get__: get.html
+.. _\__set__: set.html
+.. _\__delete__: delete.html

source/docs/dunders/setattr.rst renamed to source/docs/dunderattr/setattr.rst

@@ -0,0 +1,55 @@
+====
+__set__
+====
+
+Description
+====
+Called to set the attribute on an instance instance of the owner class to a new value, value.
+
+Syntax
+====
+**object**. *__set__(self, instance, value)*
+
+*self*
+    Required. Instance of the class, passed automatically on call.
+*instance*
+    Required. Instance is the instance that the attribute was accessed through, or None when the attribute is accessed through the owner.
+*value*
+    Required. The value we want to assign to the attribute.
+
+Remarks
+====
+The following method only apply to new-style classes.
+
+The following methods only apply when an instance of the class containing the method (a so-called descriptor class) appears in an owner class (the descriptor must be in either the owner’s class dictionary or in the class dictionary for one of its parents).
+
+Example
+====
+::
+
+    # this is our descriptor object
+    class Bar(object):
+        def __init__(self):
+            self.value = ''
+        def __get__(self, instance, owner):
+            print "returned from descriptor object"
+            return self.value
+        def __set__(self, instance, value):
+            print "set in descriptor object"
+            self.value = value
+        def __delete__(self, instance):
+            print "deleted in descriptor object"
+            del self.value
+
+    class Foo(object):
+        bar = Bar()
+
+    f = Foo()
+    f.bar = 10
+    print f.bar
+    del f.bar
+
+    set in descriptor object
+    returned from descriptor object
+    10
+    deleted in descriptor object