Merge branch 'master' into threading

Conflicts:
	stdlib/3/threading.pyi

stdlib/3/csv.pyi

@@ -2,7 +2,7 @@
 #
 # NOTE: This dynamically typed stub was automatically generated by stubgen.
 
-from typing import Any
+from typing import Any, Iterable
 
 QUOTE_ALL = ...  # type: int
 QUOTE_MINIMAL = ...  # type: int
@@ -48,7 +48,7 @@ class unix_dialect(Dialect):
     lineterminator = ...  # type: Any
     quoting = ...  # type: Any
 
-class DictReader:
+class DictReader(Iterable):
     restkey = ...  # type: Any
     restval = ...  # type: Any
     reader = ...  # type: Any

stdlib/3/html/entities.pyi

@@ -0,0 +1,10 @@
+# Stubs for html.entities (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any
+
+name2codepoint = ... # type: Any
+html5 = ... # type: Any
+codepoint2name = ... # type: Any
+entitydefs = ... # type: Any

stdlib/3/inspect.pyi

@@ -1,6 +1,6 @@
 # Stubs for inspect
 
-from typing import Any, Tuple, List, Callable
+from typing import Any, Tuple, List, Dict, Callable, NamedTuple
 from types import FrameType
 
 _object = object
@@ -22,13 +22,23 @@ def cleandoc(doc: str) -> str: ...
 
 def getsourcelines(obj: object) -> Tuple[List[str], int]: ...
 
-# namedtuple('ArgSpec', 'args varargs keywords defaults')
-class ArgSpec(tuple):
-    args = ...  # type: List[str]
-    varargs = ...  # type: str
-    keywords = ...  # type: str
-    defaults = ...  # type: tuple
+ArgSpec = NamedTuple('ArgSpec', [('args', List[str]),
+                                 ('varargs', str),
+                                 ('keywords', str),
+                                 ('defaults', tuple),
+                                 ])
 
 def getargspec(func: object) -> ArgSpec: ...
 
+FullArgSpec = NamedTuple('FullArgSpec', [('args', List[str]),
+                                         ('varargs', str),
+                                         ('varkw', str),
+                                         ('defaults', tuple),
+                                         ('kwonlyargs', List[str]),
+                                         ('kwonlydefaults', Dict[str, Any]),
+                                         ('annotations', Dict[str, Any]),
+                                         ])
+
+def getfullargspec(func: object) -> FullArgSpec: ...
+
 def stack() -> List[Tuple[FrameType, str, int, str, List[str], int]]: ...

stdlib/3/numbers.pyi

@@ -0,0 +1,80 @@
+# Stubs for numbers (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any
+
+class Number:
+    __hash__ = ... # type: Any
+
+class Complex(Number):
+    def __complex__(self): ...
+    def __bool__(self): ...
+    @property
+    def real(self): ...
+    @property
+    def imag(self): ...
+    def __add__(self, other): ...
+    def __radd__(self, other): ...
+    def __neg__(self): ...
+    def __pos__(self): ...
+    def __sub__(self, other): ...
+    def __rsub__(self, other): ...
+    def __mul__(self, other): ...
+    def __rmul__(self, other): ...
+    def __truediv__(self, other): ...
+    def __rtruediv__(self, other): ...
+    def __pow__(self, exponent): ...
+    def __rpow__(self, base): ...
+    def __abs__(self): ...
+    def conjugate(self): ...
+    def __eq__(self, other): ...
+
+class Real(Complex):
+    def __float__(self): ...
+    def __trunc__(self): ...
+    def __floor__(self): ...
+    def __ceil__(self): ...
+    def __round__(self, ndigits=None): ...
+    def __divmod__(self, other): ...
+    def __rdivmod__(self, other): ...
+    def __floordiv__(self, other): ...
+    def __rfloordiv__(self, other): ...
+    def __mod__(self, other): ...
+    def __rmod__(self, other): ...
+    def __lt__(self, other): ...
+    def __le__(self, other): ...
+    def __complex__(self): ...
+    @property
+    def real(self): ...
+    @property
+    def imag(self): ...
+    def conjugate(self): ...
+
+class Rational(Real):
+    @property
+    def numerator(self): ...
+    @property
+    def denominator(self): ...
+    def __float__(self): ...
+
+class Integral(Rational):
+    def __int__(self): ...
+    def __index__(self): ...
+    def __pow__(self, exponent, modulus=None): ...
+    def __lshift__(self, other): ...
+    def __rlshift__(self, other): ...
+    def __rshift__(self, other): ...
+    def __rrshift__(self, other): ...
+    def __and__(self, other): ...
+    def __rand__(self, other): ...
+    def __xor__(self, other): ...
+    def __rxor__(self, other): ...
+    def __or__(self, other): ...
+    def __ror__(self, other): ...
+    def __invert__(self): ...
+    def __float__(self): ...
+    @property
+    def numerator(self): ...
+    @property
+    def denominator(self): ...

stdlib/3/textwrap.pyi

@@ -61,6 +61,7 @@ class TextWrapper:
 
 
 def wrap(
+        text: str = ...,
         width: int = ...,
         *,
         initial_indent: str = ...,

stdlib/3/typing.pyi

@@ -107,6 +107,9 @@ class Generator(Iterator[_T_co], Generic[_T_co, _T_contra, _V_co]):
     @abstractmethod
     def close(self) -> None:...
 
+    @abstractmethod
+    def __iter__(self) -> 'Generator[_T_co, _T_contra, _V_co]': ...
+
 class AbstractFuture(Generic[_T]): ...
 
 class Awaitable(Generic[_T_co]):