From f5372dfb6a64acb0487f6fe5da5882b7b7fbc00f Mon Sep 17 00:00:00 2001 From: Jukka Lehtosalo Date: Tue, 12 Apr 2022 13:39:12 +0100 Subject: [PATCH 1/3] Add missing definitions to six.moves.http_client These were removed as a side-effect of #7327, which added `__all__` to `http.client`. I checked that all the definitions are present at runtime via `six.moves.http_client`. --- stubs/six/six/moves/http_client.pyi | 70 +++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/stubs/six/six/moves/http_client.pyi b/stubs/six/six/moves/http_client.pyi index 36d29b9551bc..a3537b5f13b9 100644 --- a/stubs/six/six/moves/http_client.pyi +++ b/stubs/six/six/moves/http_client.pyi @@ -1 +1,71 @@ from http.client import * + +# Many definitions are not included in http.client.__all__ +from http.client import ( + ACCEPTED as ACCEPTED, + ALREADY_REPORTED as ALREADY_REPORTED, + BAD_GATEWAY as BAD_GATEWAY, + BAD_REQUEST as BAD_REQUEST, + CONFLICT as CONFLICT, + CONTINUE as CONTINUE, + CREATED as CREATED, + EARLY_HINTS as EARLY_HINTS, + EXPECTATION_FAILED as EXPECTATION_FAILED, + FAILED_DEPENDENCY as FAILED_DEPENDENCY, + FORBIDDEN as FORBIDDEN, + FOUND as FOUND, + GATEWAY_TIMEOUT as GATEWAY_TIMEOUT, + GONE as GONE, + HTTPMessage as HTTPMessage, + HTTPS_PORT as HTTPS_PORT, + HTTP_PORT as HTTP_PORT, + HTTP_VERSION_NOT_SUPPORTED as HTTP_VERSION_NOT_SUPPORTED, + IM_A_TEAPOT as IM_A_TEAPOT, + IM_USED as IM_USED, + INSUFFICIENT_STORAGE as INSUFFICIENT_STORAGE, + INTERNAL_SERVER_ERROR as INTERNAL_SERVER_ERROR, + LENGTH_REQUIRED as LENGTH_REQUIRED, + LOCKED as LOCKED, + LOOP_DETECTED as LOOP_DETECTED, + METHOD_NOT_ALLOWED as METHOD_NOT_ALLOWED, + MISDIRECTED_REQUEST as MISDIRECTED_REQUEST, + MOVED_PERMANENTLY as MOVED_PERMANENTLY, + MULTIPLE_CHOICES as MULTIPLE_CHOICES, + MULTI_STATUS as MULTI_STATUS, + NETWORK_AUTHENTICATION_REQUIRED as NETWORK_AUTHENTICATION_REQUIRED, + NON_AUTHORITATIVE_INFORMATION as NON_AUTHORITATIVE_INFORMATION, + NOT_ACCEPTABLE as NOT_ACCEPTABLE, + NOT_EXTENDED as NOT_EXTENDED, + NOT_FOUND as NOT_FOUND, + NOT_IMPLEMENTED as NOT_IMPLEMENTED, + NOT_MODIFIED as NOT_MODIFIED, + NO_CONTENT as NO_CONTENT, + OK as OK, + PARTIAL_CONTENT as PARTIAL_CONTENT, + PAYMENT_REQUIRED as PAYMENT_REQUIRED, + PERMANENT_REDIRECT as PERMANENT_REDIRECT, + PRECONDITION_FAILED as PRECONDITION_FAILED, + PRECONDITION_REQUIRED as PRECONDITION_REQUIRED, + PROCESSING as PROCESSING, + PROXY_AUTHENTICATION_REQUIRED as PROXY_AUTHENTICATION_REQUIRED, + REQUESTED_RANGE_NOT_SATISFIABLE as REQUESTED_RANGE_NOT_SATISFIABLE, + REQUEST_ENTITY_TOO_LARGE as REQUEST_ENTITY_TOO_LARGE, + REQUEST_HEADER_FIELDS_TOO_LARGE as REQUEST_HEADER_FIELDS_TOO_LARGE, + REQUEST_TIMEOUT as REQUEST_TIMEOUT, + REQUEST_URI_TOO_LONG as REQUEST_URI_TOO_LONG, + RESET_CONTENT as RESET_CONTENT, + SEE_OTHER as SEE_OTHER, + SERVICE_UNAVAILABLE as SERVICE_UNAVAILABLE, + SWITCHING_PROTOCOLS as SWITCHING_PROTOCOLS, + TEMPORARY_REDIRECT as TEMPORARY_REDIRECT, + TOO_EARLY as TOO_EARLY, + TOO_MANY_REQUESTS as TOO_MANY_REQUESTS, + UNAUTHORIZED as UNAUTHORIZED, + UNAVAILABLE_FOR_LEGAL_REASONS as UNAVAILABLE_FOR_LEGAL_REASONS, + UNPROCESSABLE_ENTITY as UNPROCESSABLE_ENTITY, + UNSUPPORTED_MEDIA_TYPE as UNSUPPORTED_MEDIA_TYPE, + UPGRADE_REQUIRED as UPGRADE_REQUIRED, + USE_PROXY as USE_PROXY, + VARIANT_ALSO_NEGOTIATES as VARIANT_ALSO_NEGOTIATES, + parse_headers as parse_headers, +) From 9ef415949fc29ea154a02f2c6070f13d0a9e1c7a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 12 Apr 2022 12:45:45 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/six/six/moves/http_client.pyi | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/stubs/six/six/moves/http_client.pyi b/stubs/six/six/moves/http_client.pyi index a3537b5f13b9..62fb9ca7058a 100644 --- a/stubs/six/six/moves/http_client.pyi +++ b/stubs/six/six/moves/http_client.pyi @@ -1,6 +1,5 @@ -from http.client import * - # Many definitions are not included in http.client.__all__ +from http.client import * from http.client import ( ACCEPTED as ACCEPTED, ALREADY_REPORTED as ALREADY_REPORTED, @@ -16,10 +15,9 @@ from http.client import ( FOUND as FOUND, GATEWAY_TIMEOUT as GATEWAY_TIMEOUT, GONE as GONE, - HTTPMessage as HTTPMessage, - HTTPS_PORT as HTTPS_PORT, HTTP_PORT as HTTP_PORT, HTTP_VERSION_NOT_SUPPORTED as HTTP_VERSION_NOT_SUPPORTED, + HTTPS_PORT as HTTPS_PORT, IM_A_TEAPOT as IM_A_TEAPOT, IM_USED as IM_USED, INSUFFICIENT_STORAGE as INSUFFICIENT_STORAGE, @@ -30,16 +28,16 @@ from http.client import ( METHOD_NOT_ALLOWED as METHOD_NOT_ALLOWED, MISDIRECTED_REQUEST as MISDIRECTED_REQUEST, MOVED_PERMANENTLY as MOVED_PERMANENTLY, - MULTIPLE_CHOICES as MULTIPLE_CHOICES, MULTI_STATUS as MULTI_STATUS, + MULTIPLE_CHOICES as MULTIPLE_CHOICES, NETWORK_AUTHENTICATION_REQUIRED as NETWORK_AUTHENTICATION_REQUIRED, + NO_CONTENT as NO_CONTENT, NON_AUTHORITATIVE_INFORMATION as NON_AUTHORITATIVE_INFORMATION, NOT_ACCEPTABLE as NOT_ACCEPTABLE, NOT_EXTENDED as NOT_EXTENDED, NOT_FOUND as NOT_FOUND, NOT_IMPLEMENTED as NOT_IMPLEMENTED, NOT_MODIFIED as NOT_MODIFIED, - NO_CONTENT as NO_CONTENT, OK as OK, PARTIAL_CONTENT as PARTIAL_CONTENT, PAYMENT_REQUIRED as PAYMENT_REQUIRED, @@ -48,11 +46,11 @@ from http.client import ( PRECONDITION_REQUIRED as PRECONDITION_REQUIRED, PROCESSING as PROCESSING, PROXY_AUTHENTICATION_REQUIRED as PROXY_AUTHENTICATION_REQUIRED, - REQUESTED_RANGE_NOT_SATISFIABLE as REQUESTED_RANGE_NOT_SATISFIABLE, REQUEST_ENTITY_TOO_LARGE as REQUEST_ENTITY_TOO_LARGE, REQUEST_HEADER_FIELDS_TOO_LARGE as REQUEST_HEADER_FIELDS_TOO_LARGE, REQUEST_TIMEOUT as REQUEST_TIMEOUT, REQUEST_URI_TOO_LONG as REQUEST_URI_TOO_LONG, + REQUESTED_RANGE_NOT_SATISFIABLE as REQUESTED_RANGE_NOT_SATISFIABLE, RESET_CONTENT as RESET_CONTENT, SEE_OTHER as SEE_OTHER, SERVICE_UNAVAILABLE as SERVICE_UNAVAILABLE, @@ -67,5 +65,6 @@ from http.client import ( UPGRADE_REQUIRED as UPGRADE_REQUIRED, USE_PROXY as USE_PROXY, VARIANT_ALSO_NEGOTIATES as VARIANT_ALSO_NEGOTIATES, + HTTPMessage as HTTPMessage, parse_headers as parse_headers, ) From 047c0fccb2665ba35e1f05f929977b919114d0f0 Mon Sep 17 00:00:00 2001 From: Jukka Lehtosalo Date: Tue, 12 Apr 2022 14:24:15 +0100 Subject: [PATCH 3/3] Remove undefined things --- stubs/six/six/moves/http_client.pyi | 9 --------- 1 file changed, 9 deletions(-) diff --git a/stubs/six/six/moves/http_client.pyi b/stubs/six/six/moves/http_client.pyi index 62fb9ca7058a..ecfce42f02c3 100644 --- a/stubs/six/six/moves/http_client.pyi +++ b/stubs/six/six/moves/http_client.pyi @@ -2,13 +2,11 @@ from http.client import * from http.client import ( ACCEPTED as ACCEPTED, - ALREADY_REPORTED as ALREADY_REPORTED, BAD_GATEWAY as BAD_GATEWAY, BAD_REQUEST as BAD_REQUEST, CONFLICT as CONFLICT, CONTINUE as CONTINUE, CREATED as CREATED, - EARLY_HINTS as EARLY_HINTS, EXPECTATION_FAILED as EXPECTATION_FAILED, FAILED_DEPENDENCY as FAILED_DEPENDENCY, FORBIDDEN as FORBIDDEN, @@ -18,15 +16,12 @@ from http.client import ( HTTP_PORT as HTTP_PORT, HTTP_VERSION_NOT_SUPPORTED as HTTP_VERSION_NOT_SUPPORTED, HTTPS_PORT as HTTPS_PORT, - IM_A_TEAPOT as IM_A_TEAPOT, IM_USED as IM_USED, INSUFFICIENT_STORAGE as INSUFFICIENT_STORAGE, INTERNAL_SERVER_ERROR as INTERNAL_SERVER_ERROR, LENGTH_REQUIRED as LENGTH_REQUIRED, LOCKED as LOCKED, - LOOP_DETECTED as LOOP_DETECTED, METHOD_NOT_ALLOWED as METHOD_NOT_ALLOWED, - MISDIRECTED_REQUEST as MISDIRECTED_REQUEST, MOVED_PERMANENTLY as MOVED_PERMANENTLY, MULTI_STATUS as MULTI_STATUS, MULTIPLE_CHOICES as MULTIPLE_CHOICES, @@ -41,7 +36,6 @@ from http.client import ( OK as OK, PARTIAL_CONTENT as PARTIAL_CONTENT, PAYMENT_REQUIRED as PAYMENT_REQUIRED, - PERMANENT_REDIRECT as PERMANENT_REDIRECT, PRECONDITION_FAILED as PRECONDITION_FAILED, PRECONDITION_REQUIRED as PRECONDITION_REQUIRED, PROCESSING as PROCESSING, @@ -56,15 +50,12 @@ from http.client import ( SERVICE_UNAVAILABLE as SERVICE_UNAVAILABLE, SWITCHING_PROTOCOLS as SWITCHING_PROTOCOLS, TEMPORARY_REDIRECT as TEMPORARY_REDIRECT, - TOO_EARLY as TOO_EARLY, TOO_MANY_REQUESTS as TOO_MANY_REQUESTS, UNAUTHORIZED as UNAUTHORIZED, - UNAVAILABLE_FOR_LEGAL_REASONS as UNAVAILABLE_FOR_LEGAL_REASONS, UNPROCESSABLE_ENTITY as UNPROCESSABLE_ENTITY, UNSUPPORTED_MEDIA_TYPE as UNSUPPORTED_MEDIA_TYPE, UPGRADE_REQUIRED as UPGRADE_REQUIRED, USE_PROXY as USE_PROXY, - VARIANT_ALSO_NEGOTIATES as VARIANT_ALSO_NEGOTIATES, HTTPMessage as HTTPMessage, parse_headers as parse_headers, )