Minor style changes:

  - removed list <-> set conversion in __init__
  - tuples instead of lists if changes aren't needed
  - removed nnecessary variable redefinition in utils
  - rewrote languagebox module a bit
  - minor change in MyForm.rerenderAddressBook

Author: g1itch

src/bitmessageqt/__init__.py

@@ -533,7 +533,7 @@ def rerenderTabTree(self, tab):
                 try:
                     subwidget.setUnreadCount(
                         db[toAddress][subwidget.folderName])
-                    if subwidget.folderName not in ["new", "trash", "sent"]:
+                    if subwidget.folderName not in ("new", "trash", "sent"):
                         unread += db[toAddress][subwidget.folderName]
                     db[toAddress].pop(subwidget.folderName, None)
                 except:
@@ -549,7 +549,7 @@ def rerenderTabTree(self, tab):
                     if toAddress is not None and tab == 'messages' and folder == "new":
                         continue
                     subwidget = Ui_FolderWidget(widget, j, toAddress, f, c)
-                    if subwidget.folderName not in ["new", "trash", "sent"]:
+                    if subwidget.folderName not in ("new", "trash", "sent"):
                         unread += c
                     j += 1
             widget.setUnreadCount(unread)
@@ -565,7 +565,7 @@ def rerenderTabTree(self, tab):
                 if toAddress is not None and tab == 'messages' and folder == "new":
                     continue
                 subwidget = Ui_FolderWidget(widget, j, toAddress, folder, db[toAddress][folder])
-                if subwidget.folderName not in ["new", "trash", "sent"]:
+                if subwidget.folderName not in ("new", "trash", "sent"):
                     unread += db[toAddress][folder]
                 j += 1
             widget.setUnreadCount(unread)
@@ -934,14 +934,17 @@ def updateUnreadStatus(self, widget, row, msgid, unread=True):
                 for col in (0, 1, 2):
                     related.item(rrow, col).setUnread(not status)
 
-    def propagateUnreadCount(self, address = None, folder = "inbox", widget = None, type = 1):
-        widgets = [self.ui.treeWidgetYourIdentities, self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans]
+    def propagateUnreadCount(
+            self, address=None, folder="inbox", widget=None, type=1):
+        widgets = (
+            self.ui.treeWidgetYourIdentities,
+            self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans)
         queryReturn = sqlQuery("SELECT toaddress, folder, COUNT(msgid) AS cnt FROM inbox WHERE read = 0 GROUP BY toaddress, folder")
         totalUnread = {}
         normalUnread = {}
         for row in queryReturn:
             normalUnread[row[0]] = {}
-            if row[1] in ["trash"]:
+            if row[1] == "trash":
                 continue
             normalUnread[row[0]][row[1]] = row[2]
             if row[1] in totalUnread:
@@ -953,7 +956,7 @@ def propagateUnreadCount(self, address = None, folder = "inbox", widget = None,
         for row in queryReturn:
             broadcastsUnread[row[0]] = {}
             broadcastsUnread[row[0]][row[1]] = row[2]
-        
+
         for treeWidget in widgets:
             root = treeWidget.invisibleRootItem()
             for i in range(root.childCount()):
@@ -1908,10 +1911,10 @@ def addRow(address, label, type):
         for address in sorted(
             oldRows, key=lambda x: oldRows[x][2], reverse=True
         ):
-            if address in newRows:
+            try:
                 completerList.append(
                     newRows.pop(address)[0] + " <" + address + ">")
-            else:
+            except KeyError:
                 self.ui.tableWidgetAddressBook.removeRow(oldRows[address][2])
         for address in newRows:
             addRow(address, newRows[address][0], newRows[address][1])
@@ -1985,13 +1988,12 @@ def click_pushButtonSend(self):
 
         # To send a message to specific people (rather than broadcast)
         if sendMessageToPeople:
-            toAddressesList = [
+            toAddressesList = set([
                 s.strip() for s in toAddresses.replace(',', ';').split(';')
-            ]
+            ])
             # remove duplicate addresses. If the user has one address
             # with a BM- and the same address without the BM-, this will
             # not catch it. They'll send the message to the person twice.
-            toAddressesList = list(set(toAddressesList))
             for toAddress in toAddressesList:
                 if toAddress != '':
                     # label plus address
@@ -2238,7 +2240,7 @@ def click_pushButtonSend(self):
                     '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', *t)
 
                 toLabel = str_broadcast_subscribers
