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

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

View File

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

View File

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