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

Merge branch 'master' of ssh://lupin/qutebrowser

Browse Source
This commit is contained in:
Florian Bruhin 2014-07-09 21:14:32 +02:00
commit 781390828f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qutebrowser/browser/webpage.py
View File

@ -68,6 +68,7 @@ class BrowserPage(QWebPage):
if PYQT_VERSION > 0x050300: if PYQT_VERSION > 0x050300:
# This is broken in Qt <= 5.3.0. # This is broken in Qt <= 5.3.0.
# See http://www.riverbankcomputing.com/pipermail/pyqt/2014-June/034385.html # See http://www.riverbankcomputing.com/pipermail/pyqt/2014-June/034385.html
# pylint: disable=invalid-name
self.javaScriptPrompt = self._javascript_prompt self.javaScriptPrompt = self._javascript_prompt
def _javascript_prompt(self, _frame, msg, default): def _javascript_prompt(self, _frame, msg, default):

4
scripts/run_checks.py
View File

@ -74,8 +74,8 @@ options = {
if os.name == 'nt': if os.name == 'nt':
# pep257 uses cp1252 by default on Windows, which can't handle the unicode # pep257 uses cp1252 by default on Windows, which can't handle the unicode
# arrows in configdata.py # chars in some files.
options['exclude_pep257'].append('configdata.py') options['exclude_pep257'] += ['configdata.py', 'misc.py']
def run(name, target=None, args=None): def run(name, target=None, args=None):