fixin up things on mac os x

This commit is contained in:
Adolfo Gómez 2015-04-07 02:04:51 -07:00
parent dc1dd977fc
commit ae5fafae76
2 changed files with 4 additions and 5 deletions

View File

@ -46,7 +46,7 @@ import time
from UDSWindow import Ui_MainWindow
# Client connector version
VERSION = '1.9.5'
VERSION = '1.7.5'
class UDSClient(QtGui.QMainWindow):
@ -122,8 +122,8 @@ class UDSClient(QtGui.QMainWindow):
self.processError(data)
script = data['result'].decode('base64').decode('bz2')
print script
self.showMinimized()
six.exec_(script, globals(), {'parent': self})
self.closeWindow()
@ -184,7 +184,6 @@ if __name__ == "__main__":
QtGui.QMessageBox.critical(None, 'Error', six.text_type(e), QtGui.QMessageBox.Ok)
if win.withError is False:
win.showMinimized() # This is a top most window, minimize to bar because it is not closed in fact until app exit
try:
tools.waitForTasks()
except Exception:

View File

@ -71,8 +71,8 @@ class RestRequest(QObject):
try:
if reply.error() != QNetworkReply.NoError:
raise Exception(reply.errorString())
data = json.loads(six.text_type(reply.readAll()))
data = six.text_type(reply.readAll())
data = json.loads(data)
except Exception as e:
data = {
'result': None,