Mercurial Repositories > eric / changeset

--- a/Debugger/CallTraceViewer.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Debugger/CallTraceViewer.py	Sat Apr 26 10:36:09 2014 +0200
@@ -10,7 +10,7 @@
 from __future__ import unicode_literals
 
 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QRegExp, QFileInfo
-from PyQt4.QtGui import QWidget,  QTreeWidgetItem
+from PyQt4.QtGui import QWidget, QTreeWidgetItem
 
 from E5Gui.E5Application import e5App
 from E5Gui import E5FileDialog, E5MessageBox

--- a/E5Gui/E5MainWindow.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/E5Gui/E5MainWindow.py	Sat Apr 26 10:36:09 2014 +0200
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 
-from PyQt4.QtGui import QMainWindow, QStyleFactory,  QApplication
+from PyQt4.QtGui import QMainWindow, QStyleFactory, QApplication
 
 from .E5Application import e5App
 from . import E5MessageBox

--- a/E5Gui/E5ToolBarDialog.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/E5Gui/E5ToolBarDialog.py	Sat Apr 26 10:36:09 2014 +0200
@@ -81,7 +81,7 @@
         
         self.actionsTree.header().hide()
         self.__separatorText = self.tr("--Separator--")
-        itm = QTreeWidgetItem(self.actionsTree,  [self.__separatorText])
+        itm = QTreeWidgetItem(self.actionsTree, [self.__separatorText])
         self.actionsTree.setCurrentItem(itm)
         
         for category in sorted(self.__manager.categories()):

--- a/Helpviewer/AdBlock/AdBlockTreeWidget.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Helpviewer/AdBlock/AdBlockTreeWidget.py	Sat Apr 26 10:36:09 2014 +0200
@@ -148,7 +148,7 @@
            item == self.__topItem:
             return
         
-        offset = item.data(0,  Qt.UserRole)
+        offset = item.data(0, Qt.UserRole)
         self.__subscription.removeRule(offset)
         self.deleteItem(item)
     

--- a/Helpviewer/Bookmarks/BookmarksManager.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Helpviewer/Bookmarks/BookmarksManager.py	Sat Apr 26 10:36:09 2014 +0200
@@ -226,7 +226,7 @@
         if not self.__loaded:
             return
         
