Sync typeshed (#6800)

ilevkivskyi · web-flow · commit 9c91487f0c70 · 2019-05-08T21:26:49.000+01:00
Syncing just because we didn't do this for a while (plus to test the recent `str.__contains__()` signature updates that actually found a bug in stubgen).
diff --git a/mypy/stubgen.py b/mypy/stubgen.py
@@ -717,7 +717,8 @@ def get_init(self, lvalue: str, rvalue: Expression,
             typename = self.print_annotation(annotation)
             if (isinstance(annotation, UnboundType) and not annotation.args and
                     annotation.name == 'Final' and
-                    self.import_tracker.module_for.get('Final') in ('typing, typing_extensions')):
+                    self.import_tracker.module_for.get('Final') in ('typing',
+                                                                    'typing_extensions')):
                 # Final without type argument is invalid in stubs.
                 final_arg = self.get_str_type_of_node(rvalue)
                 typename += '[{}]'.format(final_arg)
diff --git a/mypy/typeshed b/mypy/typeshed
@@ -1 +1 @@
-Subproject commit f7c00b8b33008de74d291f4a5084b129eb2eece6
+Subproject commit 36b28e5b97efd0f2573aafcec4836f287bf5be5f
diff --git a/test-data/unit/stubgen.test b/test-data/unit/stubgen.test
@@ -1371,6 +1371,14 @@ y: Final[Any]
 z: Final[object]
 t: Final[Any]
 
+[case testFinalInvalid_semanal]
+Final = 'boom'
+
+x: Final = 1
+[out]
+Final: str
+x: Final
+
 [case testNoFunctionNested_semanal]
 import a
 from typing import Dict, Any
