Merge pull request #257 from Atheros1/master

added missing imports
This commit is contained in:
Jonathan Warren 2013-06-25 13:26:59 -07:00
commit 94835ab8ae
2 changed files with 18 additions and 17 deletions

View File

@ -15,6 +15,7 @@ import signal # Used to capture a Ctrl-C keypress so that Bitmessage can shutdo
from SimpleXMLRPCServer import * from SimpleXMLRPCServer import *
import json import json
import singleton import singleton
import os
# Classes # Classes
from class_sqlThread import * from class_sqlThread import *

View File

@ -3,23 +3,6 @@ try:
except: except:
pass pass
try:
from PyQt4 import QtCore, QtGui
from PyQt4.QtCore import *
from PyQt4.QtGui import *
except Exception as err:
print 'PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can download it from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for \'PyQt Download\' (without quotes).'
print 'Error message:', err
sys.exit()
try:
_encoding = QtGui.QApplication.UnicodeUTF8
except AttributeError:
print 'QtGui.QApplication.UnicodeUTF8 error:', err
def _translate(context, text):
return QtGui.QApplication.translate(context, text)
withMessagingMenu = False withMessagingMenu = False
try: try:
from gi.repository import MessagingMenu from gi.repository import MessagingMenu
@ -47,6 +30,23 @@ from pyelliptic.openssl import OpenSSL
import pickle import pickle
import platform import platform
try:
from PyQt4 import QtCore, QtGui
from PyQt4.QtCore import *
from PyQt4.QtGui import *
except Exception as err:
print 'PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can download it from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for \'PyQt Download\' (without quotes).'
print 'Error message:', err
sys.exit()
try:
_encoding = QtGui.QApplication.UnicodeUTF8
except AttributeError:
print 'QtGui.QApplication.UnicodeUTF8 error:', err
def _translate(context, text):
return QtGui.QApplication.translate(context, text)
class MyForm(QtGui.QMainWindow): class MyForm(QtGui.QMainWindow):