From 159519aaea6775c197c54d7d55c07222352a9512 Mon Sep 17 00:00:00 2001 From: Vladislav Zavjalov Date: Mon, 3 Oct 2022 21:32:34 +0100 Subject: [PATCH] use http.client as httplib --- s3cmd/S3/Config.py | 6 +----- s3cmd/S3/Custom_httplib27.py | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/s3cmd/S3/Config.py b/s3cmd/S3/Config.py index ef409f2..90c6dde 100644 --- a/s3cmd/S3/Config.py +++ b/s3cmd/S3/Config.py @@ -40,11 +40,7 @@ $ pip install python-dateutil sys.stderr.flush() sys.exit(EX_OSFILE) -try: - # python 3 support - import httplib -except ImportError: - import http.client as httplib +import http.client as httplib try: from configparser import (NoOptionError, NoSectionError, diff --git a/s3cmd/S3/Custom_httplib27.py b/s3cmd/S3/Custom_httplib27.py index 85453d1..9090268 100644 --- a/s3cmd/S3/Custom_httplib27.py +++ b/s3cmd/S3/Custom_httplib27.py @@ -1,9 +1,9 @@ from __future__ import absolute_import, print_function import os -import httplib +import http.client as httplib -from httplib import (_CS_REQ_SENT, _CS_REQ_STARTED, CONTINUE, UnknownProtocol, +from http.client import (_CS_REQ_SENT, _CS_REQ_STARTED, CONTINUE, UnknownProtocol, CannotSendHeader, NO_CONTENT, NOT_MODIFIED, EXPECTATION_FAILED, HTTPMessage, HTTPException) -- 2.33.0