From 87fc282d642b0feebcc62981cb1f89ec4296a993 Mon Sep 17 00:00:00 2001 From: CraftSpider Date: Thu, 20 Jun 2019 15:11:36 -0400 Subject: [PATCH 1/3] Add ensurepip init stub --- stdlib/2and3/ensurepip/__init__.pyi | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 stdlib/2and3/ensurepip/__init__.pyi diff --git a/stdlib/2and3/ensurepip/__init__.pyi b/stdlib/2and3/ensurepip/__init__.pyi new file mode 100644 index 000000000000..010e217a3fbe --- /dev/null +++ b/stdlib/2and3/ensurepip/__init__.pyi @@ -0,0 +1,4 @@ + +def version() -> str: ... + +def bootstrap(*, root: str = ..., upgrade: bool = ..., user: bool = ..., altinstall: bool = ..., default_pip: bool = ..., verbosity: int = ...) -> None: ... From 49f818f4ad3bdb9656bdbd931c361c31628994eb Mon Sep 17 00:00:00 2001 From: CraftSpider Date: Mon, 16 Sep 2019 08:28:11 -0400 Subject: [PATCH 2/3] Remove extra line for typeshed style --- stdlib/2and3/ensurepip/__init__.pyi | 1 - 1 file changed, 1 deletion(-) diff --git a/stdlib/2and3/ensurepip/__init__.pyi b/stdlib/2and3/ensurepip/__init__.pyi index 010e217a3fbe..5f9e04bdc491 100644 --- a/stdlib/2and3/ensurepip/__init__.pyi +++ b/stdlib/2and3/ensurepip/__init__.pyi @@ -1,4 +1,3 @@ def version() -> str: ... - def bootstrap(*, root: str = ..., upgrade: bool = ..., user: bool = ..., altinstall: bool = ..., default_pip: bool = ..., verbosity: int = ...) -> None: ... From 618f90cd12402eaaf82c193142a2b59245b3e96d Mon Sep 17 00:00:00 2001 From: CraftSpider Date: Fri, 11 Oct 2019 17:29:17 -0400 Subject: [PATCH 3/3] Add condition for py 2/3 difference, Optional for root --- stdlib/2and3/ensurepip/__init__.pyi | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/stdlib/2and3/ensurepip/__init__.pyi b/stdlib/2and3/ensurepip/__init__.pyi index 5f9e04bdc491..10634f2baa6d 100644 --- a/stdlib/2and3/ensurepip/__init__.pyi +++ b/stdlib/2and3/ensurepip/__init__.pyi @@ -1,3 +1,10 @@ +from typing import Optional +import sys + + def version() -> str: ... -def bootstrap(*, root: str = ..., upgrade: bool = ..., user: bool = ..., altinstall: bool = ..., default_pip: bool = ..., verbosity: int = ...) -> None: ... +if sys.version_info >= (3, 0): + def bootstrap(*, root: Optional[str] = ..., upgrade: bool = ..., user: bool = ..., altinstall: bool = ..., default_pip: bool = ..., verbosity: int = ...) -> None: ... +else: + def bootstrap(root: Optional[str] = ..., upgrade: bool = ..., user: bool = ..., altinstall: bool = ..., default_pip: bool = ..., verbosity: int = ...) -> None: ...