update to 1.9.0.0 (#309)

Co-authored-by: lewzylu(卢众意) <[email protected]>

Author: lewzylu

README.md

@@ -11,7 +11,7 @@
 ## 介绍
 _______
 
-腾讯云COS命令行工具, 目前可以支持 Python2.6 与 Python2.7 以及 Python3.x。
+腾讯云COS命令行工具, 最新版本支持Python3.x, 1.8.x版本支持Python2.6/Python2.7。
 
 ## 在 Docker 上使用
 

README.rst

@@ -11,7 +11,7 @@ COSCMD
 介绍
 _______
 
-腾讯云COS命令行工具, 目前可以支持Python2.6与Python2.7以及Python3.x。
+腾讯云COS命令行工具, 最新版本支持Python3.x, 1.8.x版本支持Python2.6/Python2.7。
 
 安装指南
 __________

UPGRADING.md

@@ -1,10 +1,19 @@
 Coscmd Upgrade Guide
+====================
+1.9.0.0
+--------------------
+- Compatible with and supports Python 3.11 and Python 3.12.
+- No longer supports Python 2.x.
+- Integrate the deleteobject interface with the Python SDK and fix the issue of deleting object with empty versionid.
+- Domain auto-switching is enabled by default. You can disable it by setting auto_switch_domain to false in the configuration file.
+
 ====================
 1.8.6.26 to 1.8.6.28
 --------------------
 - Add file size threshold when downloading folder
 - Fix incorrect path when synchronizing files
 - Delete the crc64 verification parameters when downloading
+
 ====================
 1.8.6.25 to 1.8.6.26
 --------------------

coscmd/cos_auth.py

@@ -1,20 +1,13 @@
 # -*- coding: utf-8 -*-
 import hmac
 import time
-import urllib
 import hashlib
 import logging
 import requests
-import sys
-from six.moves.urllib.parse import quote, urlparse, unquote, urlencode
+from urllib.parse import urlparse, urlencode, quote, unquote
 from requests.auth import AuthBase
-
-if sys.version > '3':
-    from coscmd.cos_global import Version
-    from coscmd.cos_comm import to_bytes
-else:
-    from cos_global import Version
-    from cos_comm import to_bytes
+from coscmd.cos_global import Version
+from coscmd.cos_comm import to_bytes
 
 logger = logging.getLogger("coscmd")
 
@@ -35,7 +28,8 @@ def __call__(self, r):
         tmp_r = {}
         rt = urlparse(uri)
         if rt.query != "" and ("&" in rt.query or '=' in rt.query):
-            uri_params = dict(map(lambda s: s.lower().split('='), rt.query.split('&')))
+            uri_params = dict(
+                map(lambda s: s.lower().split('='), rt.query.split('&')))
         elif rt.query != "":
             uri_params = {rt.query: ""}
         else:
@@ -44,29 +38,36 @@ def __call__(self, r):
         tmp_r = r.headers
         r.headers = {}
         r.headers['Host'] = rt.netloc
-        headers = dict([(k.lower(), quote(v).lower()) for k, v in r.headers.items()])
+        headers = dict([(k.lower(), quote(v).lower())
+                       for k, v in r.headers.items()])
         format_str = "{method}\n{host}\n{params}\n{headers}\n".format(
             method=method.lower(),
             host=unquote(rt.path),
             params=urlencode(uri_params),
-            headers='&'.join(map(lambda p: (lambda x, y: "%s=%s" % (x, y))(*p), sorted(headers.items())))
-         )
+            headers='&'.join(map(lambda p: (lambda x, y: "%s=%s" %
+                             (x, y))(*p), sorted(headers.items())))
+        )
         start_sign_time = int(time.time())
-        sign_time = "{bg_time};{ed_time}".format(bg_time=start_sign_time-60, ed_time=start_sign_time + self._expire)
+        sign_time = "{bg_time};{ed_time}".format(
+            bg_time=start_sign_time-60, ed_time=start_sign_time + self._expire)
         sha1 = hashlib.sha1()
         sha1.update(to_bytes(format_str))
 
-        str_to_sign = "sha1\n{time}\n{sha1}\n".format(time=sign_time, sha1=sha1.hexdigest())
+        str_to_sign = "sha1\n{time}\n{sha1}\n".format(
+            time=sign_time, sha1=sha1.hexdigest())
 
-        sign_key = hmac.new(to_bytes(self._secret_key), to_bytes(sign_time), hashlib.sha1).hexdigest()
-        sign = hmac.new(to_bytes(sign_key), to_bytes(str_to_sign), hashlib.sha1).hexdigest()
+        sign_key = hmac.new(to_bytes(self._secret_key), to_bytes(
+            sign_time), hashlib.sha1).hexdigest()
+        sign = hmac.new(to_bytes(sign_key), to_bytes(
+            str_to_sign), hashlib.sha1).hexdigest()
         sign_tpl = "q-sign-algorithm=sha1&q-ak={ak}&q-sign-time={sign_time}&q-key-time={key_time}&q-header-list={headers}&q-url-param-list={params}&q-signature={sign}"
         r.headers = tmp_r
         r.headers['Authorization'] = sign_tpl.format(
             ak=self._access_id,
             sign_time=sign_time,
             key_time=sign_time,
-            params=';'.join(sorted(map(lambda k: k.lower(), uri_params.keys()))),
+            params=';'.join(
+                sorted(map(lambda k: k.lower(), uri_params.keys()))),
             headers=';'.join(sorted(headers.keys())),
             sign=sign
         )