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

Fixed: Addressed issues raised in PR

Browse Source
This commit is contained in:
coffeedogs 2018-05-17 10:51:21 +01:00
parent da87ae24ee
commit 9263026bc8
No known key found for this signature in database
GPG Key ID: 9D818C503D0B7E70
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bitmessageqt/__init__.py
View File

@ -6,8 +6,6 @@
Initialise the QT interface Initialise the QT interface
""" """
from debug import logger # pylint: disable=wrong-import-order
import hashlib import hashlib
import locale import locale
import os import os
@ -18,6 +16,9 @@ import textwrap
import time import time
from datetime import datetime, timedelta from datetime import datetime, timedelta
import debug
from debug import logger
try: try:
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
@ -32,9 +33,8 @@ except ImportError:
sys.exit() sys.exit()
from sqlite3 import register_adapter from sqlite3 import register_adapter # pylint: disable=wrong-import-order
import debug # pylint: disable=ungrouped-imports
import defaults import defaults
import helper_search import helper_search
import knownnodes import knownnodes
@ -644,7 +644,8 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth
displayMsg = _translate( displayMsg = _translate(
"MainWindow", "MainWindow",
'One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer ' 'One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer '
'supported. May we delete it now?').arg(addressInKeysFile) 'supported. May we delete it now?'
).arg(addressInKeysFile)
reply = QtGui.QMessageBox.question( reply = QtGui.QMessageBox.question(
self, 'Message', displayMsg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) self, 'Message', displayMsg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
if reply == QtGui.QMessageBox.Yes: if reply == QtGui.QMessageBox.Yes:
@ -1043,7 +1044,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth
totalUnread[row[1]] = row[2] totalUnread[row[1]] = row[2]
queryReturn = sqlQuery( queryReturn = sqlQuery(
"SELECT fromaddress, folder, COUNT(msgid) AS cnt FROM inbox " "SELECT fromaddress, folder, COUNT(msgid) AS cnt FROM inbox "
"WHERE read = 0 AND toaddress = ? GROUP BY fromaddress, folder", "WHERE read = 0 AND toaddress = ? GROUP BY fromaddress, folder",
str_broadcast_subscribers) str_broadcast_subscribers)
broadcastsUnread = {} broadcastsUnread = {}
for row in queryReturn: for row in queryReturn: