rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix lint

Browse Source
This commit is contained in:
Florian Bruhin 2014-05-12 14:52:04 +02:00
parent db7077d94f
commit 8ff4b6dd99
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qutebrowser/network/networkmanager.py
View File

@ -52,7 +52,9 @@ class NetworkManager(QNetworkAccessManager):
@pyqtSlot('QNetworkReply', 'QList<QSslError>') @pyqtSlot('QNetworkReply', 'QList<QSslError>')
def on_ssl_errors(self, reply, errors): def on_ssl_errors(self, reply, errors):
"""This slot is called on SSL/TLS errors. """Decide if SSL errors should be ignored or not.
This slot is called on SSL/TLS errors by the self.sslErrors signal.
Args: Args:
reply: The QNetworkReply that is encountering the errors. reply: The QNetworkReply that is encountering the errors.
@ -64,7 +66,6 @@ class NetworkManager(QNetworkAccessManager):
message.error('SSL error: {}'.format(err.errorString())) message.error('SSL error: {}'.format(err.errorString()))
reply.ignoreSslErrors() reply.ignoreSslErrors()
def createRequest(self, op, req, outgoing_data): def createRequest(self, op, req, outgoing_data):
"""Return a new QNetworkReply object. """Return a new QNetworkReply object.

6
qutebrowser/utils/webelem.py
View File

@ -133,9 +133,9 @@ def javascript_escape(text):
# This is a list of tuples because order matters, and using OrderedDict # This is a list of tuples because order matters, and using OrderedDict
# makes no sense because we don't actually need dict-like properties. # makes no sense because we don't actually need dict-like properties.
replacements = [ replacements = [
('\\', r'\\'), # First escape all literal \ signs as \\ ('\\', r'\\'), # First escape all literal \ signs as \\.
("'", r"\'"), # Then escape ' and " as \' and \" ("'", r"\'"), # Then escape ' and " as \' and \".
('"', r'\"'), # (note it won't hurt when we escape the wrong one) ('"', r'\"'), # (note it won't hurt when we escape the wrong one).
('\n', r'\n'), # We also need to escape newlines for some reason. ('\n', r'\n'), # We also need to escape newlines for some reason.
] ]
for orig, repl in replacements: for orig, repl in replacements: