From 7ccdd14418cea6f4b0b1c149a61e5f1ebb65ec29 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Wed, 4 Sep 2013 12:53:18 -0400 Subject: [PATCH] fix #474 --- src/bitmessageqt/__init__.py | 5 ++--- src/class_receiveDataThread.py | 1 - src/namecoin.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 034043c8..209c7129 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -2718,9 +2718,8 @@ class MyForm(QtGui.QMainWindow): inventoryHash = str(self.ui.tableWidgetInbox.item( currentRow, 3).data(Qt.UserRole).toPyObject()) - t = (inventoryHash,) - self.ubuntuMessagingMenuClear(t) - sqlExecute('''update inbox set read=1 WHERE msgid=?''', *t) + self.ubuntuMessagingMenuClear(inventoryHash) + sqlExecute('''update inbox set read=1 WHERE msgid=?''', inventoryHash) def tableWidgetSentItemClicked(self): currentRow = self.ui.tableWidgetSent.currentRow() diff --git a/src/class_receiveDataThread.py b/src/class_receiveDataThread.py index 70fdd5b6..1ec15b8a 100644 --- a/src/class_receiveDataThread.py +++ b/src/class_receiveDataThread.py @@ -195,7 +195,6 @@ class receiveDataThread(threading.Thread): self.sendgetdata(objectHash) del self.objectsThatWeHaveYetToGetFromThisPeer[ objectHash] # It is possible that the remote node doesn't respond with the object. In that case, we'll very likely get it from someone else anyway. - print 'concerning', self.peer.host, ', len(self.objectsThatWeHaveYetToGetFromThisPeer) is', len(self.objectsThatWeHaveYetToGetFromThisPeer) if len(self.objectsThatWeHaveYetToGetFromThisPeer) == 0: with shared.printLock: print '(concerning', str(self.peer) + ')', 'number of objectsThatWeHaveYetToGetFromThisPeer is now', len(self.objectsThatWeHaveYetToGetFromThisPeer) diff --git a/src/namecoin.py b/src/namecoin.py index f9565ccf..03cd3080 100644 --- a/src/namecoin.py +++ b/src/namecoin.py @@ -139,7 +139,7 @@ class namecoinConnection (object): assert False except Exception as exc: - print "Exception testing the namecoin connection:\n%s" % str (exc) + print "Namecoin connection test: %s" % str (exc) return ('failed', "The connection to namecoin failed.") # Helper routine that actually performs an JSON RPC call. -- 2.45.1