From e88b9dfa8fca6c4bd13ae01ea49ff1d1934a972b Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 12 Jul 2016 08:47:09 -0700 Subject: [PATCH 1/4] SplitNamespace should derive from Namespace. --- mypy/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mypy/main.py b/mypy/main.py index 1d4fca7858683..49067ce91fea5 100644 --- a/mypy/main.py +++ b/mypy/main.py @@ -85,7 +85,7 @@ def type_check_only(sources: List[BuildSource], MYPYPATH additional module search path""" -class SplitNamespace: +class SplitNamespace(argparse.Namespace): def __init__(self, standard_namespace: object, alt_namespace: object, alt_prefix: str) -> None: self.__dict__['_standard_namespace'] = standard_namespace self.__dict__['_alt_namespace'] = alt_namespace From a5949448bd59ae44882676fbcdf226e5feb9d592 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 12 Jul 2016 14:36:27 -0700 Subject: [PATCH 2/4] Add band-aid type-ignore to make tests pass. See #1846. --- test-data/stdlib-samples/3.2/test/test_random.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-data/stdlib-samples/3.2/test/test_random.py b/test-data/stdlib-samples/3.2/test/test_random.py index cec22efc0b832..5989ceeee2bbb 100644 --- a/test-data/stdlib-samples/3.2/test/test_random.py +++ b/test-data/stdlib-samples/3.2/test/test_random.py @@ -46,7 +46,7 @@ def test_seedargs(self) -> None: for arg in [list(range(3)), {'one': 1}]: self.assertRaises(TypeError, self.gen.seed, arg) self.assertRaises(TypeError, self.gen.seed, 1, 2, 3, 4) - self.assertRaises(TypeError, type(self.gen), []) + self.assertRaises(TypeError, type(self.gen), []) # type: ignore # mypy issue 1846 def test_choice(self) -> None: choice = self.gen.choice From 89ddf49c9e290412d1935e8a392b4f3c73ba7bd8 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 12 Jul 2016 14:36:41 -0700 Subject: [PATCH 3/4] Sync typeshed. --- typeshed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/typeshed b/typeshed index 8515cf5de86d5..1c4662d2f3457 160000 --- a/typeshed +++ b/typeshed @@ -1 +1 @@ -Subproject commit 8515cf5de86d5e1de9c996b1ec62ab580fddc201 +Subproject commit 1c4662d2f34571120d00b983e047558391688a9b From 6b09825723a737da809df289feb581803dd67237 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 12 Jul 2016 16:33:22 -0700 Subject: [PATCH 4/4] Sync typeshed (newer). --- typeshed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/typeshed b/typeshed index 1c4662d2f3457..b63e09c239052 160000 --- a/typeshed +++ b/typeshed @@ -1 +1 @@ -Subproject commit 1c4662d2f34571120d00b983e047558391688a9b +Subproject commit b63e09c2390523be8252d37abf25fee26eff9656