From e16748c95737f4b612cb224cf738e0c707222e79 Mon Sep 17 00:00:00 2001 From: Joshua Morton Date: Mon, 8 Apr 2019 08:26:52 -0700 Subject: [PATCH 1/2] Add six.moves types form email_mime sources. As a followup to the work done in #2767 and #2830, and to address a piece of #66, most of the email_mime submodules aren't typed in six under python2, only python3. Now they are. --- third_party/2/six/moves/email_mime_base.pyi | 1 + third_party/2/six/moves/email_mime_multipart.pyi | 1 + third_party/2/six/moves/email_mime_nonmultipart.pyi | 1 + 3 files changed, 3 insertions(+) create mode 100644 third_party/2/six/moves/email_mime_base.pyi create mode 100644 third_party/2/six/moves/email_mime_multipart.pyi create mode 100644 third_party/2/six/moves/email_mime_nonmultipart.pyi diff --git a/third_party/2/six/moves/email_mime_base.pyi b/third_party/2/six/moves/email_mime_base.pyi new file mode 100644 index 000000000000..eda43b5d9053 --- /dev/null +++ b/third_party/2/six/moves/email_mime_base.pyi @@ -0,0 +1 @@ +from email.MIMEBase import * diff --git a/third_party/2/six/moves/email_mime_multipart.pyi b/third_party/2/six/moves/email_mime_multipart.pyi new file mode 100644 index 000000000000..6383a7a738b6 --- /dev/null +++ b/third_party/2/six/moves/email_mime_multipart.pyi @@ -0,0 +1 @@ +from email.MIMEMultipart import * diff --git a/third_party/2/six/moves/email_mime_nonmultipart.pyi b/third_party/2/six/moves/email_mime_nonmultipart.pyi new file mode 100644 index 000000000000..a0d878ecee14 --- /dev/null +++ b/third_party/2/six/moves/email_mime_nonmultipart.pyi @@ -0,0 +1 @@ +from email.MIMENonMultipart import * From 85d7aa6e9d892bed617cdfdd3a7b7d8e0d0e7831 Mon Sep 17 00:00:00 2001 From: Joshua Morton Date: Mon, 8 Apr 2019 09:19:32 -0700 Subject: [PATCH 2/2] Reflect internal structure in type hints. It looks like internally the stdlib typeshed reflects the python3 source layout, and the python2 imports are dynamically generated. Stubs now reflect that. --- third_party/2/six/moves/email_mime_base.pyi | 2 +- third_party/2/six/moves/email_mime_multipart.pyi | 2 +- third_party/2/six/moves/email_mime_nonmultipart.pyi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/third_party/2/six/moves/email_mime_base.pyi b/third_party/2/six/moves/email_mime_base.pyi index eda43b5d9053..4df155c939d5 100644 --- a/third_party/2/six/moves/email_mime_base.pyi +++ b/third_party/2/six/moves/email_mime_base.pyi @@ -1 +1 @@ -from email.MIMEBase import * +from email.mime.base import * diff --git a/third_party/2/six/moves/email_mime_multipart.pyi b/third_party/2/six/moves/email_mime_multipart.pyi index 6383a7a738b6..4f312412bbc0 100644 --- a/third_party/2/six/moves/email_mime_multipart.pyi +++ b/third_party/2/six/moves/email_mime_multipart.pyi @@ -1 +1 @@ -from email.MIMEMultipart import * +from email.mime.multipart import * diff --git a/third_party/2/six/moves/email_mime_nonmultipart.pyi b/third_party/2/six/moves/email_mime_nonmultipart.pyi index a0d878ecee14..c15c8c0440b5 100644 --- a/third_party/2/six/moves/email_mime_nonmultipart.pyi +++ b/third_party/2/six/moves/email_mime_nonmultipart.pyi @@ -1 +1 @@ -from email.MIMENonMultipart import * +from email.mime.nonmultipart import *