Improve error reporting for injectJsInFrame()

Also changed warnings to debugs
This commit is contained in:
IceArmy
2011-06-29 00:47:37 -07:00
parent a2aed0064c
commit bd775fd429
+5 -5
View File
@@ -23,7 +23,7 @@ import codecs
import argparse
from PyQt4.QtCore import QDateTime, Qt, QtDebugMsg, QtWarningMsg, \
QtCriticalMsg, QtFatalMsg, qWarning
QtCriticalMsg, QtFatalMsg, qDebug
from csconverter import CSConverter
from plugincontroller import Bunch, do_action
@@ -127,17 +127,17 @@ def injectJsInFrame(filePath, libraryPath, targetFrame, startingScript=False):
result = coffee2js(script)
if result[0] is False:
if startingScript:
sys.exit(result[1])
sys.exit('%s: \'%s\'' % (result[1], filePath))
else:
qWarning(result[1])
qDebug('%s: \'%s\'' % (result[1], filePath))
script = ''
else:
script = result[1]
targetFrame.evaluateJavaScript(script)
return True
except IOError:
qWarning('No such file or directory: \'%s\'' % filePath)
except IOError as (t, e):
qDebug('%s: \'%s\'' % (e, filePath))
return False