diff --git a/python/pyphantomjs/utils.py b/python/pyphantomjs/utils.py index b35a1546..792a6e30 100644 --- a/python/pyphantomjs/utils.py +++ b/python/pyphantomjs/utils.py @@ -133,7 +133,7 @@ class QPyFile(QFile): def __enter__(self): return self - def __exit__(self, _, _, _): + def __exit__(self, exc_type, exc_value, traceback): self.close() def __init__(self, filename, mode='r'): diff --git a/python/pyphantomjs/webpage.py b/python/pyphantomjs/webpage.py index a751a666..c832d33e 100644 --- a/python/pyphantomjs/webpage.py +++ b/python/pyphantomjs/webpage.py @@ -87,20 +87,20 @@ class CustomPage(QWebPage): do_action('CustomPageInit') - def chooseFile(self, _, _): + def chooseFile(self, originatingFrame, oldFile): return self.m_uploadFile def shouldInterruptJavaScript(self): QApplication.processEvents(QEventLoop.AllEvents, 42) return False - def javaScriptAlert(self, _, msg): + def javaScriptAlert(self, originatingFrame, msg): self.parent().javaScriptAlertSent.emit(msg) def javaScriptConsoleMessage(self, message, lineNumber, sourceID): self.parent().javaScriptConsoleMessageSent.emit(message, lineNumber, sourceID) - def userAgentForUrl(self, _): + def userAgentForUrl(self, url): return self.m_userAgent do_action('CustomPage')