Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/Network/NetworkUrlInterceptor.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/Network/NetworkUrlInterceptor.py	Tue Mar 02 17:17:09 2021 +0100
@@ -140,7 +140,7 @@
             info.setHttpHeader(b"Referer", b"")
         elif (self.__sendReferer == 1 and
               info.navigationType() !=
-              QWebEngineUrlRequestInfo.NavigationTypeLink):
+              QWebEngineUrlRequestInfo.NavigationType.NavigationTypeLink):
             # send referer header only on click
             info.setHttpHeader(b"Referer", b"")
         else:
@@ -190,8 +190,10 @@
         @return flag indicating that both URLs have the same origin
         @rtype bool
         """
-        origin1 = url1.url(QUrl.RemoveUserInfo | QUrl.RemovePath)
-        origin2 = url2.url(QUrl.RemoveUserInfo | QUrl.RemovePath)
+        origin1 = url1.url(QUrl.UrlFormattingOption.RemoveUserInfo |
+                           QUrl.UrlFormattingOption.RemovePath)
+        origin2 = url2.url(QUrl.UrlFormattingOption.RemoveUserInfo |
+                           QUrl.UrlFormattingOption.RemovePath)
         
         return origin1 == origin2
     
@@ -210,7 +212,8 @@
         if url.toString() in ("about:blank", "about:srcdoc"):
             return True
         
-        origin = url.adjusted(QUrl.RemoveUserInfo | QUrl.RemovePath)
+        origin = url.adjusted(QUrl.UrlFormattingOption.RemoveUserInfo |
+                              QUrl.UrlFormattingOption.RemovePath)
         
         if origin.isEmpty() or origin.scheme() == "":
             return False
@@ -242,12 +245,16 @@
         if self.__refererTrimmingPolicy == 0:
             # send full URL (no trimming) (default)
             refererUrl = url.toEncoded(
-                QUrl.RemoveUserInfo | QUrl.RemoveFragment)
+                QUrl.UrlFormattingOption.RemoveUserInfo |
+                QUrl.UrlFormattingOption.RemoveFragment
+            )
         elif self.__refererTrimmingPolicy == 1:
             # send the URL without its query string
             refererUrl = url.toEncoded(
-                QUrl.RemoveUserInfo | QUrl.RemoveFragment |
-                QUrl.RemoveQuery)
+                QUrl.UrlFormattingOption.RemoveUserInfo |
+                QUrl.UrlFormattingOption.RemoveFragment |
+                QUrl.UrlFormattingOption.RemoveQuery
+            )
         else:
             # only send the origin (ensure trailing /)
             refererUrl = self.__refererOrigin(url)
@@ -263,7 +270,10 @@
         @return origin referer header URL
         @rtype QByteArray or bytes
         """
-        referer = url.toEncoded(QUrl.RemoveUserInfo | QUrl.RemovePath)
+        referer = url.toEncoded(
+            QUrl.UrlFormattingOption.RemoveUserInfo |
+            QUrl.UrlFormattingOption.RemovePath
+        )
         if not referer.endsWith(b"/"):
             referer += b"/"