From b15521bd74d0f01b5a36b061be3ac3bcfdca1362 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 20 May 2017 13:15:44 +0530
Subject: [PATCH] Fix commas doubled when editing formats list in email
 preferences

---
 src/calibre/gui2/preferences/emailp.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/preferences/emailp.py b/src/calibre/gui2/preferences/emailp.py
index f28c5857f9..12a98d8c45 100644
--- a/src/calibre/gui2/preferences/emailp.py
+++ b/src/calibre/gui2/preferences/emailp.py
@@ -109,7 +109,7 @@ class EmailAccounts(QAbstractTableModel):  # {{{
             if col == 0:
                 return (account)
             if col ==  1:
-                return (self.accounts[account][0])
+                return ', '.join(x.strip() for x in (self.accounts[account][0] or '').split(','))
             if col == 2:
                 return (self.subjects.get(account, ''))
             if col == 4:
@@ -148,7 +148,7 @@ class EmailAccounts(QAbstractTableModel):  # {{{
             if aval:
                 self.tags[account] = aval
         elif col == 1:
-            self.accounts[account][0] = re.sub(r'\s+', ',', unicode(value or '').upper())
+            self.accounts[account][0] = re.sub(',+', ',', re.sub(r'\s+', ',', unicode(value or '').upper()))
         elif col == 0:
             na = unicode(value or '')
             from email.utils import parseaddr
@@ -284,6 +284,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
 
 if __name__ == '__main__':
-    from PyQt5.Qt import QApplication
-    app = QApplication([])
+    from calibre.gui2 import Application
+    app = Application([])
     test_widget('Sharing', 'Email')