fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-05-25 20:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop WSRequest.qurl as we can use parent-class url() method

Browse Source
This commit is contained in:
Laurent Monin
2023-06-03 14:32:08 +02:00
parent fa55b00380
commit 3286d5dd7b
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
picard/webservice/__init__.py
View File

@@ -149,7 +149,6 @@ class WSRequest(QNetworkRequest):
raise AssertionError('URL undefined')
super().__init__(qurl)
self.qurl = self.url()
# optional parameters
self.parse_response_type = parse_response_type
@@ -206,22 +205,23 @@ class WSRequest(QNetworkRequest):
@property
def host(self):
return self.qurl.host()
return self.url().host()
@property
def port(self):
"""Returns QUrl port or default ports (443 for https, 80 for http)"""
if self.qurl.scheme() == 'https':
return self.qurl.port(443)
return self.qurl.port(80)
url = self.url()
if url.scheme() == 'https':
return url.port(443)
return url.port(80)
@property
def path(self):
return self.qurl.path()
return self.url().path()
@property
def queryargs(self):
return dict(QUrlQuery(self.qurl).queryItems(QUrl.ComponentFormattingOption.FullyEncoded))
return dict(QUrlQuery(self.url()).queryItems(QUrl.ComponentFormattingOption.FullyEncoded))
@property
def access_token(self):
@@ -463,7 +463,7 @@ class WebService(QtCore.QObject):
def _handle_redirect(self, reply, request, redirect):
error = int(reply.error())
# merge with base url (to cover the possibility of the URL being relative)
redirect_qurl = request.qurl.resolved(redirect)
redirect_qurl = request.url().resolved(redirect)
if not WebService.urls_equivalent(redirect_qurl, reply.request().url()):
log.debug("Redirect to %s requested", redirect_qurl.toString(QUrl.UrlFormattingOption.RemoveUserInfo))