-                
+
                 self.displayNewSentMessage(
                     toAddress, toLabel, fromAddress, subject, message, ackdata)
 
@@ -2339,25 +2341,42 @@ def rerenderComboBoxSendFromBroadcast(self):
     # receives a message to an address that is acting as a
     # pseudo-mailing-list. The message will be broadcast out. This function
     # puts the message on the 'Sent' tab.
-    def displayNewSentMessage(self, toAddress, toLabel, fromAddress, subject, message, ackdata):
+    def displayNewSentMessage(
+            self, toAddress, toLabel, fromAddress, subject,
+            message, ackdata):
         acct = accountClass(fromAddress)
         acct.parseMessage(toAddress, fromAddress, subject, message)
         tab = -1
-        for sent in [self.ui.tableWidgetInbox, self.ui.tableWidgetInboxSubscriptions, self.ui.tableWidgetInboxChans]:
+        for sent in (
+            self.ui.tableWidgetInbox,
+            self.ui.tableWidgetInboxSubscriptions,
+            self.ui.tableWidgetInboxChans
+        ):
             tab += 1
             if tab == 1:
                 tab = 2
             treeWidget = self.widgetConvert(sent)
             if self.getCurrentFolder(treeWidget) != "sent":
                 continue
-            if treeWidget == self.ui.treeWidgetYourIdentities and self.getCurrentAccount(treeWidget) not in (fromAddress, None, False):
+            if treeWidget == self.ui.treeWidgetYourIdentities \
+                and self.getCurrentAccount(treeWidget) not in (
+                    fromAddress, None, False):
                 continue
-            elif treeWidget in [self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans] and self.getCurrentAccount(treeWidget) != toAddress:
+            elif treeWidget in (
+                self.ui.treeWidgetSubscriptions,
+                self.ui.treeWidgetChans
+            ) and self.getCurrentAccount(treeWidget) != toAddress:
                 continue
-            elif not helper_search.check_match(toAddress, fromAddress, subject, message, self.getCurrentSearchOption(tab), self.getCurrentSearchLine(tab)):
+            elif not helper_search.check_match(
+                toAddress, fromAddress, subject, message,
+                self.getCurrentSearchOption(tab),
+                self.getCurrentSearchLine(tab)
+            ):
                 continue
 
-            self.addMessageListItemSent(sent, toAddress, fromAddress, subject, "msgqueued", ackdata, time.time())
+            self.addMessageListItemSent(
+                sent, toAddress, fromAddress, subject, "msgqueued",
+                ackdata, time.time())
             self.getAccountTextedit(acct).setPlainText(message)
             sent.setCurrentCell(0, 0)
 
