Merge pull request #108 from lalmeras/fix-python-3.10-requests

fix python 3.10 compatibility

Author: rbeuque74

.coveragerc

@@ -1,2 +1,2 @@
 [run]
-omit=*vendor*
+omit=

CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+## 0.6.0 (2022-01)
+
+ - [compatibility] add support for Python 3.10
+ - [dependencies] drop vendored requests library, added requests>=2.11.0
+ - [fix] previous 'disable pyopenssl for ovh to fix "EPIPE"' fix is handled
+   by requests dependency update
+
 ## 0.5.0 (2018-12-13)
  - [compatibility] drop support for EOL Python 2.6, 3.2 and 3.3 (#71)
  - [feature] Add OVH US endpoint (#63 #70)

MANIFEST.in

@@ -1,6 +1,5 @@
 include *.ini *.cfg *.rst
 include LICENSE
-include ovh/vendor/requests/cacert.pem
 recursive-include ovh *.py
 recursive-include docs *.py *.rst *.png Makefile make.bat
 recursive-include tests *.py

ovh/client.py

@@ -46,21 +46,9 @@
     # Python 3
     from urllib.parse import urlencode
 
-from .vendor.requests import request, Session
-from .vendor.requests.packages import urllib3
-from .vendor.requests.exceptions import RequestException
-
-# Disable pyopenssl. It breaks SSL connection pool when SSL connection is
-# closed unexpectedly by the server. And we don't need SNI anyway.
-try:
-    from .vendor.requests.packages.urllib3.contrib import pyopenssl
-    pyopenssl.extract_from_urllib3()
-except ImportError:
-    pass
-
-# Disable SNI related Warning. The API does not rely on it
-urllib3.disable_warnings(urllib3.exceptions.SNIMissingWarning)
-urllib3.disable_warnings(urllib3.exceptions.SecurityWarning)
+from requests import request, Session
+from requests.packages import urllib3
+from requests.exceptions import RequestException
 
 from .config import config
 from .consumer_key import ConsumerKeyRequest
@@ -483,7 +471,7 @@ def raw_call(self, method, path, data=None, need_auth=True):
         """
         Lowest level call helper. If ``consumer_key`` is not ``None``, inject
         authentication headers and sign the request.
-        Will return a vendored ``requests.Response`` object or let any
+        Will return ``requests.Response`` object or let any
         ``requests`` exception pass through.
 
         Request signature is a sha1 hash on following fields, joined by '+'