-        self.setTimestamp(node,  BookmarkNode.TsAdded,
+        self.setTimestamp(node, BookmarkNode.TsAdded,
                           QDateTime.currentDateTime())
         
         command = InsertBookmarksCommand(self, parent, node, row)

--- a/Helpviewer/GreaseMonkey/GreaseMonkeyUrlMatcher.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyUrlMatcher.py	Sat Apr 26 10:36:09 2014 +0200
@@ -109,6 +109,6 @@
             pattern = re.sub(r"\.tld", r"\.[a-z.]{2,6}")
             
             self.__useRegExp = True
-            self.__regExp = QRegExp(pattern,  Qt.CaseInsensitive)
+            self.__regExp = QRegExp(pattern, Qt.CaseInsensitive)
         else:
             self.__matchString = pattern

--- a/Helpviewer/HelpBrowserWV.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Helpviewer/HelpBrowserWV.py	Sat Apr 26 10:36:09 2014 +0200
@@ -1827,7 +1827,7 @@
         """
         self.mw.statusBar().showMessage(text)
     
-    def __linkHovered(self, link,  title, textContent):
+    def __linkHovered(self, link, title, textContent):
         """
         Private slot to handle the linkHovered signal.
         

--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py	Sat Apr 26 10:36:09 2014 +0200
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 
-from PyQt4.QtCore import pyqtSlot, QUrl, Qt, QByteArray,  QTimer
+from PyQt4.QtCore import pyqtSlot, QUrl, Qt, QByteArray, QTimer
 from PyQt4.QtGui import QWidget, QMenu, QCursor, QDialog, QLabel, QFormLayout
 from PyQt4.QtNetwork import QNetworkRequest
 from PyQt4.QtWebKit import QWebHitTestResult, QWebElement, QWebView, \

--- a/IconEditor/IconEditorGrid.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/IconEditor/IconEditorGrid.py	Sat Apr 26 10:36:09 2014 +0200
@@ -422,7 +422,7 @@
             j = 0
             while j <= self.__image.height():
                 painter.drawLine(
-                    0,  self.__zoom * j,
+                    0, self.__zoom * j,
                     self.__zoom * self.__image.width(), self.__zoom * j)
                 j += 1
         

--- a/Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py	Sat Apr 26 10:36:09 2014 +0200
@@ -871,7 +871,7 @@
         if "return" not in docstringContext.ssource().lower():
             tokens = list(
                 tokenize.generate_tokens(StringIO(context.ssource()).readline))
-            return_ = [tokens[i + 1][0] for i,  token in enumerate(tokens)
+            return_ = [tokens[i + 1][0] for i, token in enumerate(tokens)
                        if token[1] == "return"]
             if (set(return_) -
                     set([tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE]) !=
@@ -1035,7 +1035,7 @@
         
         tokens = list(
             tokenize.generate_tokens(StringIO(context.ssource()).readline))
-        return_ = [tokens[i + 1][0] for i,  token in enumerate(tokens)
+        return_ = [tokens[i + 1][0] for i, token in enumerate(tokens)
                    if token[1] in ("return", "yield")]
         if "@return" not in docstringContext.ssource():
             if (set(return_) -
@@ -1111,7 +1111,7 @@
         
         tokens = list(
             tokenize.generate_tokens(StringIO(context.ssource()).readline))
-        exception = [tokens[i + 1][0] for i,  token in enumerate(tokens)
+        exception = [tokens[i + 1][0] for i, token in enumerate(tokens)
                      if token[1] == "raise"]
         if "@exception" not in docstringContext.ssource() and \
                 "@throws" not in docstringContext.ssource() and \

--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sat Apr 26 10:36:09 2014 +0200
@@ -50,18 +50,18 @@
         """
         VersionControl.__init__(self, parent, name)
         self.defaultOptions = {
-            'global':   [''],
-            'commit':   [''],
+            'global': [''],
+            'commit': [''],
             'checkout': [''],
-            'update':   [''],
-            'add':      [''],
-            'remove':   [''],
-            'diff':     [''],
-            'log':      [''],
-            'history':  [''],
-            'status':   [''],
-            'tag':      [''],
-            'export':   ['']
+            'update': [''],
+            'add': [''],
+            'remove': [''],
+            'diff': [''],
+            'log': [''],
+            'history': [''],
+            'status': [''],
+            'tag': [''],
+            'export': ['']
         }
         self.interestingDataKeys = [
             "standardLayout",

--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py	Sat Apr 26 10:36:09 2014 +0200
@@ -172,42 +172,42 @@
         """
         self.__characterCategories = (
             # display name                              code
-            (self.tr("Letter, Any"),                "L"),
-            (self.tr("Letter, Uppercase"),          "Lu"),
-            (self.tr("Letter, Lowercase"),          "Ll"),
-            (self.tr("Letter, Titlecase"),          "Lt"),
-            (self.tr("Letter, Modifier"),           "Lm"),
-            (self.tr("Letter, Other"),              "Lo"),
-            (self.tr("Mark, Any"),                  "M"),
-            (self.tr("Mark, Nonspacing"),           "Mn"),
-            (self.tr("Mark, Spacing Combining"),    "Mc"),
-            (self.tr("Mark, Enclosing"),            "Me"),
-            (self.tr("Number, Any"),                "N"),
-            (self.tr("Number, Decimal Digit"),      "Nd"),
-            (self.tr("Number, Letter"),             "Nl"),
-            (self.tr("Number, Other"),              "No"),
-            (self.tr("Punctuation, Any"),           "P"),
-            (self.tr("Punctuation, Connector"),     "Pc"),
-            (self.tr("Punctuation, Dash"),          "Pd"),
-            (self.tr("Punctuation, Open"),          "Ps"),
-            (self.tr("Punctuation, Close"),         "Pe"),
+            (self.tr("Letter, Any"), "L"),
+            (self.tr("Letter, Uppercase"), "Lu"),
+            (self.tr("Letter, Lowercase"), "Ll"),
+            (self.tr("Letter, Titlecase"), "Lt"),
+            (self.tr("Letter, Modifier"), "Lm"),
+            (self.tr("Letter, Other"), "Lo"),
+            (self.tr("Mark, Any"), "M"),
+            (self.tr("Mark, Nonspacing"), "Mn"),
+            (self.tr("Mark, Spacing Combining"), "Mc"),
+            (self.tr("Mark, Enclosing"), "Me"),
+            (self.tr("Number, Any"), "N"),
+            (self.tr("Number, Decimal Digit"), "Nd"),
+            (self.tr("Number, Letter"), "Nl"),
+            (self.tr("Number, Other"), "No"),
+            (self.tr("Punctuation, Any"), "P"),
+            (self.tr("Punctuation, Connector"), "Pc"),
+            (self.tr("Punctuation, Dash"), "Pd"),
+            (self.tr("Punctuation, Open"), "Ps"),
+            (self.tr("Punctuation, Close"), "Pe"),
             (self.tr("Punctuation, Initial Quote"), "Pi"),
-            (self.tr("Punctuation, Final Quote"),   "Pf"),
-            (self.tr("Punctuation, Other"),         "Po"),
-            (self.tr("Symbol, Any"),                "S"),
-            (self.tr("Symbol, Math"),               "Sm"),
-            (self.tr("Symbol, Currency"),           "Sc"),
-            (self.tr("Symbol, Modifier"),           "Sk"),
-            (self.tr("Symbol, Other"),              "So"),
-            (self.tr("Separator, Any"),             "Z"),
-            (self.tr("Separator, Space"),           "Zs"),
-            (self.tr("Separator, Line"),            "Zl"),
-            (self.tr("Separator, Paragraph"),       "Zp"),
-            (self.tr("Other, Any"),                 "C"),
-            (self.tr("Other, Control"),             "Cc"),
-            (self.tr("Other, Format"),              "Cf"),
-            (self.tr("Other, Private Use"),         "Co"),
-            (self.tr("Other, Not Assigned"),        "Cn"),
+            (self.tr("Punctuation, Final Quote"), "Pf"),
+            (self.tr("Punctuation, Other"), "Po"),
+            (self.tr("Symbol, Any"), "S"),
+            (self.tr("Symbol, Math"), "Sm"),
+            (self.tr("Symbol, Currency"), "Sc"),
+            (self.tr("Symbol, Modifier"), "Sk"),
+            (self.tr("Symbol, Other"), "So"),
+            (self.tr("Separator, Any"), "Z"),
+            (self.tr("Separator, Space"), "Zs"),
+            (self.tr("Separator, Line"), "Zl"),
+            (self.tr("Separator, Paragraph"), "Zp"),
+            (self.tr("Other, Any"), "C"),
+            (self.tr("Other, Control"), "Cc"),
+            (self.tr("Other, Format"), "Cf"),
+            (self.tr("Other, Private Use"), "Co"),
+            (self.tr("Other, Not Assigned"), "Cn"),
         )
         
         self.__characterBlocks = (

--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py	Sat Apr 26 10:36:09 2014 +0200
@@ -140,177 +140,177 @@
         """
         self.__characterCategories = (
             # display name                                  code
-            (self.tr("Letter, Any"),                    "L"),
-            (self.tr("Letter, Lower case"),             "Ll"),
-            (self.tr("Letter, Modifier"),               "Lm"),
-            (self.tr("Letter, Other"),                  "Lo"),
-            (self.tr("Letter, Title case"),             "Lt"),
-            (self.tr("Letter, Upper case"),             "Lu"),
-            (self.tr("Letter, Lower, Upper or Title"),  "L&"),
-            (self.tr("Mark, Any"),                      "M"),
-            (self.tr("Mark, Spacing"),                  "Mc"),
-            (self.tr("Mark, Enclosing"),                "Me"),
-            (self.tr("Mark, Non-spacing"),              "Mn"),
-            (self.tr("Number, Any"),                    "N"),
-            (self.tr("Number, Decimal"),                "Nd"),
-            (self.tr("Number, Letter"),                 "Nl"),
-            (self.tr("Number, Other"),                  "No"),
-            (self.tr("Punctuation, Any"),               "P"),
-            (self.tr("Punctuation, Connector"),         "Pc"),
-            (self.tr("Punctuation, Dash"),              "Pd"),
-            (self.tr("Punctuation, Close"),             "Pe"),
-            (self.tr("Punctuation, Final"),             "Pf"),
-            (self.tr("Punctuation, Initial"),           "Pi"),
-            (self.tr("Punctuation, Other"),             "Po"),
-            (self.tr("Punctuation, Open"),              "Ps"),
-            (self.tr("Symbol, Any"),                    "S"),
-            (self.tr("Symbol, Currency"),               "Sc"),
-            (self.tr("Symbol, Modifier"),               "Sk"),
-            (self.tr("Symbol, Mathematical"),           "Sm"),
-            (self.tr("Symbol, Other"),                  "So"),
-            (self.tr("Separator, Any"),                 "Z"),
-            (self.tr("Separator, Line"),                "Zl"),
-            (self.tr("Separator, Paragraph"),           "Zp"),
-            (self.tr("Separator, Space"),               "Zs"),
-            (self.tr("Other, Any"),                     "C"),
-            (self.tr("Other, Control"),                 "Cc"),
-            (self.tr("Other, Format"),                  "Cf"),
-            (self.tr("Other, Unassigned"),              "Cn"),
-            (self.tr("Other, Private Use"),             "Co"),
-            (self.tr("Other, Surrogat"),                "Cn"),
+            (self.tr("Letter, Any"), "L"),
+            (self.tr("Letter, Lower case"), "Ll"),
+            (self.tr("Letter, Modifier"), "Lm"),
+            (self.tr("Letter, Other"), "Lo"),
+            (self.tr("Letter, Title case"), "Lt"),
+            (self.tr("Letter, Upper case"), "Lu"),
+            (self.tr("Letter, Lower, Upper or Title"), "L&"),
+            (self.tr("Mark, Any"), "M"),
+            (self.tr("Mark, Spacing"), "Mc"),
+            (self.tr("Mark, Enclosing"), "Me"),
+            (self.tr("Mark, Non-spacing"), "Mn"),
+            (self.tr("Number, Any"), "N"),
+            (self.tr("Number, Decimal"), "Nd"),
+            (self.tr("Number, Letter"), "Nl"),
+            (self.tr("Number, Other"), "No"),
+            (self.tr("Punctuation, Any"), "P"),
+            (self.tr("Punctuation, Connector"), "Pc"),
+            (self.tr("Punctuation, Dash"), "Pd"),
+            (self.tr("Punctuation, Close"), "Pe"),
+            (self.tr("Punctuation, Final"), "Pf"),
+            (self.tr("Punctuation, Initial"), "Pi"),
+            (self.tr("Punctuation, Other"), "Po"),
+            (self.tr("Punctuation, Open"), "Ps"),
+            (self.tr("Symbol, Any"), "S"),
+            (self.tr("Symbol, Currency"), "Sc"),
+            (self.tr("Symbol, Modifier"), "Sk"),
+            (self.tr("Symbol, Mathematical"), "Sm"),
+            (self.tr("Symbol, Other"), "So"),
+            (self.tr("Separator, Any"), "Z"),
+            (self.tr("Separator, Line"), "Zl"),
+            (self.tr("Separator, Paragraph"), "Zp"),
+            (self.tr("Separator, Space"), "Zs"),
+            (self.tr("Other, Any"), "C"),
+            (self.tr("Other, Control"), "Cc"),
+            (self.tr("Other, Format"), "Cf"),
+            (self.tr("Other, Unassigned"), "Cn"),
+            (self.tr("Other, Private Use"), "Co"),
+            (self.tr("Other, Surrogat"), "Cn"),
         )
         
         self.__specialCharacterCategories = (
             # display name                           code
-            (self.tr("Alphanumeric"),            "Xan"),
-            (self.tr("POSIX Space"),             "Xps"),
-            (self.tr("Perl Space"),              "Xsp"),
-            (self.tr("Universal Character"),     "Xuc"),
-            (self.tr("Perl Word"),               "Xan"),
+            (self.tr("Alphanumeric"), "Xan"),
+            (self.tr("POSIX Space"), "Xps"),
+            (self.tr("Perl Space"), "Xsp"),
+            (self.tr("Universal Character"), "Xuc"),
+            (self.tr("Perl Word"), "Xan"),
         )
         
         self.__characterBlocks = (
             # display name                           code
-            (self.tr("Arabic"),                  "Arabic"),
-            (self.tr("Armenian"),                "Armenian"),
-            (self.tr("Avestan"),                 "Avestan"),
-            (self.tr("Balinese"),                "Balinese"),
-            (self.tr("Bamum"),                   "Bamum"),
-            (self.tr("Batak"),                   "Batak"),
-            (self.tr("Bengali"),                 "Bengali"),
-            (self.tr("Bopomofo"),                "Bopomofo"),
-            (self.tr("Brahmi"),                  "Brahmi"),
-            (self.tr("Braille"),                 "Braille"),
-            (self.tr("Buginese"),                "Buginese"),
-            (self.tr("Buhid"),                   "Buhid"),
-            (self.tr("Canadian Aboriginal"),     "Canadian_Aboriginal"),
-            (self.tr("Carian"),                  "Carian"),
-            (self.tr("Chakma"),                  "Chakma"),
-            (self.tr("Cham"),                    "Cham"),
-            (self.tr("Cherokee"),                "Cherokee"),
-            (self.tr("Common"),                  "Common"),
-            (self.tr("Coptic"),                  "Coptic"),
-            (self.tr("Cuneiform"),               "Cuneiform"),
-            (self.tr("Cypriot"),                 "Cypriot"),
-            (self.tr("Cyrillic"),                "Cyrillic"),
-            (self.tr("Deseret"),                 "Deseret,"),
-            (self.tr("Devanagari"),              "Devanagari"),
-            (self.tr("Egyptian Hieroglyphs"),    "Egyptian_Hieroglyphs"),
-            (self.tr("Ethiopic"),                "Ethiopic"),
-            (self.tr("Georgian"),                "Georgian"),
-            (self.tr("Glagolitic"),              "Glagolitic"),
-            (self.tr("Gothic"),                  "Gothic"),
-            (self.tr("Greek"),                   "Greek"),
-            (self.tr("Gujarati"),                "Gujarati"),
-            (self.tr("Gurmukhi"),                "Gurmukhi"),
-            (self.tr("Han"),                     "Han"),
-            (self.tr("Hangul"),                  "Hangul"),
-            (self.tr("Hanunoo"),                 "Hanunoo"),
-            (self.tr("Hebrew"),                  "Hebrew"),
-            (self.tr("Hiragana"),                "Hiragana"),
-            (self.tr("Imperial Aramaic"),        "Imperial_Aramaic"),
-            (self.tr("Inherited"),               "Inherited"),
-            (self.tr("Inscriptional Pahlavi"),   "Inscriptional_Pahlavi"),
-            (self.tr("Inscriptional Parthian"),  "Inscriptional_Parthian"),
-            (self.tr("Javanese"),                "Javanese"),
-            (self.tr("Kaithi"),                  "Kaithi"),
-            (self.tr("Kannada"),                 "Kannada"),
-            (self.tr("Katakana"),                "Katakana"),
-            (self.tr("Kayah Li"),                "Kayah_Li"),
-            (self.tr("Kharoshthi"),              "Kharoshthi"),
-            (self.tr("Khmer"),                   "Khmer"),
-            (self.tr("Lao"),                     "Lao"),
-            (self.tr("Latin"),                   "Latin"),
-            (self.tr("Lepcha"),                  "Lepcha"),
-            (self.tr("Limbu"),                   "Limbu"),
-            (self.tr("Linear B"),                "Linear_B"),
-            (self.tr("Lisu"),                    "Lisu"),
-            (self.tr("Lycian"),                  "Lycian"),
-            (self.tr("Lydian"),                  "Lydian"),
-            (self.tr("Malayalam"),               "Malayalam"),
-            (self.tr("Mandaic"),                 "Mandaic"),
-            (self.tr("Meetei Mayek"),            "Meetei_Mayek"),
-            (self.tr("Meroitic Cursive"),        "Meroitic_Cursive"),
-            (self.tr("Meroitic Hieroglyphs"),    "Meroitic_Hieroglyphs"),
-            (self.tr("Miao"),                    "Miao"),
-            (self.tr("Mongolian"),               "Mongolian"),
-            (self.tr("Myanmar"),                 "Myanmar"),
-            (self.tr("New Tai Lue"),             "New_Tai_Lue"),
-            (self.tr("N'Ko"),                    "Nko"),
-            (self.tr("Ogham"),                   "Ogham"),
-            (self.tr("Old Italic"),              "Old_Italic"),
-            (self.tr("Old Persian"),             "Old_Persian"),
-            (self.tr("Old South Arabian"),       "Old_South_Arabian"),
-            (self.tr("Old Turkic"),              "Old_Turkic,"),
-            (self.tr("Ol Chiki"),                "Ol_Chiki"),
-            (self.tr("Oriya"),                   "Oriya"),
-            (self.tr("Osmanya"),                 "Osmanya"),
-            (self.tr("Phags-pa"),                "Phags_Pa"),
-            (self.tr("Phoenician"),              "Phoenician"),
-            (self.tr("Rejang"),                  "Rejang"),
-            (self.tr("Runic"),                   "Runic"),
-            (self.tr("Samaritan"),               "Samaritan"),
-            (self.tr("Saurashtra"),              "Saurashtra"),
-            (self.tr("Sharada"),                 "Sharada"),
-            (self.tr("Shavian"),                 "Shavian"),
-            (self.tr("Sinhala"),                 "Sinhala"),
-            (self.tr("Sora Sompeng"),            "Sora_Sompeng"),
-            (self.tr("Sundanese"),               "Sundanese"),
-            (self.tr("Syloti Nagri"),            "Syloti_Nagri"),
-            (self.tr("Syriac"),                  "Syriac"),
-            (self.tr("Tagalog"),                 "Tagalog"),
-            (self.tr("Tagbanwa"),                "Tagbanwa"),
-            (self.tr("Tai Le"),                  "Tai_Le"),
-            (self.tr("Tai Tham"),                "Tai_Tham"),
-            (self.tr("Tai Viet"),                "Tai_Viet"),
-            (self.tr("Takri"),                   "Takri"),
-            (self.tr("Tamil"),                   "Tamil"),
-            (self.tr("Telugu"),                  "Telugu"),
-            (self.tr("Thaana"),                  "Thaana"),
-            (self.tr("Thai"),                    "Thai"),
-            (self.tr("Tibetan"),                 "Tibetan"),
-            (self.tr("Tifinagh"),                "Tifinagh"),
-            (self.tr("Ugaritic"),                "Ugaritic"),
-            (self.tr("Vai"),                     "Vai"),
-            (self.tr("Yi"),                      "Yi"),
+            (self.tr("Arabic"), "Arabic"),
+            (self.tr("Armenian"), "Armenian"),
+            (self.tr("Avestan"), "Avestan"),
+            (self.tr("Balinese"), "Balinese"),
+            (self.tr("Bamum"), "Bamum"),
+            (self.tr("Batak"), "Batak"),
+            (self.tr("Bengali"), "Bengali"),
+            (self.tr("Bopomofo"), "Bopomofo"),
+            (self.tr("Brahmi"), "Brahmi"),
+            (self.tr("Braille"), "Braille"),
+            (self.tr("Buginese"), "Buginese"),
+            (self.tr("Buhid"), "Buhid"),
+            (self.tr("Canadian Aboriginal"), "Canadian_Aboriginal"),
+            (self.tr("Carian"), "Carian"),
+            (self.tr("Chakma"), "Chakma"),
+            (self.tr("Cham"), "Cham"),
+            (self.tr("Cherokee"), "Cherokee"),
+            (self.tr("Common"), "Common"),
+            (self.tr("Coptic"), "Coptic"),
+            (self.tr("Cuneiform"), "Cuneiform"),
+            (self.tr("Cypriot"), "Cypriot"),
+            (self.tr("Cyrillic"), "Cyrillic"),
+            (self.tr("Deseret"), "Deseret,"),
+            (self.tr("Devanagari"), "Devanagari"),
+            (self.tr("Egyptian Hieroglyphs"), "Egyptian_Hieroglyphs"),
+            (self.tr("Ethiopic"), "Ethiopic"),
+            (self.tr("Georgian"), "Georgian"),
+            (self.tr("Glagolitic"), "Glagolitic"),
+            (self.tr("Gothic"), "Gothic"),
+            (self.tr("Greek"), "Greek"),
+            (self.tr("Gujarati"), "Gujarati"),
+            (self.tr("Gurmukhi"), "Gurmukhi"),
+            (self.tr("Han"), "Han"),
+            (self.tr("Hangul"), "Hangul"),
+            (self.tr("Hanunoo"), "Hanunoo"),
+            (self.tr("Hebrew"), "Hebrew"),
+            (self.tr("Hiragana"), "Hiragana"),
+            (self.tr("Imperial Aramaic"), "Imperial_Aramaic"),
+            (self.tr("Inherited"), "Inherited"),
+            (self.tr("Inscriptional Pahlavi"), "Inscriptional_Pahlavi"),
+            (self.tr("Inscriptional Parthian"), "Inscriptional_Parthian"),
+            (self.tr("Javanese"), "Javanese"),
+            (self.tr("Kaithi"), "Kaithi"),
+            (self.tr("Kannada"), "Kannada"),
+            (self.tr("Katakana"), "Katakana"),
+            (self.tr("Kayah Li"), "Kayah_Li"),
+            (self.tr("Kharoshthi"), "Kharoshthi"),
+            (self.tr("Khmer"), "Khmer"),
+            (self.tr("Lao"), "Lao"),
+            (self.tr("Latin"), "Latin"),
+            (self.tr("Lepcha"), "Lepcha"),
+            (self.tr("Limbu"), "Limbu"),
+            (self.tr("Linear B"), "Linear_B"),
+            (self.tr("Lisu"), "Lisu"),
+            (self.tr("Lycian"), "Lycian"),
+            (self.tr("Lydian"), "Lydian"),
+            (self.tr("Malayalam"), "Malayalam"),
+            (self.tr("Mandaic"), "Mandaic"),
+            (self.tr("Meetei Mayek"), "Meetei_Mayek"),
+            (self.tr("Meroitic Cursive"), "Meroitic_Cursive"),
+            (self.tr("Meroitic Hieroglyphs"), "Meroitic_Hieroglyphs"),
+            (self.tr("Miao"), "Miao"),
+            (self.tr("Mongolian"), "Mongolian"),
+            (self.tr("Myanmar"), "Myanmar"),
+            (self.tr("New Tai Lue"), "New_Tai_Lue"),
+            (self.tr("N'Ko"), "Nko"),
+            (self.tr("Ogham"), "Ogham"),
+            (self.tr("Old Italic"), "Old_Italic"),
+            (self.tr("Old Persian"), "Old_Persian"),
+            (self.tr("Old South Arabian"), "Old_South_Arabian"),
+            (self.tr("Old Turkic"), "Old_Turkic,"),
+            (self.tr("Ol Chiki"), "Ol_Chiki"),
+            (self.tr("Oriya"), "Oriya"),
+            (self.tr("Osmanya"), "Osmanya"),
+            (self.tr("Phags-pa"), "Phags_Pa"),
+            (self.tr("Phoenician"), "Phoenician"),
+            (self.tr("Rejang"), "Rejang"),
+            (self.tr("Runic"), "Runic"),
+            (self.tr("Samaritan"), "Samaritan"),
+            (self.tr("Saurashtra"), "Saurashtra"),
+            (self.tr("Sharada"), "Sharada"),
+            (self.tr("Shavian"), "Shavian"),
+            (self.tr("Sinhala"), "Sinhala"),
+            (self.tr("Sora Sompeng"), "Sora_Sompeng"),
+            (self.tr("Sundanese"), "Sundanese"),
+            (self.tr("Syloti Nagri"), "Syloti_Nagri"),
+            (self.tr("Syriac"), "Syriac"),
+            (self.tr("Tagalog"), "Tagalog"),
+            (self.tr("Tagbanwa"), "Tagbanwa"),
+            (self.tr("Tai Le"), "Tai_Le"),
+            (self.tr("Tai Tham"), "Tai_Tham"),
+            (self.tr("Tai Viet"), "Tai_Viet"),
+            (self.tr("Takri"), "Takri"),
+            (self.tr("Tamil"), "Tamil"),
+            (self.tr("Telugu"), "Telugu"),
+            (self.tr("Thaana"), "Thaana"),
+            (self.tr("Thai"), "Thai"),
+            (self.tr("Tibetan"), "Tibetan"),
+            (self.tr("Tifinagh"), "Tifinagh"),
+            (self.tr("Ugaritic"), "Ugaritic"),
+            (self.tr("Vai"), "Vai"),
+            (self.tr("Yi"), "Yi"),
         )
         
         self.__posixNamedSets = (
             # display name                                  code
-            (self.tr("Alphanumeric"),                   "alnum"),
-            (self.tr("Alphabetic"),                     "alpha"),
-            (self.tr("ASCII"),                          "ascii"),
-            (self.tr("Word Letter"),                    "word"),
-            (self.tr("Lower Case Letter"),              "lower"),
-            (self.tr("Upper Case Letter"),              "upper"),
-            (self.tr("Decimal Digit"),                  "digit"),
-            (self.tr("Hexadecimal Digit"),              "xdigit"),
-            (self.tr("Space or Tab"),                   "blank"),
-            (self.tr("White Space"),                    "space"),
-            (self.tr("Printing (excl. space)"),         "graph"),
-            (self.tr("Printing (incl. space)"),         "print"),
-            (self.tr("Printing (excl. alphanumeric)"),  "punct"),
-            (self.tr("Control Character"),              "cntrl"),
+            (self.tr("Alphanumeric"), "alnum"),
+            (self.tr("Alphabetic"), "alpha"),
+            (self.tr("ASCII"), "ascii"),
+            (self.tr("Word Letter"), "word"),
+            (self.tr("Lower Case Letter"), "lower"),
+            (self.tr("Upper Case Letter"), "upper"),
+            (self.tr("Decimal Digit"), "digit"),
+            (self.tr("Hexadecimal Digit"), "xdigit"),
+            (self.tr("Space or Tab"), "blank"),
+            (self.tr("White Space"), "space"),
+            (self.tr("Printing (excl. space)"), "graph"),
+            (self.tr("Printing (incl. space)"), "print"),
+            (self.tr("Printing (excl. alphanumeric)"), "punct"),
+            (self.tr("Control Character"), "cntrl"),
         )
     
     def __populateCharTypeCombo(self, combo, isSingle):

--- a/Preferences/ConfigurationPages/EmailPage.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Preferences/ConfigurationPages/EmailPage.py	Sat Apr 26 10:36:09 2014 +0200
@@ -12,7 +12,7 @@
 import smtplib
 import socket
 
-from PyQt4.QtCore import pyqtSlot,  Qt
+from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QApplication, QCursor
 
 from E5Gui import E5MessageBox
@@ -139,7 +139,7 @@
                     self.tr("""The login test succeeded."""))
             except (smtplib.SMTPException, socket.error) as e:
                 QApplication.restoreOverrideCursor()
-                if isinstance(e,  smtplib.SMTPResponseException):
+                if isinstance(e, smtplib.SMTPResponseException):
                     errorStr = e.smtp_error.decode()
                 elif isinstance(e, socket.timeout):
                     errorStr = str(e)
@@ -159,7 +159,7 @@
             server.quit()
         except (smtplib.SMTPException, socket.error) as e:
             QApplication.restoreOverrideCursor()
-            if isinstance(e,  smtplib.SMTPResponseException):
+            if isinstance(e, smtplib.SMTPResponseException):
                 errorStr = e.smtp_error.decode()
             elif isinstance(e, socket.timeout):
                 errorStr = str(e)

--- a/Preferences/ShortcutDialog.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Preferences/ShortcutDialog.py	Sat Apr 26 10:36:09 2014 +0200
@@ -62,7 +62,7 @@
         msh = self.minimumSizeHint()
         self.resize(max(self.width(), msh.width()), msh.height())
 
-    def setKeys(self, key, alternateKey,  noCheck, objectType):
+    def setKeys(self, key, alternateKey, noCheck, objectType):
         """
         Public method to set the key to be configured.
         

--- a/Preferences/__init__.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Preferences/__init__.py	Sat Apr 26 10:36:09 2014 +0200
@@ -137,7 +137,7 @@
                 QByteArray(),
                 # visibility of the toolboxes/sidebars (1)
                 # left, bottom, right
-                [True,  True, True],
+                [True, True, True],
                 # saved states of the splitters and sidebars of the
                 # sidebars layout (2)
                 # left splitter, vertical splitter, left sidebar,
@@ -150,7 +150,7 @@
                 QByteArray(),
                 # visibility of the toolboxes/sidebars (1)
                 # left, bottom, right
-                [False,  True, True],
+                [False, True, True],
                 # saved states of the splitters and sidebars of the
                 # sidebars layout (2)
                 # left splitter, vertical splitter, left sidebar,

--- a/QScintilla/Exporters/ExporterPDF.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/QScintilla/Exporters/ExporterPDF.py	Sat Apr 26 10:36:09 2014 +0200
@@ -36,7 +36,7 @@
 ]
 PDFfontAscenders = [629, 718, 699]
 PDFfontDescenders = [157, 207, 217]
-PDFfontWidths = [600,   0,   0]
+PDFfontWidths = [600, 0, 0]
 
 PDFpageSizes = {
     # name   : (height, width)

--- a/QScintilla/Lexers/LexerCPP.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/QScintilla/Lexers/LexerCPP.py	Sat Apr 26 10:36:09 2014 +0200
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 
-from PyQt4.Qsci import QsciLexerCPP,  QsciScintilla
+from PyQt4.Qsci import QsciLexerCPP, QsciScintilla
 
 from .Lexer import Lexer
 import Preferences

--- a/QScintilla/Lexers/LexerCSharp.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/QScintilla/Lexers/LexerCSharp.py	Sat Apr 26 10:36:09 2014 +0200
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 
-from PyQt4.Qsci import QsciLexerCSharp,  QsciScintilla
+from PyQt4.Qsci import QsciLexerCSharp, QsciScintilla
 
 from .Lexer import Lexer
 import Preferences

--- a/QScintilla/Lexers/LexerIDL.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/QScintilla/Lexers/LexerIDL.py	Sat Apr 26 10:36:09 2014 +0200
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 
-from PyQt4.Qsci import QsciLexerIDL,  QsciScintilla
+from PyQt4.Qsci import QsciLexerIDL, QsciScintilla
 
 from .Lexer import Lexer
 import Preferences

--- a/QScintilla/Lexers/LexerJava.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/QScintilla/Lexers/LexerJava.py	Sat Apr 26 10:36:09 2014 +0200
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 
-from PyQt4.Qsci import QsciLexerJava,  QsciScintilla
+from PyQt4.Qsci import QsciLexerJava, QsciScintilla
 
 from .Lexer import Lexer
 import Preferences

--- a/QScintilla/Lexers/LexerJavaScript.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/QScintilla/Lexers/LexerJavaScript.py	Sat Apr 26 10:36:09 2014 +0200
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 
-from PyQt4.Qsci import QsciLexerJavaScript,  QsciScintilla
+from PyQt4.Qsci import QsciLexerJavaScript, QsciScintilla
 
 from .Lexer import Lexer
 import Preferences

--- a/QScintilla/Lexers/LexerPygments.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/QScintilla/Lexers/LexerPygments.py	Sat Apr 26 10:36:09 2014 +0200
@@ -69,70 +69,70 @@
 #-----------------------------------------------------------------------------#
 
 TOKEN_MAP = {
-    Token.Comment:                  PYGMENTS_COMMENT,
-    Token.Comment.Preproc:          PYGMENTS_PREPROCESSOR,
-    Token.Comment.Multiline:        PYGMENTS_MULTILINECOMMENT,
-    Token.Comment.Single:           PYGMENTS_COMMENT,
-    Token.Comment.Special:          PYGMENTS_COMMENT,
+    Token.Comment: PYGMENTS_COMMENT,
+    Token.Comment.Preproc: PYGMENTS_PREPROCESSOR,
+    Token.Comment.Multiline: PYGMENTS_MULTILINECOMMENT,
+    Token.Comment.Single: PYGMENTS_COMMENT,
+    Token.Comment.Special: PYGMENTS_COMMENT,
 
-    Token.Keyword:                  PYGMENTS_KEYWORD,
-    Token.Keyword.Pseudo:           PYGMENTS_PSEUDOKEYWORD,
-    Token.Keyword.Type:             PYGMENTS_TYPEKEYWORD,
-    Token.Keyword.Namespace:        PYGMENTS_KEYWORD,
+    Token.Keyword: PYGMENTS_KEYWORD,
+    Token.Keyword.Pseudo: PYGMENTS_PSEUDOKEYWORD,
+    Token.Keyword.Type: PYGMENTS_TYPEKEYWORD,
+    Token.Keyword.Namespace: PYGMENTS_KEYWORD,
 
-    Token.Operator:                 PYGMENTS_OPERATOR,
-    Token.Operator.Word:            PYGMENTS_WORD,
+    Token.Operator: PYGMENTS_OPERATOR,
+    Token.Operator.Word: PYGMENTS_WORD,
 
-    Token.Name:                     PYGMENTS_DEFAULT,
-    Token.Name.Builtin:             PYGMENTS_BUILTIN,
-    Token.Name.Builtin.Pseudo:      PYGMENTS_BUILTIN,
-    Token.Name.Function:            PYGMENTS_FUNCTION,
-    Token.Name.Class:               PYGMENTS_CLASS,
-    Token.Name.Namespace:           PYGMENTS_NAMESPACE,
-    Token.Name.Exception:           PYGMENTS_EXCEPTION,
-    Token.Name.Variable:            PYGMENTS_VARIABLE,
-    Token.Name.Variable.Class:      PYGMENTS_VARIABLE,
-    Token.Name.Variable.Global:     PYGMENTS_VARIABLE,
-    Token.Name.Variable.Instance:   PYGMENTS_VARIABLE,
-    Token.Name.Constant:            PYGMENTS_CONSTANT,
-    Token.Name.Label:               PYGMENTS_LABEL,
-    Token.Name.Entity:              PYGMENTS_ENTITY,
-    Token.Name.Attribute:           PYGMENTS_ATTRIBUTE,
-    Token.Name.Tag:                 PYGMENTS_TAG,
-    Token.Name.Decorator:           PYGMENTS_DECORATOR,
-    Token.Name.Property:            PYGMENTS_PROPERTY,
+    Token.Name: PYGMENTS_DEFAULT,
+    Token.Name.Builtin: PYGMENTS_BUILTIN,
+    Token.Name.Builtin.Pseudo: PYGMENTS_BUILTIN,
+    Token.Name.Function: PYGMENTS_FUNCTION,
+    Token.Name.Class: PYGMENTS_CLASS,
+    Token.Name.Namespace: PYGMENTS_NAMESPACE,
+    Token.Name.Exception: PYGMENTS_EXCEPTION,
+    Token.Name.Variable: PYGMENTS_VARIABLE,
+    Token.Name.Variable.Class: PYGMENTS_VARIABLE,
+    Token.Name.Variable.Global: PYGMENTS_VARIABLE,
+    Token.Name.Variable.Instance: PYGMENTS_VARIABLE,
+    Token.Name.Constant: PYGMENTS_CONSTANT,
+    Token.Name.Label: PYGMENTS_LABEL,
+    Token.Name.Entity: PYGMENTS_ENTITY,
+    Token.Name.Attribute: PYGMENTS_ATTRIBUTE,
+    Token.Name.Tag: PYGMENTS_TAG,
+    Token.Name.Decorator: PYGMENTS_DECORATOR,
+    Token.Name.Property: PYGMENTS_PROPERTY,
 
-    Token.String:                   PYGMENTS_STRING,
-    Token.String.Char:              PYGMENTS_CHAR,
-    Token.String.Doc:               PYGMENTS_DOCSTRING,
-    Token.String.Interpol:          PYGMENTS_SCALAR,
-    Token.String.Escape:            PYGMENTS_ESCAPE,
-    Token.String.Regex:             PYGMENTS_REGEX,
-    Token.String.Symbol:            PYGMENTS_SYMBOL,
-    Token.String.Other:             PYGMENTS_OTHER,
-    Token.String.Heredoc:           PYGMENTS_HEREDOC,
+    Token.String: PYGMENTS_STRING,
+    Token.String.Char: PYGMENTS_CHAR,
+    Token.String.Doc: PYGMENTS_DOCSTRING,
+    Token.String.Interpol: PYGMENTS_SCALAR,
+    Token.String.Escape: PYGMENTS_ESCAPE,
+    Token.String.Regex: PYGMENTS_REGEX,
+    Token.String.Symbol: PYGMENTS_SYMBOL,
+    Token.String.Other: PYGMENTS_OTHER,
+    Token.String.Heredoc: PYGMENTS_HEREDOC,
     
-    Token.Number:                   PYGMENTS_NUMBER,
-    Token.Number.Float:             PYGMENTS_NUMBER,
-    Token.Number.Hex:               PYGMENTS_NUMBER,
-    Token.Number.Integer:           PYGMENTS_NUMBER,
-    Token.Number.Integer.Long:      PYGMENTS_NUMBER,
-    Token.Number.Oct:               PYGMENTS_NUMBER,
+    Token.Number: PYGMENTS_NUMBER,
+    Token.Number.Float: PYGMENTS_NUMBER,
+    Token.Number.Hex: PYGMENTS_NUMBER,
+    Token.Number.Integer: PYGMENTS_NUMBER,
+    Token.Number.Integer.Long: PYGMENTS_NUMBER,
+    Token.Number.Oct: PYGMENTS_NUMBER,
 
-    Token.Punctuation:              PYGMENTS_PUNCTUATION,
+    Token.Punctuation: PYGMENTS_PUNCTUATION,
 
-    Token.Generic.Heading:          PYGMENTS_HEADING,
-    Token.Generic.Subheading:       PYGMENTS_SUBHEADING,
-    Token.Generic.Deleted:          PYGMENTS_DELETED,
-    Token.Generic.Inserted:         PYGMENTS_INSERTED,
-    Token.Generic.Error:            PYGMENTS_GENERIC_ERROR,
-    Token.Generic.Emph:             PYGMENTS_EMPHASIZE,
-    Token.Generic.Strong:           PYGMENTS_STRONG,
-    Token.Generic.Prompt:           PYGMENTS_PROMPT,
-    Token.Generic.Output:           PYGMENTS_OUTPUT,
-    Token.Generic.Traceback:        PYGMENTS_TRACEBACK,
+    Token.Generic.Heading: PYGMENTS_HEADING,
+    Token.Generic.Subheading: PYGMENTS_SUBHEADING,
+    Token.Generic.Deleted: PYGMENTS_DELETED,
+    Token.Generic.Inserted: PYGMENTS_INSERTED,
+    Token.Generic.Error: PYGMENTS_GENERIC_ERROR,
+    Token.Generic.Emph: PYGMENTS_EMPHASIZE,
+    Token.Generic.Strong: PYGMENTS_STRONG,
+    Token.Generic.Prompt: PYGMENTS_PROMPT,
+    Token.Generic.Output: PYGMENTS_OUTPUT,
+    Token.Generic.Traceback: PYGMENTS_TRACEBACK,
 
-    Token.Error:                    PYGMENTS_ERROR,
+    Token.Error: PYGMENTS_ERROR,
 }
 
 #-----------------------------------------------------------------------------#

--- a/QScintilla/Lexers/LexerPython.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/QScintilla/Lexers/LexerPython.py	Sat Apr 26 10:36:09 2014 +0200
@@ -11,7 +11,7 @@
 
 import re
 
-from PyQt4.Qsci import QsciLexerPython,  QsciScintilla
+from PyQt4.Qsci import QsciLexerPython, QsciScintilla
 
 from .Lexer import Lexer
 import Preferences

--- a/QScintilla/SpellChecker.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/QScintilla/SpellChecker.py	Sat Apr 26 10:36:09 2014 +0200
@@ -285,7 +285,7 @@
         @param startPos position to start at (integer)
         @param endPos position to end at (integer)
         """
-        if not self.initCheck(startPos,  endPos):
+        if not self.initCheck(startPos, endPos):
             return
         
         while True:

--- a/Templates/TemplateViewer.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Templates/TemplateViewer.py	Sat Apr 26 10:36:09 2014 +0200
@@ -741,7 +741,7 @@
                 for aline in txt.splitlines():
                     count = aline.find("i_n_s_e_r_t_i_o_n")
                     if count >= 0:
-                        txt = txt.replace("i_n_s_e_r_t_i_o_n",  "")
+                        txt = txt.replace("i_n_s_e_r_t_i_o_n", "")
                         if lines == 1:
                             count += index
                         else:
@@ -758,7 +758,7 @@
                 for aline in txt.splitlines():
                     posa = aline.find("s_e_l_e_c_t_s_t_a_r_t")
                     if posa >= 0:
-                        txt = txt.replace("s_e_l_e_c_t_s_t_a_r_t",  "")
+                        txt = txt.replace("s_e_l_e_c_t_s_t_a_r_t", "")
                         break
                     else:
                         linea += 1
@@ -766,7 +766,7 @@
                 for aline in txt.splitlines():
                     posb = aline.find("s_e_l_e_c_t_e_n_d")
                     if posb >= 0:
-                        txt = txt.replace("s_e_l_e_c_t_e_n_d",  "")
+                        txt = txt.replace("s_e_l_e_c_t_e_n_d", "")
                         break
                     else:
                         lineb += 1

--- a/Toolbox/Startup.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Toolbox/Startup.py	Sat Apr 26 10:36:09 2014 +0200
@@ -33,7 +33,7 @@
     @param optlen length of the field for the commandline option (integer)
     """
     options = [
-        ("--version",  "show the program's version number and exit"),
+        ("--version", "show the program's version number and exit"),
         ("-h, --help", "show this help message and exit")
     ]
     options.extend(appinfo["options"])

--- a/UI/EmailDialog.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/UI/EmailDialog.py	Sat Apr 26 10:36:09 2014 +0200
@@ -299,7 +299,7 @@
                     server.login(Preferences.getUser("MailServerUser"),
                                  password)
                 except (smtplib.SMTPException, socket.error) as e:
-                    if isinstance(e,  smtplib.SMTPResponseException):
+                    if isinstance(e, smtplib.SMTPResponseException):
                         errorStr = e.smtp_error.decode()
                     elif isinstance(e, socket.error):
                         errorStr = e[1]
@@ -325,7 +325,7 @@
             QApplication.restoreOverrideCursor()
         except (smtplib.SMTPException, socket.error) as e:
             QApplication.restoreOverrideCursor()
-            if isinstance(e,  smtplib.SMTPResponseException):
+            if isinstance(e, smtplib.SMTPResponseException):
                 errorStr = e.smtp_error.decode()
             elif isinstance(e, socket.error):
                 errorStr = e[1]

--- a/UI/FindFileDialog.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/UI/FindFileDialog.py	Sat Apr 26 10:36:09 2014 +0200
@@ -153,7 +153,7 @@
             self.__lastFileItem.setData(0, self.md5Role, md5)
         
         itm = QTreeWidgetItem(self.__lastFileItem)
-        itm.setTextAlignment(0,  Qt.AlignRight)
+        itm.setTextAlignment(0, Qt.AlignRight)
         itm.setData(0, Qt.DisplayRole, line)
         itm.setData(1, Qt.DisplayRole, text)
         itm.setData(0, self.lineRole, line)

--- a/UI/Previewers/PreviewerHTML.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/UI/Previewers/PreviewerHTML.py	Sat Apr 26 10:36:09 2014 +0200
@@ -425,7 +425,7 @@
             extensions.append(_StrikeThroughExtension())
 
         try:
-            return markdown.markdown(text,  extensions + ['mathjax'])
+            return markdown.markdown(text, extensions + ['mathjax'])
         except (ImportError, ValueError):
             # markdown raises ValueError or ImportError, depends on version
             # It is not clear, how to distinguish missing mathjax from other

--- a/UI/SymbolsWidget.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/UI/SymbolsWidget.py	Sat Apr 26 10:36:09 2014 +0200
@@ -50,39 +50,39 @@
         
         self.__tables = [
             # first   last     display name
-            (0x0,    0x1f,   self.tr("Control Characters")),
-            (0x20,   0x7f,   self.tr("Basic Latin")),
-            (0x80,   0xff,   self.tr("Latin-1 Supplement")),
-            (0x100,  0x17f,  self.tr("Latin Extended-A")),
-            (0x180,  0x24f,  self.tr("Latin Extended-B")),
-            (0x250,  0x2af,  self.tr("IPA Extensions")),
-            (0x2b0,  0x2ff,  self.tr("Spacing Modifier Letters")),
-            (0x300,  0x36f,  self.tr("Combining Diacritical Marks")),
-            (0x370,  0x3ff,  self.tr("Greek and Coptic")),
-            (0x400,  0x4ff,  self.tr("Cyrillic")),
-            (0x500,  0x52f,  self.tr("Cyrillic Supplement")),
-            (0x530,  0x58f,  self.tr("Armenian")),
-            (0x590,  0x5ff,  self.tr("Hebrew")),
-            (0x600,  0x6ff,  self.tr("Arabic")),
-            (0x700,  0x74f,  self.tr("Syriac")),
-            (0x780,  0x7bf,  self.tr("Thaana")),
-            (0x7c0,  0x7ff,  self.tr("N'Ko")),
-            (0x800,  0x83f,  self.tr("Samaritan")),
-            (0x840,  0x85f,  self.tr("Mandaic")),
-            (0x8a0,  0x8ff,  self.tr("Arabic Extended-A")),
-            (0x900,  0x97f,  self.tr("Devanagari")),
-            (0x980,  0x9ff,  self.tr("Bengali")),
-            (0xa00,  0xa7f,  self.tr("Gurmukhi")),
-            (0xa80,  0xaff,  self.tr("Gujarati")),
-            (0xb00,  0xb7f,  self.tr("Oriya")),
-            (0xb80,  0xbff,  self.tr("Tamil")),
-            (0xc00,  0xc7f,  self.tr("Telugu")),
-            (0xc80,  0xcff,  self.tr("Kannada")),
-            (0xd00,  0xd7f,  self.tr("Malayalam")),
-            (0xd80,  0xdff,  self.tr("Sinhala")),
-            (0xe00,  0xe7f,  self.tr("Thai")),
-            (0xe80,  0xeff,  self.tr("Lao")),
-            (0xf00,  0xfff,  self.tr("Tibetan")),
+            (0x0, 0x1f, self.tr("Control Characters")),
+            (0x20, 0x7f, self.tr("Basic Latin")),
+            (0x80, 0xff, self.tr("Latin-1 Supplement")),
+            (0x100, 0x17f, self.tr("Latin Extended-A")),
+            (0x180, 0x24f, self.tr("Latin Extended-B")),
+            (0x250, 0x2af, self.tr("IPA Extensions")),
+            (0x2b0, 0x2ff, self.tr("Spacing Modifier Letters")),
+            (0x300, 0x36f, self.tr("Combining Diacritical Marks")),
+            (0x370, 0x3ff, self.tr("Greek and Coptic")),
+            (0x400, 0x4ff, self.tr("Cyrillic")),
+            (0x500, 0x52f, self.tr("Cyrillic Supplement")),
+            (0x530, 0x58f, self.tr("Armenian")),
+            (0x590, 0x5ff, self.tr("Hebrew")),
+            (0x600, 0x6ff, self.tr("Arabic")),
+            (0x700, 0x74f, self.tr("Syriac")),
+            (0x780, 0x7bf, self.tr("Thaana")),
+            (0x7c0, 0x7ff, self.tr("N'Ko")),
+            (0x800, 0x83f, self.tr("Samaritan")),
+            (0x840, 0x85f, self.tr("Mandaic")),
+            (0x8a0, 0x8ff, self.tr("Arabic Extended-A")),
+            (0x900, 0x97f, self.tr("Devanagari")),
+            (0x980, 0x9ff, self.tr("Bengali")),
+            (0xa00, 0xa7f, self.tr("Gurmukhi")),
+            (0xa80, 0xaff, self.tr("Gujarati")),
+            (0xb00, 0xb7f, self.tr("Oriya")),
+            (0xb80, 0xbff, self.tr("Tamil")),
+            (0xc00, 0xc7f, self.tr("Telugu")),
+            (0xc80, 0xcff, self.tr("Kannada")),
+            (0xd00, 0xd7f, self.tr("Malayalam")),
+            (0xd80, 0xdff, self.tr("Sinhala")),
+            (0xe00, 0xe7f, self.tr("Thai")),
+            (0xe80, 0xeff, self.tr("Lao")),
+            (0xf00, 0xfff, self.tr("Tibetan")),
             (0x1000, 0x109f, self.tr("Myanmar")),
             (0x10a0, 0x10ff, self.tr("Georgian")),
             (0x1100, 0x11ff, self.tr("Hangul Jamo")),

--- a/Utilities/ClassBrowsers/pyclbr.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Utilities/ClassBrowsers/pyclbr.py	Sat Apr 26 10:36:09 2014 +0200
@@ -313,7 +313,7 @@
                 if thisindent > conditionalsstack[-1]:
                     if not deltaindentcalculated:
                         deltastack.append(thisindent - conditionalsstack[-1])
-                        deltaindent = reduce(lambda x, y:  x + y, deltastack)
+                        deltaindent = reduce(lambda x, y: x + y, deltastack)
                         deltaindentcalculated = 1
                     thisindent -= deltaindent
                 else:

--- a/Utilities/ModuleParser.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Utilities/ModuleParser.py	Sat Apr 26 10:36:09 2014 +0200
@@ -564,7 +564,7 @@
                             deltastack.append(
                                 thisindent - conditionalsstack[-1])
                             deltaindent = reduce(
-                                lambda x, y:  x + y, deltastack)
+                                lambda x, y: x + y, deltastack)
                             deltaindentcalculated = 1
                         thisindent -= deltaindent
                     else:
@@ -664,7 +664,7 @@
                 while classstack and \
                         classstack[-1][1] >= thisindent:
                     if classstack[-1][0] is not None and \
-                       isinstance(classstack[-1][0], (Class,  Function)):
+                       isinstance(classstack[-1][0], (Class, Function)):
                         # record the end line of this class or function
                         classstack[-1][0].setEndLine(lineno - 1)
                     del classstack[-1]

--- a/Utilities/compatibility_fixes.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/Utilities/compatibility_fixes.py	Sat Apr 26 10:36:09 2014 +0200
@@ -32,7 +32,7 @@
         parameter (boolean)
     @return Returns the new file object
     """
-    return File(file, mode, buffering,  encoding, errors, newline, closefd)
+    return File(file, mode, buffering, encoding, errors, newline, closefd)
 
 
 class File(file):   # __IGNORE_WARNING__
@@ -76,7 +76,7 @@
 
         file.__init__(self, filein,  mode,  buffering)    # __IGNORE_WARNING__
 
-    def read(self,  n=-1):
+    def read(self, n=-1):
         """
         Read n bytes or all if n=-1 from file.
         
@@ -87,9 +87,9 @@
         if self.__encoding is None:
             return txt
         else:
-            return codecs.decode(txt,  self.__encoding)
+            return codecs.decode(txt, self.__encoding)
 
-    def readline(self,  limit=-1):
+    def readline(self, limit=-1):
         """
         Read one line from file.
         
@@ -100,9 +100,9 @@
         if self.__encoding is None:
             return txt
         else:
-            return codecs.decode(txt,  self.__encoding)
+            return codecs.decode(txt, self.__encoding)
 
-    def readlines(self,  hint=-1):
+    def readlines(self, hint=-1):
         """
         Read all lines from file.
         
@@ -112,10 +112,10 @@
         if self.__encoding is None:
             return super(File, self).readlines(hint)
         else:
-            return [codecs.decode(txt,  self.__encoding)
+            return [codecs.decode(txt, self.__encoding)
                     for txt in super(File, self).readlines(hint)]
 
-    def write(self,  txt):
+    def write(self, txt):
         """
         Write given data to file. Encode if needed.
         
@@ -139,7 +139,7 @@
         if self.__encoding is None:
             return txt
         else:
-            return codecs.decode(txt,  self.__encoding)
+            return codecs.decode(txt, self.__encoding)
 
 # Inject into the __builtin__ dictionary
 __builtin__.open = open

--- a/VCS/StatusMonitorLed.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/VCS/StatusMonitorLed.py	Sat Apr 26 10:36:09 2014 +0200
@@ -130,7 +130,7 @@
         """
         Private slot to change the status check interval.
         """
-        interval,  ok = QInputDialog.getInt(
+        interval, ok = QInputDialog.getInt(
             None,
             self.tr("VCS Status Monitor"),
             self.tr("Enter monitor interval [s]"),

--- a/eric5.e4p	Sat Apr 26 10:06:49 2014 +0200
+++ b/eric5.e4p	Sat Apr 26 10:36:09 2014 +0200
@@ -1992,7 +1992,7 @@
               <string>ExcludeMessages</string>
             </key>
             <value>
-              <string>E24, W293, N802, N803, N807, N808, N821</string>
+              <string>W293, N802, N803, N807, N808, N821</string>
             </value>
             <key>
               <string>FixCodes</string>

--- a/eric5_qregularexpression.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/eric5_qregularexpression.py	Sat Apr 26 10:36:09 2014 +0200
@@ -18,7 +18,7 @@
     import sip
     sip.setapi('QString', 2)
     sip.setapi('QVariant', 2)
-    sip.setapi('QTextStream',  2)
+    sip.setapi('QTextStream', 2)
     import Utilities.compatibility_fixes     # __IGNORE_WARNING__
 except (ImportError):
     pass

--- a/install.py	Sat Apr 26 10:06:49 2014 +0200
+++ b/install.py	Sat Apr 26 10:36:09 2014 +0200
@@ -16,7 +16,7 @@
     import sip
     sip.setapi('QString', 2)
     sip.setapi('QVariant', 2)
-    sip.setapi('QTextStream',  2)
+    sip.setapi('QTextStream', 2)
 except (ImportError):
     import io    # __IGNORE_WARNING__