Permalink
Browse files

Revert most of commit c8f45c2d

old-commit-id: 3581fae3c03f749b348776444ae6be9b36d21ac7
  • Loading branch information...
1 parent fb25891 commit 3bd9f9ca8e275f85c74c2048c9a2fb6cbb89b051 IceArmy committed Dec 16, 2011
Showing with 4 additions and 4 deletions.
  1. +1 −1 pyphantomjs/utils.py
  2. +3 −3 pyphantomjs/webpage.py
View
@@ -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'):
View
@@ -87,20 +87,20 @@ def __init__(self, parent):
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')

0 comments on commit 3bd9f9c

Please sign in to comment.