Bitmessage/PyBitmessage-2024-11-28
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Conversation 0 Commits 399 Files Changed 133 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9338772b1e - Show all commits

10
src/bitmessageqt/__init__.py
View File

@ -1,3 +1,4 @@
from debug import logger
withMessagingMenu = False withMessagingMenu = False
try: try:
from gi.repository import MessagingMenu from gi.repository import MessagingMenu
@ -12,14 +13,14 @@ try:
from PyQt4.QtGui import * from PyQt4.QtGui import *
except Exception as err: except Exception as err:
logger.error( '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).') logmsg = '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).'
logger.error('Error message: ' + str(err)) logger.critical(logmsg, exc_info=True)
sys.exit() sys.exit()
try: try:
_encoding = QtGui.QApplication.UnicodeUTF8 _encoding = QtGui.QApplication.UnicodeUTF8
except AttributeError: except AttributeError:
logger.error('QtGui.QApplication.UnicodeUTF8 error: ' + str(err)) logger.exception('QtGui.QApplication.UnicodeUTF8 error', exc_info=True)
from addresses import * from addresses import *
import shared import shared
@ -51,7 +52,6 @@ import pickle
import platform import platform
import textwrap import textwrap
import debug import debug
from debug import logger
import subprocess import subprocess
import datetime import datetime
from helper_sql import * from helper_sql import *
@ -3243,7 +3243,7 @@ class MyForm(settingsmixin.SMainWindow):
f.write(message) f.write(message)
f.close() f.close()
except Exception, e: except Exception, e:
sys.stderr.write('Write error: '+ e) logger.exception('Message not saved', exc_info=True)
self.statusBar().showMessage(_translate("MainWindow", "Write error.")) self.statusBar().showMessage(_translate("MainWindow", "Write error."))
# Send item on the Sent tab to trash # Send item on the Sent tab to trash