Mercurial Repositories > eric / changeset

--- a/E5Gui/E5PathPicker.py	Tue Aug 23 18:53:46 2016 +0200
+++ b/E5Gui/E5PathPicker.py	Tue Aug 23 19:02:43 2016 +0200
@@ -38,7 +38,7 @@
     SaveFileEnsureExtensionMode = 3
     SaveFileOverwriteMode = 4
     DirectoryMode = 5
-    DirectoryShowFilesMode=6
+    DirectoryShowFilesMode = 6
     CustomMode = 99
     NoMode = 100
 

--- a/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/__init__.py	Tue Aug 23 18:53:46 2016 +0200
+++ b/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/__init__.py	Tue Aug 23 19:02:43 2016 +0200
@@ -42,7 +42,7 @@
   - Fix false RedefinedWhileUnesed for submodule imports
 
 1.2.0 (2016-05-03):
-  - Warn against reusing exception names after the except: block on Python 3
+  - Warn against reusing exception names after the except block on Python 3
   - Improve the error messages for imports
 
 1.1.0 (2016-03-01):

--- a/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/messages.py	Tue Aug 23 18:53:46 2016 +0200
+++ b/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/messages.py	Tue Aug 23 19:02:43 2016 +0200
@@ -132,7 +132,7 @@
 
 class ImportStarNotPermitted(Message):
     """
-    Class defining the "Import * not permitted" message.""
+    Class defining the "Import * not permitted" message.
     """
     message_id = 'F16'
     message = "'from %s import *' only allowed at module level"
@@ -449,12 +449,12 @@
 
 class DefaultExceptNotLast(Message):
     """
-    Class defining the "Default except: not being the last" message.
+    Class defining the "Default except not being the last" message.
     
-    Indicates an except: block as not the last exception handler.
+    Indicates an except block as not the last exception handler.
     """
     message_id = 'F25'
-    message = 'default \'except:\' must be last'
+    message = 'default \'except:\' must be last'    # __IGNORE_WARNING__
 
 
 class TwoStarredExpressions(Message):

--- a/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py	Tue Aug 23 18:53:46 2016 +0200
+++ b/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py	Tue Aug 23 19:02:43 2016 +0200
@@ -89,7 +89,7 @@
         "'continue' not supported inside 'finally' clause"),
     'F25': QCoreApplication.translate(
         'pyFlakes',
-        "Default 'except:' must be last"),
+        "Default 'except:' must be last"),  # __IGNORE_WARNING__
     'F26': QCoreApplication.translate(
         'pyFlakes',
         "Two starred expressions in assignment"),

--- a/Preferences/ConfigurationPages/WebBrowserPage.py	Tue Aug 23 18:53:46 2016 +0200
+++ b/Preferences/ConfigurationPages/WebBrowserPage.py	Tue Aug 23 19:02:43 2016 +0200
@@ -140,7 +140,8 @@
             for engineName in self.__browserWindow.imageSearchEngine()\
                     .searchEngineNames():
                 self.imageSearchComboBox.addItem(
-                    UI.PixmapCache.getIcon("{0}.png".format(engineName.lower())),
+                    UI.PixmapCache.getIcon(
+                        "{0}.png".format(engineName.lower())),
                     engineName)
             index = self.imageSearchComboBox.findText(
                 Preferences.getWebBrowser("ImageSearchEngine"))

--- a/Project/Project.py	Tue Aug 23 18:53:46 2016 +0200
+++ b/Project/Project.py	Tue Aug 23 19:02:43 2016 +0200
@@ -2414,11 +2414,11 @@
                 # the first entry determines the mainscript name
                 mainscriptname = os.path.splitext(mainscript)[0] or \
                     os.path.basename(tslist[0]).split('_')[0]
-                self.pdata["TRANSLATIONPATTERN"] = \
-                    os.path.join(os.path.dirname(tslist[0]),
-                     "{0}_%language%{1}".format(
-                         os.path.basename(tslist[0]).split('_')[0],
-                         os.path.splitext(tslist[0])[1]))
+                self.pdata["TRANSLATIONPATTERN"] = os.path.join(
+                    os.path.dirname(tslist[0]),
+                    "{0}_%language%{1}".format(
+                        os.path.basename(tslist[0]).split('_')[0],
+                        os.path.splitext(tslist[0])[1]))
             else:
                 pattern, ok = QInputDialog.getText(
                     None,
@@ -2736,7 +2736,7 @@
                     # rescan project tasks
                     if Preferences.getProject("TasksProjectRescanOnOpen"):
                         e5App().getObject("TaskViewer")\
-                        .regenerateProjectTasks(quiet=True)
+                            .regenerateProjectTasks(quiet=True)
                     
                     if restoreSession:
                         # open the main script