vitalif
/
phantomjs
mirror of https://github.com/vitalif/phantomjs
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert most of commit c8f45c2d

1.5
IceArmy 2011-12-15 17:04:23 -08:00
parent c8f45c2d15
commit 3581fae3c0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/pyphantomjs/utils.py
View File

@ -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'):

6
python/pyphantomjs/webpage.py
View File

@ -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')