src/bitmessageqt/account.py

@@ -23,8 +23,8 @@ def getSortedAccounts():
     configSections = BMConfigParser().addresses()
     configSections.sort(
         cmp=lambda x, y: cmp(
-            unicode(BMConfigParser().get(x, 'label'), 'utf-8').lower(),
+            BMConfigParser().get(x, 'label').decode('utf-8').lower(),
-            unicode(BMConfigParser().get(y, 'label'), 'utf-8').lower())
+            BMConfigParser().get(y, 'label').decode('utf-8').lower())
     )
     return configSections
 
@@ -38,22 +38,21 @@ def getSortedSubscriptions(count=False):
     :retuns: dict keys are addresses, values are dicts containing settings
     :rtype: dict, default {}
     """
-    queryreturn = sqlQuery('SELECT label, address, enabled FROM subscriptions ORDER BY label COLLATE NOCASE ASC')
+    queryreturn = sqlQuery(
+        'SELECT label, address, enabled FROM subscriptions'
+        ' ORDER BY label COLLATE NOCASE ASC')
     ret = {}
-    for row in queryreturn:
+    for label, address, enabled in queryreturn:
-        label, address, enabled = row
+        ret[address] = {'inbox': {}}
-        ret[address] = {}
+        ret[address]['inbox'].update(label=label, enabled=enabled, count=0)
-        ret[address]["inbox"] = {}
-        ret[address]["inbox"]['label'] = label
-        ret[address]["inbox"]['enabled'] = enabled
-        ret[address]["inbox"]['count'] = 0
     if count:
-        queryreturn = sqlQuery('''SELECT fromaddress, folder, count(msgid) as cnt
+        queryreturn = sqlQuery(
-            FROM inbox, subscriptions ON subscriptions.address = inbox.fromaddress
+            'SELECT fromaddress, folder, count(msgid) AS cnt'
-            WHERE read = 0 AND toaddress = ?
+            ' FROM inbox, subscriptions'
-            GROUP BY inbox.fromaddress, folder''', str_broadcast_subscribers)
+            ' ON subscriptions.address = inbox.fromaddress WHERE read = 0'
-        for row in queryreturn:
+            ' AND toaddress = ? GROUP BY inbox.fromaddress, folder',
-            address, folder, cnt = row
+            str_broadcast_subscribers)
+        for address, folder, cnt in queryreturn:
             if folder not in ret[address]:
                 ret[address][folder] = {
                     'label': ret[address]['inbox']['label'],
@@ -105,7 +104,9 @@ class AccountColor(AccountMixin):
             elif BMConfigParser().safeGetBoolean(self.address, 'chan'):
                 self.type = AccountMixin.CHAN
             elif sqlQuery(
-                    '''select label from subscriptions where address=?''', self.address):
+                'SELECT label FROM subscriptions WHERE address=?',
+                self.address
+            ):
                 self.type = AccountMixin.SUBSCRIPTION
             else:
                 self.type = AccountMixin.NORMAL
@@ -149,10 +150,9 @@ class BMAccount(NoAccount):
                 self.type = AccountMixin.MAILINGLIST
         elif self.address == str_broadcast_subscribers:
             self.type = AccountMixin.BROADCAST
-        else:
+        elif sqlQuery(
-            queryreturn = sqlQuery(
+            'SELECT label FROM subscriptions WHERE address=?', self.address
-                '''select label from subscriptions where address=?''', self.address)
+        ):
-            if queryreturn:
             self.type = AccountMixin.SUBSCRIPTION
 
     def getLabel(self, address=None):
@@ -160,17 +160,15 @@ class BMAccount(NoAccount):
         address = super(BMAccount, self).getLabel(address)
         label = BMConfigParser().safeGet(address, 'label', address)
         queryreturn = sqlQuery(
-            '''select label from addressbook where address=?''', address)
+            'SELECT label FROM addressbook WHERE address=?', address)
-        if queryreturn != []:
+        if queryreturn:
-            for row in queryreturn:
+            label = queryreturn[-1][0]
-                label, = row
         else:
             queryreturn = sqlQuery(
-                '''select label from subscriptions where address=?''', address)
+                'SELECT label FROM subscriptions WHERE address=?', address)
-            if queryreturn != []:
+            if queryreturn:
-                for row in queryreturn:
+                label = queryreturn[-1][0]
-                    label, = row
+        return label.decode('utf-8')
-        return unicode(label, 'utf-8')
 
 
 class SubscriptionAccount(BMAccount):