forked from pool/python-bugzilla
Accepting request 1044063 from home:juliogonzalezgil:branches:devel:languages:python
Update to 3.2.0. Verified: - Module works with HTTP auth for the current bugzilla.opensuse.org - Module works with the API Key auth for the newer bugzilla versions (API Key auth not available at bugzilla.opensuse.org as of today) - Module works with the XMLRPC API for both current bugzilla.opensuse.org and newer bugzilla versions. - Module works with the REST API for newer bugzilla version (REST API not available at bugzilla.opensuse.org as of today) OBS-URL: https://build.opensuse.org/request/show/1044063 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bugzilla?expand=0&rev=55
This commit is contained in:
@@ -1,12 +1,6 @@
|
||||
---
|
||||
bugzilla/base.py | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: python-bugzilla-3.0.2/bugzilla/base.py
|
||||
===================================================================
|
||||
--- python-bugzilla-3.0.2.orig/bugzilla/base.py
|
||||
+++ python-bugzilla-3.0.2/bugzilla/base.py
|
||||
@@ -175,7 +175,8 @@ class Bugzilla(object):
|
||||
--- python-bugzilla-3.2.0.orig/bugzilla/base.py 2022-01-12 19:09:08.000000000 +0100
|
||||
+++ python-bugzilla-3.2.0/bugzilla/base.py 2022-12-21 09:32:01.324613243 +0100
|
||||
@@ -174,7 +174,8 @@
|
||||
def __init__(self, url=-1, user=None, password=None, cookiefile=-1,
|
||||
sslverify=True, tokenfile=-1, use_creds=True, api_key=None,
|
||||
cert=None, configpaths=-1,
|
||||
@@ -16,7 +10,7 @@ Index: python-bugzilla-3.0.2/bugzilla/base.py
|
||||
"""
|
||||
:param url: The bugzilla instance URL, which we will connect
|
||||
to immediately. Most users will want to specify this at
|
||||
@@ -212,6 +213,7 @@ class Bugzilla(object):
|
||||
@@ -207,6 +208,7 @@
|
||||
:param requests_session: An optional requests.Session object the
|
||||
API will use to contact the remote bugzilla instance. This
|
||||
way the API user can set up whatever auth bits they may need.
|
||||
@@ -24,28 +18,25 @@ Index: python-bugzilla-3.0.2/bugzilla/base.py
|
||||
"""
|
||||
if url == -1:
|
||||
raise TypeError("Specify a valid bugzilla url, or pass url=None")
|
||||
@@ -253,6 +255,7 @@ class Bugzilla(object):
|
||||
self._setcookiefile(cookiefile)
|
||||
@@ -246,6 +248,7 @@
|
||||
|
||||
self._settokenfile(tokenfile)
|
||||
self._setconfigpath(configpaths)
|
||||
+ self._basic_auth = basic_auth
|
||||
|
||||
if url:
|
||||
self.connect(url)
|
||||
@@ -607,6 +610,9 @@ class Bugzilla(object):
|
||||
@@ -598,6 +601,8 @@
|
||||
raise ValueError("missing username")
|
||||
if not self.password:
|
||||
raise ValueError("missing password")
|
||||
|
||||
+ if self._basic_auth:
|
||||
+ self._backend.set_basic_auth(self.user, self.password)
|
||||
+
|
||||
|
||||
payload = {"login": self.user}
|
||||
if restrict_login:
|
||||
payload['restrict_login'] = True
|
||||
Index: python-bugzilla-3.0.2/bugzilla/_backendxmlrpc.py
|
||||
===================================================================
|
||||
--- python-bugzilla-3.0.2.orig/bugzilla/_backendxmlrpc.py
|
||||
+++ python-bugzilla-3.0.2/bugzilla/_backendxmlrpc.py
|
||||
--- python-bugzilla-3.2.0.orig/bugzilla/_backendxmlrpc.py 2022-01-12 19:09:08.000000000 +0100
|
||||
+++ python-bugzilla-3.2.0/bugzilla/_backendxmlrpc.py 2022-12-21 09:35:40.471278786 +0100
|
||||
@@ -2,6 +2,7 @@
|
||||
# See the COPYING file in the top-level directory.
|
||||
|
||||
@@ -54,23 +45,23 @@ Index: python-bugzilla-3.0.2/bugzilla/_backendxmlrpc.py
|
||||
import sys
|
||||
from xmlrpc.client import (Binary, Fault, ProtocolError,
|
||||
ServerProxy, Transport)
|
||||
@@ -136,6 +137,9 @@ class _BugzillaXMLRPCProxy(ServerProxy,
|
||||
self.__bugzillasession.set_token_value(ret.get('token'))
|
||||
return ret
|
||||
@@ -127,6 +128,9 @@
|
||||
# pylint: enable=no-member
|
||||
|
||||
return ret
|
||||
+
|
||||
+ def clear_token(self):
|
||||
+ self.__bugzillasession.set_token_value(None)
|
||||
+
|
||||
|
||||
|
||||
class _BackendXMLRPC(_BackendBase):
|
||||
"""
|
||||
@@ -150,6 +154,16 @@ class _BackendXMLRPC(_BackendBase):
|
||||
@@ -142,6 +146,16 @@
|
||||
def is_xmlrpc(self):
|
||||
return True
|
||||
|
||||
+ def set_basic_auth(self, user, password):
|
||||
+ """
|
||||
+ Set basic authentication method.
|
||||
+ Set basic authentication method.
|
||||
+
|
||||
+ :return:
|
||||
+ """
|
||||
|
||||
Reference in New Issue
Block a user