From 5b6a3d419ebb3891c02bf91f88a6ac1c6189546c Mon Sep 17 00:00:00 2001 From: nimda Date: Thu, 13 Jun 2013 22:03:03 -0400 Subject: [PATCH] cleanup --- src/shared.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/shared.py b/src/shared.py index 111016a0..f945b168 100644 --- a/src/shared.py +++ b/src/shared.py @@ -51,7 +51,7 @@ def lookupAppdataFolder(): return dataFolder def isAddressInMyAddressBook(address): - t = (address,) + t = (addBMIfNotPresent(address,) sqlLock.acquire() sqlSubmitQueue.put('''select address from addressbook where address=?''') sqlSubmitQueue.put(t) @@ -68,6 +68,7 @@ def isAddressInMySubscriptionsList(address): queryreturn = sqlReturnQueue.get() sqlLock.release() return queryreturn != [] + def isAddressInMyAddressBookSubscriptionsListOrWhitelist(address): if isAddressInMyAddressBook(address): return True @@ -219,4 +220,4 @@ def fixPotentiallyInvalidUTF8Data(text): return text except: output = 'Part of the message is corrupt. The message cannot be displayed the normal way.\n\n' + repr(text) - return output \ No newline at end of file + return output