engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

python3: fix urllib usage

Browse source
This commit is contained in:
RhodeCode Admin 2023-03-06 22:00:27 +01:00
parent 5392dc6c9c
commit c22758550a
75 changed files with 172 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rhodecode/authentication/plugins/auth_crowd.py
View file

@ -26,7 +26,7 @@ RhodeCode authentication plugin for Atlassian CROWD
import colander
import base64
import logging
import urllib2
import urllib.request, urllib.error, urllib.parse
from rhodecode.translation import _
from rhodecode.authentication.base import (
@ -128,10 +128,10 @@ class CrowdServer(object):
self._make_opener()
def _make_opener(self):
mgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
mgr = urllib.request.HTTPPasswordMgrWithDefaultRealm()
mgr.add_password(None, self._uri, self.user, self.passwd)
handler = urllib2.HTTPBasicAuthHandler(mgr)
self.opener = urllib2.build_opener(handler)
handler = urllib.request.HTTPBasicAuthHandler(mgr)
self.opener = urllib.request.build_opener(handler)
def _request(self, url, body=None, headers=None,
method=None, noformat=False,
@ -146,7 +146,7 @@ class CrowdServer(object):
log.debug("Sent crowd: \n%s"
% (formatted_json({"url": url, "body": body,
"headers": _headers})))
request = urllib2.Request(url, body, _headers)
request = urllib.request.Request(url, body, _headers)
if method:
request.get_method = lambda: method

14
rhodecode/authentication/plugins/auth_jasig_cas.py
View file

@ -27,8 +27,8 @@ http://www.jasig.org/cas
import colander
import logging
import rhodecode
import urllib
import urllib2
import urllib.request, urllib.parse, urllib.error
import urllib.request, urllib.error, urllib.parse
from rhodecode.translation import _
from rhodecode.authentication.base import (
@ -123,7 +123,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
return None
log.debug("Jasig CAS settings: %s", settings)
params = urllib.urlencode({'username': username, 'password': password})
params = urllib.parse.urlencode({'username': username, 'password': password})
headers = {"Content-type": "application/x-www-form-urlencoded",
"Accept": "text/plain",
"User-Agent": "RhodeCode-auth-%s" % rhodecode.__version__}
@ -131,13 +131,13 @@ class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
log.debug("Sent Jasig CAS: \n%s",
{"url": url, "body": params, "headers": headers})
request = urllib2.Request(url, params, headers)
request = urllib.request.Request(url, params, headers)
try:
response = urllib2.urlopen(request)
except urllib2.HTTPError as e:
response = urllib.request.urlopen(request)
except urllib.error.HTTPError as e:
log.debug("HTTPError when requesting Jasig CAS (status code: %d)", e.code)
return None
except urllib2.URLError as e:
except urllib.error.URLError as e:
log.debug("URLError when requesting Jasig CAS url: %s ", url)
return None