python-gerrit-api 3.0.7__tar.gz → 3.0.8__tar.gz

{python-gerrit-api-3.0.7/python_gerrit_api.egg-info → python_gerrit_api-3.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-gerrit-api
-Version: 3.0.7
+Version: 3.0.8
 Summary: Python wrapper for the Gerrit REST API.
 Home-page: https://github.com/shijl0925/python-gerrit-api
 Author: Jialiang Shi

{python-gerrit-api-3.0.7 → python_gerrit_api-3.0.8}/gerrit/__init__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 # @Author: Jialiang Shi
-__version__ = "3.0.7"
+__version__ = "3.0.8"
 
 from gerrit.base import GerritClient

{python-gerrit-api-3.0.7 → python_gerrit_api-3.0.8}/gerrit/base.py

@@ -2,6 +2,8 @@
 # -*- coding:utf-8 -*-
 # @Author: Jialiang Shi
 import netrc
+import requests
+from requests.adapters import HTTPAdapter
 from gerrit.utils.requester import Requester
 from gerrit.utils.common import decode_response, strip_trailing_slash
 from gerrit.config.config import GerritConfig
@@ -37,14 +39,28 @@ class GerritClient:
         if use_netrc:
             password = self.get_password_from_netrc_file()
 
+        # make request session
+        _session = requests.Session()
+        if username and password:
+            _session.auth = (username, password)
+
+        if ssl_verify:
+            _session.verify = ssl_verify
+
+        if cert is not None:
+            _session.cert = cert
+
+        if max_retries is not None:
+            retry_adapter = HTTPAdapter(max_retries=max_retries)
+            _session.mount("http://", retry_adapter)
+            _session.mount("https://", retry_adapter)
+
+        self.session = _session
+
         self.requester = Requester(
             base_url=base_url,
-            username=username,
-            password=password,
-            ssl_verify=ssl_verify,
-            cert=cert,
+            session=self.session,
             timeout=timeout,
-            max_retries=max_retries,
         )
         if username and password:
             self.auth_suffix = auth_suffix

{python-gerrit-api-3.0.7 → python_gerrit_api-3.0.8}/gerrit/changes/changes.py

@@ -57,7 +57,7 @@ class GerritChanges:
         except requests.exceptions.HTTPError as error:
             if error.response.status_code == 404:
                 message = f"Change {id_} does not exist"
-                if id_.startswith("I"):
+                if isinstance(id_, str) and id_.startswith("I"):
                     res = self.search(query=f"change: {id_}")
                     if len(res) > 0:
                         change_ids = [item.get("id") for item in res]

{python-gerrit-api-3.0.7 → python_gerrit_api-3.0.8}/gerrit/utils/requester.py

@@ -2,8 +2,6 @@
 # -*- coding:utf-8 -*-
 # @Author: Jialiang Shi
 import urllib.parse as urlparse
-from requests import Session
-from requests.adapters import HTTPAdapter
 from gerrit.utils.exceptions import (
     NotAllowedError,
     ValidationError,
@@ -36,18 +34,8 @@ class Requester:
         timeout = 10
         base_url = kwargs.get("base_url")
         self.base_scheme = urlparse.urlsplit(base_url).scheme if base_url else None
-        self.username = kwargs.get("username")
-        self.password = kwargs.get("password")
-        self.ssl_verify = kwargs.get("ssl_verify")
-        self.cert = kwargs.get("cert")
+        self.session = kwargs.get("session")
         self.timeout = kwargs.get("timeout", timeout)
-        self.session = Session()
-
-        self.max_retries = kwargs.get("max_retries")
-        if self.max_retries is not None:
-            retry_adapter = HTTPAdapter(max_retries=self.max_retries)
-            self.session.mount("http://", retry_adapter)
-            self.session.mount("https://", retry_adapter)
 
     def _update_url_scheme(self, url):
         """
@@ -78,8 +66,6 @@ class Requester:
         :return:
         """
         request_kwargs = kwargs
-        if self.username and self.password:
-            request_kwargs["auth"] = (self.username, self.password)
 
         if params:
             if not isinstance(params, dict):
@@ -98,9 +84,6 @@ class Requester:
             currentheaders.update({"Cookie": self.AUTH_COOKIE})
             request_kwargs["headers"] = currentheaders
 
-        request_kwargs["verify"] = self.ssl_verify
-        request_kwargs["cert"] = self.cert
-
         if data and json:
             raise ValueError("Cannot use data and json together")
 

{python-gerrit-api-3.0.7 → python_gerrit_api-3.0.8}/gitiles/base.py

@@ -3,6 +3,8 @@
 # @Author: Jialiang Shi
 from typing import Optional
 from base64 import b64decode
+import requests
+from requests.adapters import HTTPAdapter
 from gerrit.utils.requester import Requester
 from gerrit.utils.common import decode_response, strip_trailing_slash
 
@@ -20,14 +22,28 @@ class GitilesClient:
     ):
         self._base_url = strip_trailing_slash(base_url)
 
+        # make request session
+        _session = requests.Session()
+        if username and password:
+            _session.auth = (username, password)
+
+        if ssl_verify:
+            _session.verify = ssl_verify
+
+        if cert is not None:
+            _session.cert = cert
+
+        if max_retries is not None:
+            retry_adapter = HTTPAdapter(max_retries=max_retries)
+            _session.mount("http://", retry_adapter)
+            _session.mount("https://", retry_adapter)
+
+        self.session = _session
+
         self.requester = Requester(
             base_url=base_url,
-            username=username,
-            password=password,
-            ssl_verify=ssl_verify,
-            cert=cert,
+            session=self.session,
             timeout=timeout,
-            max_retries=max_retries,
         )
 
     def get_endpoint_url(self, endpoint):

{python-gerrit-api-3.0.7 → python_gerrit_api-3.0.8/python_gerrit_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-gerrit-api
-Version: 3.0.7
+Version: 3.0.8
 Summary: Python wrapper for the Gerrit REST API.
 Home-page: https://github.com/shijl0925/python-gerrit-api
 Author: Jialiang Shi