@@ -2370,11 +2389,11 @@ def displayNewInboxMessage(
         inbox = self.getAccountMessagelist(acct)
         ret = None
         tab = -1
-        for treeWidget in [
+        for treeWidget in (
             self.ui.treeWidgetYourIdentities,
             self.ui.treeWidgetSubscriptions,
             self.ui.treeWidgetChans
-        ]:
+        ):
             tab += 1
             if tab == 1:
                 tab = 2
@@ -2389,15 +2408,15 @@ def displayNewInboxMessage(
             if tableWidget == inbox \
                 and self.getCurrentAccount(treeWidget) == acct.address \
                 and self.getCurrentFolder(treeWidget) \
-                    in ["inbox", None]:
+                    in ("inbox", None):
                 ret = self.addMessageListItemInbox(
                     inbox, "inbox", inventoryHash, toAddress, fromAddress,
                     subject, time.time(), 0
                 )
             elif treeWidget == self.ui.treeWidgetYourIdentities \
                 and self.getCurrentAccount(treeWidget) is None \
                 and self.getCurrentFolder(treeWidget) \
-                    in ["inbox", "new", None]:
+                    in ("inbox", "new", None):
                 ret = self.addMessageListItemInbox(
                     tableWidget, "inbox", inventoryHash, toAddress,
                     fromAddress, subject, time.time(), 0
@@ -3129,8 +3148,11 @@ def setSendFromComboBox(self, address=None):
                 currentInboxRow = messagelist.currentRow()
                 address = messagelist.item(
                     currentInboxRow, 0).address
-        for box in [self.ui.comboBoxSendFrom, self.ui.comboBoxSendFromBroadcast]:
-            listOfAddressesInComboBoxSendFrom = [str(box.itemData(i)) for i in range(box.count())]
+        for box in (
+            self.ui.comboBoxSendFrom, self.ui.comboBoxSendFromBroadcast
+        ):
+            listOfAddressesInComboBoxSendFrom = [
+                str(box.itemData(i)) for i in range(box.count())]
             if address in listOfAddressesInComboBoxSendFrom:
                 currentIndex = listOfAddressesInComboBoxSendFrom.index(address)
                 box.setCurrentIndex(currentIndex)
@@ -3240,7 +3262,7 @@ def on_action_InboxReply(self, replyType=None):
         quotedText = self.quoted_text(
             unicode(messageAtCurrentInboxRow, 'utf-8', 'replace'))
         widget['message'].setPlainText(quotedText)
-        if acct.subject[0:3] in ['Re:', 'RE:']:
+        if acct.subject[0:3] in ('Re:', 'RE:'):
             widget['subject'].setText(
                 tableWidget.item(currentInboxRow, 2).label)
         else:
@@ -3887,12 +3909,11 @@ def on_action_ClipboardMessagelist(self):
         tableWidget = self.getCurrentMessagelist()
         currentColumn = tableWidget.currentColumn()
         currentRow = tableWidget.currentRow()
+        currentFolder = self.getCurrentFolder()
         if currentColumn not in (0, 1, 2):  # to, from, subject
-            if self.getCurrentFolder() == "sent":
-                currentColumn = 0
-            else:
-                currentColumn = 1
-        if self.getCurrentFolder() == "sent":
+            currentColumn = 0 if currentFolder == "sent" else 1
+
+        if currentFolder == "sent":
             myAddress = tableWidget.item(currentRow, 1).data(QtCore.Qt.UserRole)
             otherAddress = tableWidget.item(currentRow, 0).data(QtCore.Qt.UserRole)
         else:
@@ -3906,7 +3927,7 @@ def on_action_ClipboardMessagelist(self):
             text = tableWidget.item(currentRow, currentColumn).label
         else:
             text = tableWidget.item(currentRow, currentColumn).data(QtCore.Qt.UserRole)
-        # text = unicode(str(text), 'utf-8', 'ignore')
+
         clipboard = QtWidgets.QApplication.clipboard()
         clipboard.setText(text)
 

src/bitmessageqt/languagebox.py

@@ -33,14 +33,13 @@ def populate(self):
         ):
             localeShort = \
                 os.path.split(translationFile)[1].split("_", 1)[1][:-3]
-            locale = QtCore.QLocale(localeShort)
             if localeShort in LanguageBox.languageName:
                 self.addItem(
                     LanguageBox.languageName[localeShort], localeShort)
-            elif locale.nativeLanguageName() == "":
-                self.addItem(localeShort, localeShort)
             else:
-                self.addItem(locale.nativeLanguageName(), localeShort)
+                locale = QtCore.QLocale(localeShort)
+                self.addItem(
+                    locale.nativeLanguageName() or localeShort, localeShort)
 
         configuredLocale = BMConfigParser().safeGet(
             'bitmessagesettings', 'userlocale', 'system')

src/bitmessageqt/utils.py

@@ -83,7 +83,6 @@ def avatarize(address):
     """
     idcon = QtGui.QIcon()
     icon_hash = hashlib.md5(addBMIfNotPresent(address)).hexdigest()
-    str_broadcast_subscribers = '[Broadcast subscribers]'
     if address == str_broadcast_subscribers:
         # don't hash [Broadcast subscribers]
         icon_hash = address