Mercurial Repositories > eric / file diff

--- a/eric6/E5Network/E5GoogleMail.py	Sun Sep 01 17:44:33 2019 +0200
+++ b/eric6/E5Network/E5GoogleMail.py	Sun Sep 01 19:40:53 2019 +0200
@@ -18,7 +18,7 @@
 from google.oauth2.credentials import Credentials
 from requests_oauthlib import OAuth2Session
 
-from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject, QUrl
+from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject, QUrl, QUrlQuery
 from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout
 
 from E5Gui.E5TextInputDialog import E5TextInputDialog
@@ -80,14 +80,9 @@
         url = self.__browser.url()
         if url.toString().startswith(
                 "https://accounts.google.com/o/oauth2/approval/v2"):
-            if Globals.qVersionTuple() >= (5, 0, 0):
-                from PyQt5.QtCore import QUrlQuery
-                urlQuery = QUrlQuery(url)
-                approvalCode = urlQuery.queryItemValue(
-                    "approvalCode", QUrl.FullyDecoded)
-            else:
-                approvalCode = QUrl.fromPercentEncoding(
-                    url.encodedQueryItemValue(b"approvalCode"))
+            urlQuery = QUrlQuery(url)
+            approvalCode = urlQuery.queryItemValue(
+                "approvalCode", QUrl.FullyDecoded)
             if approvalCode:
                 self.approvalCodeReceived.emit(approvalCode)
                 self.close()