diff -r babe80d84a3e -r 7eb04391adf7 eric6/WebBrowser/Network/NetworkManager.py
--- a/eric6/WebBrowser/Network/NetworkManager.py Mon Sep 09 18:52:08 2019 +0200
+++ b/eric6/WebBrowser/Network/NetworkManager.py Thu Oct 03 11:12:10 2019 +0200
@@ -7,14 +7,14 @@
Module implementing a network manager class.
"""
-from __future__ import unicode_literals
import json
from PyQt5.QtCore import pyqtSignal, QByteArray
from PyQt5.QtWidgets import qApp, QStyle, QDialog
-from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkProxy, \
- QNetworkProxyFactory, QNetworkRequest
+from PyQt5.QtNetwork import (
+ QNetworkAccessManager, QNetworkProxy, QNetworkProxyFactory, QNetworkRequest
+)
from E5Gui import E5MessageBox
@@ -187,12 +187,16 @@
host = error.url().host()
- if host in self.__temporarilyIgnoredSslErrors and \
- error.error() in self.__temporarilyIgnoredSslErrors[host]:
+ if (
+ host in self.__temporarilyIgnoredSslErrors and
+ error.error() in self.__temporarilyIgnoredSslErrors[host]
+ ):
return True
- if host in self.__permanentlyIgnoredSslErrors and \
- error.error() in self.__permanentlyIgnoredSslErrors[host]:
+ if (
+ host in self.__permanentlyIgnoredSslErrors and
+ error.error() in self.__permanentlyIgnoredSslErrors[host]
+ ):
return True
title = self.tr("SSL Certificate Error")
@@ -237,17 +241,20 @@
@param page reference to the web page
@type QWebEnginePage or None
"""
- urlRoot = "{0}://{1}"\
- .format(url.scheme(), url.authority())
+ urlRoot = (
+ "{0}://{1}".format(url.scheme(), url.authority())
+ )
realm = auth.realm()
if not realm and 'realm' in auth.options():
realm = auth.option("realm")
if realm:
- info = self.tr("<b>Enter username and password for '{0}', "
- "realm '{1}'</b>").format(urlRoot, realm)
+ info = self.tr(
+ "<b>Enter username and password for '{0}', realm '{1}'</b>"
+ ).format(urlRoot, realm)
else:
- info = self.tr("<b>Enter username and password for '{0}'</b>")\
- .format(urlRoot)
+ info = self.tr(
+ "<b>Enter username and password for '{0}'</b>"
+ ).format(urlRoot)
from UI.AuthenticationDialog import AuthenticationDialog
import WebBrowser.WebBrowserWindow
@@ -256,9 +263,10 @@
Preferences.getUser("SavePasswords"),
Preferences.getUser("SavePasswords"))
if Preferences.getUser("SavePasswords"):
- username, password = \
- WebBrowser.WebBrowserWindow.WebBrowserWindow.passwordManager()\
- .getLogin(url, realm)
+ username, password = (
+ WebBrowser.WebBrowserWindow.WebBrowserWindow
+ .passwordManager().getLogin(url, realm)
+ )
if username:
dlg.setData(username, password)
if dlg.exec_() == QDialog.Accepted:
@@ -266,8 +274,11 @@
auth.setUser(username)
auth.setPassword(password)
if Preferences.getUser("SavePasswords") and dlg.shallSave():
- WebBrowser.WebBrowserWindow.WebBrowserWindow.passwordManager()\
- .setLogin(url, realm, username, password)
+ (
+ WebBrowser.WebBrowserWindow.WebBrowserWindow
+ .passwordManager().setLogin(
+ url, realm, username, password)
+ )
else:
if page is not None:
self.__showAuthenticationErrorPage(page, url)
@@ -321,8 +332,9 @@
"""
Public slot to (re-)load the list of accepted languages.
"""
- from WebBrowser.WebBrowserLanguagesDialog import \
+ from WebBrowser.WebBrowserLanguagesDialog import (
WebBrowserLanguagesDialog
+ )
languages = Preferences.toList(
Preferences.Prefs.settings.value(
"WebBrowser/AcceptLanguages",
