Fixes for syntax errors in code examples (python#7651)

hoefling · Guido van Rossum · commit beec11a28fd8 · 2019-10-07T16:47:30.000-07:00
Signed-off-by: Oleg Höfling &lt;oleg.hoefling@gmail.com&gt;
diff --git a/docs/source/generics.rst b/docs/source/generics.rst
@@ -122,7 +122,7 @@ non-generic. For example:
    KT = TypeVar('KT')
    VT = TypeVar('VT')
 
-   class MyMap(Mapping[KT, VT]]):  # This is a generic subclass of Mapping
+   class MyMap(Mapping[KT, VT]):  # This is a generic subclass of Mapping
        def __getitem__(self, k: KT) -> VT:
            ...  # Implementations omitted
        def __iter__(self) -> Iterator[KT]:
@@ -447,7 +447,7 @@ subtype of ``str``:
 
     class S(str): pass
 
-    ss = concat(S('foo'), S('bar')))
+    ss = concat(S('foo'), S('bar'))
 
 You may expect that the type of ``ss`` is ``S``, but the type is
 actually ``str``: a subtype gets promoted to one of the valid values
diff --git a/docs/source/kinds_of_types.rst b/docs/source/kinds_of_types.rst
@@ -179,12 +179,12 @@ Any)`` function signature. Example:
 
    from typing import Callable
 
-    def arbitrary_call(f: Callable[..., int]) -> int:
-        return f('x') + f(y=2)  # OK
+   def arbitrary_call(f: Callable[..., int]) -> int:
+       return f('x') + f(y=2)  # OK
 
-    arbitrary_call(ord)   # No static error, but fails at runtime
-    arbitrary_call(open)  # Error: does not return an int
-    arbitrary_call(1)     # Error: 'int' is not callable
+   arbitrary_call(ord)   # No static error, but fails at runtime
+   arbitrary_call(open)  # Error: does not return an int
+   arbitrary_call(1)     # Error: 'int' is not callable
 
 In situations where more precise or complex types of callbacks are
 necessary one can use flexible :ref:`callback protocols <callback_protocols>`.
@@ -484,7 +484,7 @@ defined. Thus this code does not work as expected:
 .. code-block:: python
 
    def f(x: A) -> None:  # Error: Name A not defined
-       ....
+       ...
 
    class A:
        ...
diff --git a/docs/source/more_types.rst b/docs/source/more_types.rst
@@ -80,7 +80,7 @@ certain values from base class instances. Example:
     class UserId(int):
         pass
 
-    get_by_user_id(user_id: UserId):
+    def get_by_user_id(user_id: UserId):
         ...
 
 However, this approach introduces some runtime overhead. To avoid this, the typing
diff --git a/docs/source/protocols.rst b/docs/source/protocols.rst
@@ -37,7 +37,7 @@ For example, ``IntList`` below is iterable, over ``int`` values:
    from typing import Iterator, Iterable, Optional
 
    class IntList:
-       def __init__(self, value: int, next: Optional[IntList]) -> None:
+       def __init__(self, value: int, next: Optional['IntList']) -> None:
            self.value = value
            self.next = next
 
diff --git a/docs/source/stubgen.rst b/docs/source/stubgen.rst
@@ -40,7 +40,7 @@ Stubgen can generate this stub file based on the above file:
    class Window:
        parent: Any = ...
        width: Any = ...
-       height: Any: ...
+       height: Any = ...
        def __init__(self, width, height) -> None: ...
 
    def create_empty() -> Window: ...
