Merge recent changes from branch 'origin'

Currently it's 13 commits behind branch 'origin' (sync with branch python-bugzilla:main)

Author: SonicStark

bugzilla/_backendbase.py

@@ -22,7 +22,7 @@ def __init__(self, url, bugzillasession):
     @staticmethod
     def probe(url):
         try:
-            requests.head(url).raise_for_status()
+            requests.head(url, timeout=10).raise_for_status()
             return True  # pragma: no cover
         except Exception as e:
             log.debug("Failed to probe url=%s : %s", url, str(e))

bugzilla/_backendrest.py

@@ -7,7 +7,7 @@
 import os
 
 from ._backendbase import _BackendBase
-from .exceptions import BugzillaError
+from .exceptions import BugzillaError, BugzillaHTTPError
 from ._util import listify
 
 
@@ -32,6 +32,23 @@ def __init__(self, url, bugzillasession):
     #########################
     # Internal REST helpers #
     #########################
+    def _handle_error(self, e):
+        response = getattr(e, "response", None)
+        if response is None:
+            raise e  # pragma: no cover
+
+        if response.status_code in [400, 401, 404]:
+            self._handle_error_response(response.text)
+        raise e
+
+    def _handle_error_response(self, text):
+        try:
+            result = json.loads(text)
+        except json.JSONDecodeError:
+            return
+
+        if result.get("error"):
+            raise BugzillaError(result["message"], code=result["code"])
 
     def _handle_response(self, text):
         try:
@@ -40,7 +57,7 @@ def _handle_response(self, text):
             log.debug("Failed to parse REST response. Output is:\n%s", text)
             raise
 
-        if ret.get("error", False):
+        if ret.get("error", False):  # pragma: no cover
             raise BugzillaError(ret["message"], code=ret["code"])
         return ret
 
@@ -55,8 +72,13 @@ def _op(self, method, apiurl, paramdict=None):
         else:
             data = json.dumps(paramdict or {})
 
-        response = self._bugzillasession.request(method, fullurl, data=data,
-                params=authparams)
+        try:
+            response = self._bugzillasession.request(
+                method, fullurl, data=data, params=authparams
+            )
+        except BugzillaHTTPError as e:
+            self._handle_error(e)
+
         return self._handle_response(response.text)
 
     def _get(self, *args, **kwargs):

bugzilla/_cli.py

@@ -1047,7 +1047,7 @@ def _do_modify(bz, parser, opt):
 
     for k, v in wbmap.copy().items():
         if not v[0] and not v[1]:
-            del(wbmap[k])
+            del wbmap[k]
 
     if opt.fields:
         _merge_field_opts(update, opt.fields, parser)

bugzilla/_session.py

@@ -9,6 +9,7 @@
 
 import requests
 
+from .exceptions import BugzillaHTTPError
 
 log = getLogger(__name__)
 
@@ -30,7 +31,7 @@ def __init__(self, url, user_agent,
         self._use_auth_bearer = False
 
         if self._scheme not in ["http", "https"]:
-            raise Exception("Invalid URL scheme: %s (%s)" % (
+            raise ValueError("Invalid URL scheme: %s (%s)" % (
                 self._scheme, url))
 
         self._session = requests_session
@@ -106,9 +107,12 @@ def request(self, *args, **kwargs):
 
         try:
             response.raise_for_status()
-        except Exception as e:
+        except requests.HTTPError as e:
             # Scrape the api key out of the returned exception string
             message = str(e).replace(self._api_key or "", "")
-            raise type(e)(message).with_traceback(sys.exc_info()[2])
+            response = getattr(e, "response", None)
+            raise BugzillaHTTPError(message, response=response).with_traceback(
+                sys.exc_info()[2]
+            )
 
         return response

bugzilla/base.py

@@ -1302,7 +1302,7 @@ def add_email(key, value, count):
         # Strip out None elements in the dict
         for k, v in query.copy().items():
             if v is None:
-                del(query[k])
+                del query[k]
 
         self.pre_translation(query)
         return query
@@ -1799,7 +1799,7 @@ def _validate_createbug(self, *args, **kwargs):
 
         # Back compat handling for check_args
         if "check_args" in data:
-            del(data["check_args"])
+            del data["check_args"]
 
         return data
 

bugzilla/bug.py

@@ -6,6 +6,7 @@
 
 import copy
 from logging import getLogger
+from urllib.parse import urlparse, urlunparse
 
 
 log = getLogger(__name__)
@@ -39,8 +40,16 @@ def __init__(self, bugzilla, bug_id=None, dict=None, autorefresh=False):
             dict["id"] = bug_id
 
         self._update_dict(dict)
-        self.weburl = bugzilla.url.replace('xmlrpc.cgi',
-                                           'show_bug.cgi?id=%i' % self.bug_id)
+        self.weburl = self._generate_weburl()
+
+    def _generate_weburl(self):
+        """
+        Generate the URL to the bug in the web UI
+        """
+        parsed = urlparse(self.bugzilla.url)
+        return urlunparse((parsed.scheme, parsed.netloc,
+                           'show_bug.cgi', '', 'id=%s' % self.bug_id,
+                           ''))
 
     def __str__(self):
         """
@@ -136,7 +145,7 @@ def _translate_dict(self, newdict):
                           "d[%s]=%s and d[%s]=%s , dropping the value "
                           "d[%s]", newname, newdict[newname], oldname,
                         newdict[oldname], oldname)
-            del(newdict[oldname])
+            del newdict[oldname]
 
 
     def _update_dict(self, newdict):

bugzilla/exceptions.py

@@ -1,5 +1,6 @@
 # This work is licensed under the GNU GPLv2 or later.
 # See the COPYING file in the top-level directory.
+from requests import HTTPError
 
 
 class BugzillaError(Exception):
@@ -36,3 +37,7 @@ def __init__(self, message, code=None):
         if self.code:
             message += " (code=%s)" % self.code
         Exception.__init__(self, message)
+
+
+class BugzillaHTTPError(HTTPError):
+    """Error raised in the Bugzilla session"""

docs/bugzilla.rst

@@ -859,4 +859,4 @@ SEE ALSO
 ========
 
 https://bugzilla.readthedocs.io/en/latest/api/index.html
-https://bugzilla.redhat.com/docs/en/html/api/Bugzilla/WebService/Bug.html
+https://bugzilla.redhat.com/docs/en/html/api/core/v1/bug.html