Merge 3.5

This commit is contained in:
Yury Selivanov 2015-08-17 13:02:53 -04:00
commit 9e35cac3a1

View file

@ -178,6 +178,10 @@ attributes:
+-----------+-----------------+---------------------------+ +-----------+-----------------+---------------------------+
| | gi_code | code | | | gi_code | code |
+-----------+-----------------+---------------------------+ +-----------+-----------------+---------------------------+
| | gi_yieldfrom | object being iterated by |
| | | ``yield from``, or |
| | | ``None`` |
+-----------+-----------------+---------------------------+
| coroutine | __name__ | name | | coroutine | __name__ | name |
+-----------+-----------------+---------------------------+ +-----------+-----------------+---------------------------+
| | __qualname__ | qualified name | | | __qualname__ | qualified name |
@ -191,10 +195,6 @@ attributes:
+-----------+-----------------+---------------------------+ +-----------+-----------------+---------------------------+
| | cr_code | code | | | cr_code | code |
+-----------+-----------------+---------------------------+ +-----------+-----------------+---------------------------+
| | gi_yieldfrom | object being iterated by |
| | | ``yield from``, or |
| | | ``None`` |
+-----------+-----------------+---------------------------+
| builtin | __doc__ | documentation string | | builtin | __doc__ | documentation string |
+-----------+-----------------+---------------------------+ +-----------+-----------------+---------------------------+
| | __name__ | original name of this | | | __name__ | original name of this |