Mercurial Repositories > eric / changeset

--- a/DebugClients/Python/AsyncFile.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/AsyncFile.py	Wed Nov 04 16:25:25 2015 +0100
@@ -301,3 +301,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702

--- a/DebugClients/Python/AsyncIO.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/AsyncIO.py	Wed Nov 04 16:25:25 2015 +0100
@@ -85,3 +85,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702

--- a/DebugClients/Python/DCTestResult.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/DCTestResult.py	Wed Nov 04 16:25:25 2015 +0100
@@ -128,3 +128,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702

--- a/DebugClients/Python/DebugBase.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/DebugBase.py	Wed Nov 04 16:25:25 2015 +0100
@@ -844,3 +844,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702

--- a/DebugClients/Python/DebugClient.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/DebugClient.py	Wed Nov 04 16:25:25 2015 +0100
@@ -39,3 +39,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702

--- a/DebugClients/Python/DebugClientBase.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/DebugClientBase.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1429,7 +1429,7 @@
                     udict = dict
                 ndict = {}
                 # this has to be in line with VariablesViewer.indicators
-                if var[i][-2:] in ["[]", "()", "{}"]:
+                if var[i][-2:] in ["[]", "()", "{}"]:   # __IGNORE_WARNING__
                     if i + 1 == len(var):
                         if var[i][:-2] == '...':
                             dictkeys = [var[i - 1]]
@@ -1455,7 +1455,7 @@
                                     oaccess = ''
                                 else:
                                     access = '%s[%s]' % (access, var[i][:-2])
-                        if var[i][-2:] == "{}":
+                        if var[i][-2:] == "{}":         # __IGNORE_WARNING__
                             isDict = 1
                         break
                     else:
@@ -1567,7 +1567,7 @@
                 if access:
                     exec 'qvar = udict%s' % access
                 # this has to be in line with VariablesViewer.indicators
-                elif rvar and rvar[0][-2:] in ["[]", "()", "{}"]:
+                elif rvar and rvar[0][-2:] in ["[]", "()", "{}"]:   # __IGNORE_WARNING__
                     exec 'qvar = udict["%s"][%s]' % (rvar[0][:-2], rvar[1])
                 else:
                     qvar = udict[var[-1]]
@@ -1582,7 +1582,7 @@
                     if access:
                         exec 'qvar = udict%s' % access
                     # this has to be in line with VariablesViewer.indicators
-                    elif rvar and rvar[0][-2:] in ["[]", "()", "{}"]:
+                    elif rvar and rvar[0][-2:] in ["[]", "()", "{}"]:   # __IGNORE_WARNING__
                         exec 'qvar = udict["%s"][%s]' % (rvar[0][:-2], rvar[1])
                     else:
                         qvar = udict[var[-1]]
@@ -2219,3 +2219,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702

--- a/DebugClients/Python/DebugClientCapabilities.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/DebugClientCapabilities.py	Wed Nov 04 16:25:25 2015 +0100
@@ -20,3 +20,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702

--- a/DebugClients/Python/DebugClientThreads.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/DebugClientThreads.py	Wed Nov 04 16:25:25 2015 +0100
@@ -200,3 +200,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702

--- a/DebugClients/Python/DebugConfig.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/DebugConfig.py	Wed Nov 04 16:25:25 2015 +0100
@@ -20,3 +20,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702

--- a/DebugClients/Python/DebugProtocol.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/DebugProtocol.py	Wed Nov 04 16:25:25 2015 +0100
@@ -85,3 +85,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702

--- a/DebugClients/Python/DebugThread.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/DebugThread.py	Wed Nov 04 16:25:25 2015 +0100
@@ -131,3 +131,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702

--- a/DebugClients/Python/FlexCompleter.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/FlexCompleter.py	Wed Nov 04 16:25:25 2015 +0100
@@ -252,3 +252,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702, M111

--- a/DebugClients/Python/PyProfile.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/PyProfile.py	Wed Nov 04 16:25:25 2015 +0100
@@ -169,3 +169,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702

--- a/DebugClients/Python/eric6dbgstub.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/eric6dbgstub.py	Wed Nov 04 16:25:25 2015 +0100
@@ -92,3 +92,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702

--- a/DebugClients/Python/getpass.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python/getpass.py	Wed Nov 04 16:25:25 2015 +0100
@@ -54,3 +54,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M601, M702

--- a/DebugClients/Python3/AsyncFile.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/AsyncFile.py	Wed Nov 04 16:25:25 2015 +0100
@@ -325,3 +325,6 @@
         """
         for l in list:
             self.write(l)
+
+#
+# eflag: noqa = M702

--- a/DebugClients/Python3/AsyncIO.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/AsyncIO.py	Wed Nov 04 16:25:25 2015 +0100
@@ -82,3 +82,6 @@
         @param s the data to be written (string)
         """
         self.wbuf = self.wbuf + s
+
+#
+# eflag: noqa = M702

--- a/DebugClients/Python3/DCTestResult.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/DCTestResult.py	Wed Nov 04 16:25:25 2015 +0100
@@ -119,3 +119,6 @@
 
         if self.parent.readstream in rrdy:
             self.parent.readReady(self.parent.readstream.fileno())
+
+#
+# eflag: noqa = M702

--- a/DebugClients/Python3/DebugBase.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/DebugBase.py	Wed Nov 04 16:25:25 2015 +0100
@@ -890,3 +890,6 @@
         @return last debugger event (string)
         """
         return self.__event
+
+#
+# eflag: noqa = M702

--- a/DebugClients/Python3/DebugClient.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/DebugClient.py	Wed Nov 04 16:25:25 2015 +0100
@@ -36,3 +36,6 @@
 if __name__ == '__main__':
     debugClient = DebugClient()
     debugClient.main()
+
+#
+# eflag: noqa = M702

--- a/DebugClients/Python3/DebugClientBase.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/DebugClientBase.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1432,7 +1432,7 @@
                     udict = dict
                 ndict = {}
                 # this has to be in line with VariablesViewer.indicators
-                if var[i][-2:] in ["[]", "()", "{}"]:
+                if var[i][-2:] in ["[]", "()", "{}"]:       # __IGNORE_WARNING__
                     if i + 1 == len(var):
                         if var[i][:-2] == '...':
                             dictkeys = [var[i - 1]]
@@ -1461,7 +1461,7 @@
                                 else:
                                     access = '{0!s}[{1!s}]'.format(
                                         access, var[i][:-2])
-                        if var[i][-2:] == "{}":
+                        if var[i][-2:] == "{}":     # __IGNORE_WARNING__
                             isDict = True
                         break
                     else:
@@ -1588,7 +1588,7 @@
                     exec('qvar = udict{0!s}'.format(access), globals(), loc)
                     qvar = loc["qvar"]
                 # this has to be in line with VariablesViewer.indicators
-                elif rvar and rvar[0][-2:] in ["[]", "()", "{}"]:
+                elif rvar and rvar[0][-2:] in ["[]", "()", "{}"]:   # __IGNORE_WARNING__
                     loc = {"udict": udict}
                     exec('qvar = udict["{0!s}"][{1!s}]'.format(rvar[0][:-2],
                          rvar[1]),
@@ -1610,7 +1610,7 @@
                              globals(), loc)
                         qvar = loc["qvar"]
                     # this has to be in line with VariablesViewer.indicators
-                    elif rvar and rvar[0][-2:] in ["[]", "()", "{}"]:
+                    elif rvar and rvar[0][-2:] in ["[]", "()", "{}"]:   # __IGNORE_WARNING__
                         loc = {"udict": udict}
                         exec('qvar = udict["{0!s}"][{1!s}]'.format(
                              rvar[0][:-2], rvar[1]), globals(), loc)
@@ -2268,3 +2268,6 @@
         sysPath.insert(0, firstEntry)
         sysPath.insert(0, '')
         return sysPath
+
+#
+# eflag: noqa = M702

--- a/DebugClients/Python3/DebugClientCapabilities.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/DebugClientCapabilities.py	Wed Nov 04 16:25:25 2015 +0100
@@ -17,3 +17,6 @@
 
 HasAll = HasDebugger | HasInterpreter | HasProfiler | \
     HasCoverage | HasCompleter | HasUnittest | HasShell
+
+#
+# eflag: noqa = M702

--- a/DebugClients/Python3/DebugClientThreads.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/DebugClientThreads.py	Wed Nov 04 16:25:25 2015 +0100
@@ -197,3 +197,6 @@
 if __name__ == '__main__':
     debugClient = DebugClientThreads()
     debugClient.main()
+
+#
+# eflag: noqa = M702

--- a/DebugClients/Python3/DebugConfig.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/DebugConfig.py	Wed Nov 04 16:25:25 2015 +0100
@@ -17,3 +17,6 @@
     'function', 'builtin_function_or_method', 'code', 'module',
     'ellipsis', 'traceback', 'frame', 'other'
 ]
+
+#
+# eflag: noqa = M702

--- a/DebugClients/Python3/DebugProtocol.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/DebugProtocol.py	Wed Nov 04 16:25:25 2015 +0100
@@ -82,3 +82,6 @@
 CallTrace = '>CallTrace<'
 
 EOT = '>EOT<\n'
+
+#
+# eflag: noqa = M702

--- a/DebugClients/Python3/DebugThread.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/DebugThread.py	Wed Nov 04 16:25:25 2015 +0100
@@ -127,3 +127,6 @@
             self._dbgClient.unlockClient()
         
         return retval
+
+#
+# eflag: noqa = M702

--- a/DebugClients/Python3/DebugUtilities.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/DebugUtilities.py	Wed Nov 04 16:25:25 2015 +0100
@@ -44,7 +44,7 @@
     @exception TypeError raised if the input parameter is not a frame object
     """
     if not isframe(frame):
-        raise TypeError('{!r} is not a frame object'.format(frame))
+        raise TypeError('{0!r} is not a frame object'.format(frame))
 
     args, varargs, kwonlyargs, varkw = _getfullargs(frame.f_code)
     return ArgInfo(args + kwonlyargs, varargs, varkw, frame.f_locals)
@@ -63,7 +63,7 @@
     @exception TypeError raised if the input parameter is not a code object
     """
     if not iscode(co):
-        raise TypeError('{!r} is not a code object'.format(co))
+        raise TypeError('{0!r} is not a code object'.format(co))
 
     nargs = co.co_argcount
     names = co.co_varnames
@@ -122,3 +122,6 @@
     if '__return__' in locals:
         argvalues += " -> " + formatvalue(locals['__return__'])
     return argvalues
+
+#
+# eflag: noqa = M702

--- a/DebugClients/Python3/FlexCompleter.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/FlexCompleter.py	Wed Nov 04 16:25:25 2015 +0100
@@ -210,3 +210,6 @@
         for base in klass.__bases__:
             ret = ret + get_class_members(base)
     return ret
+
+#
+# eflag: noqa = M702, M111

--- a/DebugClients/Python3/PyProfile.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/PyProfile.py	Wed Nov 04 16:25:25 2015 +0100
@@ -172,3 +172,6 @@
         # the C function returned
         "c_return": profile.Profile.trace_dispatch_return,
     }
+
+#
+# eflag: noqa = M702

--- a/DebugClients/Python3/eric6dbgstub.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/eric6dbgstub.py	Wed Nov 04 16:25:25 2015 +0100
@@ -88,3 +88,6 @@
     if debugger:
         debugger.startDebugger(enableTrace=enableTrace, exceptions=exceptions,
                                tracePython=tracePython, redirect=redirect)
+
+#
+# eflag: noqa = M702

--- a/DebugClients/Python3/getpass.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DebugClients/Python3/getpass.py	Wed Nov 04 16:25:25 2015 +0100
@@ -51,3 +51,6 @@
 unix_getpass = getpass
 win_getpass = getpass
 default_getpass = getpass
+
+#
+# eflag: noqa = M702

--- a/Debugger/DebugClientCapabilities.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Debugger/DebugClientCapabilities.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module defining the debug clients capabilities.
 """
 
+from __future__ import unicode_literals
+
 HasDebugger = 0x0001
 HasInterpreter = 0x0002
 HasProfiler = 0x0004

--- a/Debugger/VariablesViewer.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Debugger/VariablesViewer.py	Wed Nov 04 16:25:25 2015 +0100
@@ -289,9 +289,9 @@
         """
         super(VariablesViewer, self).__init__(parent)
         
-        self.indicators = {'list': '[]', 'tuple': '()', 'dict': '{}',
+        self.indicators = {'list': '[]', 'tuple': '()', 'dict': '{}',   # __IGNORE_WARNING__
                            # Python types
-                           'Array': '[]', 'Hash': '{}'
+                           'Array': '[]', 'Hash': '{}'                  # __IGNORE_WARNING__
                            # Ruby types
                            }
         
@@ -648,7 +648,7 @@
             
         vtype = itm.text(2)
         name = itm.text(0)
-        if name[-2:] in ['[]', '{}', '()']:
+        if name[-2:] in ['[]', '{}', '()']:         # __IGNORE_WARNING__
             name = name[:-2]
         
         par = itm.parent()
@@ -656,7 +656,7 @@
         # build up the fully qualified name
         while par is not None:
             pname = par.text(0)
-            if pname[-2:] in ['[]', '{}', '()']:
+            if pname[-2:] in ['[]', '{}', '()']:    # __IGNORE_WARNING__
                 if nlist[0].endswith("."):
                     nlist[0] = '[{0}].'.format(nlist[0][:-1])
                 else:

Binary file Documentation/Help/source.qch has changed

--- a/DocumentationTools/Config.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DocumentationTools/Config.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module defining different default values for the documentation tools package.
 """
 
+from __future__ import unicode_literals
+
 # the default colors for the eric6 documentation generator
 eric6docDefaultColors = {
     'BodyColor': '#000000',

--- a/DocumentationTools/__init__.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/DocumentationTools/__init__.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Package implementing the source code documentation tools.
 """
 
+from __future__ import unicode_literals
+
 supportedExtensionsDictForApis = {
     "Python2": [".py2", ".pyw2", ".ptl"],
     "Python3": [".py", ".pyw", ".py3", ".pyw3"],

--- a/E5Network/E5RFC6266.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/E5Network/E5RFC6266.py	Wed Nov 04 16:25:25 2015 +0100
@@ -42,7 +42,7 @@
             super().__setitem__(key, value)
 
     # RFC 2616
-    separator_chars = "()<>@,;:\\\"/[]?={} \t"
+    separator_chars = "()<>@,;:\\\"/[]?={} \t"      # __IGNORE_WARNING__
     ctl_chars = ''.join(chr(i) for i in range(32)) + chr(127)
     nontoken_chars = separator_chars + ctl_chars
 
@@ -51,12 +51,12 @@
     attr_chars = string.ascii_letters + string.digits + attr_chars_nonalnum
 
     # RFC 5987 gives this alternative construction of the token character class
-    token_chars = attr_chars + "*'%"
+    token_chars = attr_chars + "*'%"        # __IGNORE_WARNING__
 
     # Definitions from https://tools.ietf.org/html/rfc2616#section-2.2
     # token was redefined from attr_chars to avoid using AnyBut,
     # which might include non-ascii octets.
-    token_re = '[{}]+'.format(re.escape(token_chars))
+    token_re = '[{0}]+'.format(re.escape(token_chars))
 
     class Token(str):
         """
@@ -77,15 +77,15 @@
     # Everything else in this grammar (including RFC 5987 ext values)
     # is in an ascii-safe encoding.
 
-    qdtext_re = r'[^"{}]'.format(re.escape(ctl_chars))
-    quoted_pair_re = r'\\[{}]'.format(re.escape(
+    qdtext_re = r'[^"{0}]'.format(re.escape(ctl_chars))
+    quoted_pair_re = r'\\[{0}]'.format(re.escape(
         ''.join(chr(i) for i in range(128))))
 
     class QuotedString(str):
         """
         A quoted string (RFC 2616, Section 2.2).
         """
-        grammar = re.compile(r'"({}|{})+"'.format(quoted_pair_re, qdtext_re))
+        grammar = re.compile(r'"({0}|{1})+"'.format(quoted_pair_re, qdtext_re))
 
         def __str__(self):
             s = super().__str__()
@@ -116,7 +116,7 @@
         """
         grammar = re.compile('[A-Za-z0-9-]+')
 
-    attr_char_re = '[{}]'.format(re.escape(attr_chars))
+    attr_char_re = '[{0}]'.format(re.escape(attr_chars))
     hex_digit_re = '%[' + string.hexdigits + ']{2}'
 
     class ValueChars(str):
@@ -126,7 +126,7 @@
         Fixme: Can we merge this with Value?
         https://github.com/The-Compiler/qutebrowser/issues/105
         """
-        grammar = re.compile('({}|{})*'.format(attr_char_re, hex_digit_re))
+        grammar = re.compile('({0}|{1})*'.format(attr_char_re, hex_digit_re))
 
     class ExtValue(peg.List):
         """

--- a/E5XML/Config.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/E5XML/Config.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing some common configuration stuf for the XML package.
 """
 
+from __future__ import unicode_literals
+
 # version number of the multi project file
 multiProjectFileFormatVersion = "5.1"
 

--- a/Globals/compatibility_fixes.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Globals/compatibility_fixes.py	Wed Nov 04 16:25:25 2015 +0100
@@ -295,3 +295,4 @@
 
 #
 # eflag: FileType = Python2
+# eflag: noqa = M702

--- a/Helpviewer/Download/DownloadManager.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Helpviewer/Download/DownloadManager.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Copyright (c) 2010 - 2015 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
 """
 Module implementing the download manager class.
 """

--- a/Helpviewer/FlashCookieManager/FlashCookieManagerDialog.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Helpviewer/FlashCookieManager/FlashCookieManagerDialog.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to manage the flash cookies.
 """
 
+from __future__ import unicode_literals
+
 from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QTimer
 from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QApplication, QMenu, \
     QInputDialog, QLineEdit

--- a/Helpviewer/Sync/SyncGlobals.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Helpviewer/Sync/SyncGlobals.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing some global definitions.
 """
 
+from __future__ import unicode_literals
+
 # Page IDs for the sync wizard
 PageData = 0
 PageEncryption = 1

--- a/Helpviewer/VirusTotal/VirusTotalWhoisDialog.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Helpviewer/VirusTotal/VirusTotalWhoisDialog.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show the 'whois' information.
 """
 
+from __future__ import unicode_literals
+
 from PyQt5.QtWidgets import QDialog
 
 from .Ui_VirusTotalWhoisDialog import Ui_VirusTotalWhoisDialog

--- a/IconEditor/IconSizeDialog.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/IconEditor/IconSizeDialog.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Copyright (c) 2009 - 2015 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
 """
 Module implementing a dialog to enter the icon size.
 """

--- a/Plugins/AboutPlugin/AboutDialog.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/AboutPlugin/AboutDialog.py	Wed Nov 04 16:25:25 2015 +0100
@@ -46,7 +46,7 @@
 Andrew Bushnell
     Multithreaded debugger
 
-Alexander Barkoff   
+Alexander Barkoff
 Alexander Darovsky
 Mikhail Terekhov
     Russian translations

--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the code style checker.
 """
 
+from __future__ import unicode_literals
+
 import sys
 import multiprocessing
 

--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py	Wed Nov 04 16:25:25 2015 +0100
@@ -2721,7 +2721,7 @@
         @return number of unmatched open/close brackets (integer)
         """
         count = 0
-        for opening, closing in ['()', '[]', '{}']:
+        for opening, closing in ['()', '[]', '{}']:     # __IGNORE_WARNING__
             count += abs(line.count(opening) - line.count(closing))
         
         return count

--- a/Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py	Wed Nov 04 16:25:25 2015 +0100
@@ -12,6 +12,8 @@
 # pep257.py (version 0.2.4).
 #
 
+from __future__ import unicode_literals
+
 try:
     # Python 2
     from StringIO import StringIO       # __IGNORE_EXCEPTION__

--- a/Plugins/CheckerPlugins/CodeStyleChecker/McCabeChecker.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/McCabeChecker.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing a checker for code complexity.
 """
 
+from __future__ import unicode_literals
+
 import sys
 import ast
 

--- a/Plugins/CheckerPlugins/CodeStyleChecker/NamingStyleChecker.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/NamingStyleChecker.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing a checker for naming conventions.
 """
 
+from __future__ import unicode_literals
+
 import collections
 import ast
 import re

--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,9 @@
 """
 Module implementing the syntax check for Python 2/3.
 """
+
+from __future__ import unicode_literals
+
 import ast
 import re
 import sys

--- a/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,9 @@
 """
 Module implementing the syntax check for Python 2/3.
 """
+
+from __future__ import unicode_literals
+
 import os
 import sys
 import multiprocessing

--- a/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/__init__.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/__init__.py	Wed Nov 04 16:25:25 2015 +0100
@@ -166,4 +166,6 @@
   - Improve reporting of unbound locals
 """
 
+from __future__ import unicode_literals
+
 __version__ = '1.0.0'

--- a/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/messages.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/messages.py	Wed Nov 04 16:25:25 2015 +0100
@@ -11,6 +11,8 @@
 Module providing the class Message and its subclasses.
 """
 
+from __future__ import unicode_literals
+
 
 class Message(object):
     """

--- a/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py	Wed Nov 04 16:25:25 2015 +0100
@@ -494,3 +494,5 @@
                 witness = indents[-1].not_equal_witness(thisguy)
                 msg = "indent not equal e.g. " + format_witnesses(witness)
                 raise NannyNag(start[0], msg, line)
+
+# eflag: noqa = M111

--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing an interface to the Mercurial command server.
 """
 
+from __future__ import unicode_literals
+
 try:
     str = unicode
 except NameError:

--- a/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Copyright (c) 2010 - 2015 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
 """
 Module implementing a dialog to enter data needed for the initial creation
 of a repository configuration file (hgrc).

--- a/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Copyright (c) 2014 - 2015 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
 """
 Module implementing a dialog to enter the data for the repo conversion.
 """

--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Copyright (c) 2014 - 2015 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
 """
 Module implementing Mercurial shelve browser dialog.
 """

--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Copyright (c) 2014 - 2015 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
 """
 Module implementing a dialog to select multiple shelve names.
 """

--- a/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c)2015 Detlev Offenbach <detlev@die-offenbachs.de>
+# Copyright (c) 2015 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 
 """

--- a/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c)2015 Detlev Offenbach <detlev@die-offenbachs.de>
+# Copyright (c) 2015 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 
 """

--- a/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Copyright (c) 2010 - 2015 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
 """
 Module implementing the eric6 message box wizard dialog.
 """

--- a/Preferences/ConfigurationPages/HelpFlashCookieManagerPage.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Preferences/ConfigurationPages/HelpFlashCookieManagerPage.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Flash Cookies Manager configuration page.
 """
 
+from __future__ import unicode_literals
+
 from PyQt5.QtCore import pyqtSlot
 
 from E5Gui.E5Completers import E5DirCompleter

--- a/Preferences/ConfigurationPages/HelpInterfacePage.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Preferences/ConfigurationPages/HelpInterfacePage.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+# Copyright (c) 2006 - 2015 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
 """
 Module implementing the Interface configuration page (variant for web browser).
 """

--- a/Project/Project.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Project/Project.py	Wed Nov 04 16:25:25 2015 +0100
@@ -2427,7 +2427,7 @@
                     self.tr("Translation Pattern"),
                     self.tr(
                         "Enter the path pattern for translation files "
-                        "(use '%language%' in place of the language code):"),
+                        "(use '%language%' in place of the language code):"),   # __IGNORE_WARNING__
                     QLineEdit.Normal,
                     tslist[0])
                 if pattern:

--- a/Project/ProjectBrowserFlags.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Project/ProjectBrowserFlags.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module defining the project browser flags.
 """
 
+from __future__ import unicode_literals
+
 SourcesBrowserFlag = 1
 FormsBrowserFlag = 2
 ResourcesBrowserFlag = 4

--- a/Templates/TemplateHelpDialog.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Templates/TemplateHelpDialog.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show some template help.
 """
 
+from __future__ import unicode_literals
+
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QDialog
 

--- a/Toolbox/PyQt4ImportHook.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Toolbox/PyQt4ImportHook.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing an import hook converting PyQt5 imports to PyQt4 imports.
 """
 
+from __future__ import unicode_literals
+
 import sys
 try:
     if "--pyqt4" in sys.argv:

--- a/UI/Config.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/UI/Config.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module defining common data to be used by all windows..
 """
 
+from __future__ import unicode_literals
+
 from PyQt5.QtCore import QSize
 
 ToolBarIconSize = QSize(20, 18)

--- a/Utilities/PySideImporter.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/Utilities/PySideImporter.py	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module to check for the presence of PySide by importing it.
 """
 
+from __future__ import unicode_literals
+
 import sys
 
 if __name__ == "__main__":

--- a/eric6.e4p	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6.e4p	Wed Nov 04 16:25:25 2015 +0100
@@ -2175,7 +2175,7 @@
               <string>ExcludeMessages</string>
             </key>
             <value>
-              <string>C101, E265, N802, N803, N807, N808, N821, W293, M801</string>
+              <string>C101, E265, M121, M801, N802, N803, N807, N808, N821, W293, M811</string>
             </value>
             <key>
               <string>FixCodes</string>
@@ -2193,7 +2193,7 @@
               <string>FutureChecker</string>
             </key>
             <value>
-              <string></string>
+              <string>unicode_literals</string>
             </value>
             <key>
               <string>HangClosing</string>

--- a/eric6.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6 import main
 
 main()

--- a/eric6_api.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_api.py	Wed Nov 04 16:25:25 2015 +0100
@@ -74,7 +74,7 @@
     print("        This option may be repeated multiple times.")
     print("  -o filename or --output=filename")
     print("        Write the API information to the named file."
-          " A '%L' placeholder")
+          " A '%L' placeholder")        # __IGNORE_WARNING__
     print("        is replaced by the language of the API file"
           " (see --language).")
     print("  -p or --private")

--- a/eric6_compare.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_compare.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_compare import main
 
 main()

--- a/eric6_configure.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_configure.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_configure import main
 
 main()

--- a/eric6_diff.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_diff.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_diff import main
 
 main()

--- a/eric6_editor.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_editor.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_editor import main
 
 main()

--- a/eric6_iconeditor.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_iconeditor.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_iconeditor import main
 
 main()

--- a/eric6_plugininstall.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_plugininstall.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_plugininstall import main
 
 main()

--- a/eric6_pluginrepository.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_pluginrepository.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_pluginrepository import main
 
 main()

--- a/eric6_pluginuninstall.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_pluginuninstall.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_pluginuninstall import main
 
 main()

--- a/eric6_qregexp.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_qregexp.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_qregexp import main
 
 main()

--- a/eric6_qregularexpression.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_qregularexpression.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_qregularexpression import main
 
 main()

--- a/eric6_re.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_re.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_re import main
 
 main()

--- a/eric6_snap.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_snap.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_snap import main
 
 main()

--- a/eric6_sqlbrowser.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_sqlbrowser.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_sqlbrowser import main
 
 main()

--- a/eric6_tray.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_tray.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_tray import main
 
 main()

--- a/eric6_trpreviewer.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_trpreviewer.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_trpreviewer import main
 
 main()

--- a/eric6_uipreviewer.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_uipreviewer.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_uipreviewer import main
 
 main()

--- a/eric6_unittest.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_unittest.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_unittest import main
 
 main()

--- a/eric6_webbrowser.pyw	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6_webbrowser.pyw	Wed Nov 04 16:25:25 2015 +0100
@@ -7,6 +7,8 @@
 Module implementing the Windows entry point.
 """
 
+from __future__ import unicode_literals
+
 from eric6_webbrowser import main
 
 main()

--- a/eric6config.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/eric6config.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1,4 +1,8 @@
 # -*- coding: utf-8 -*-
+
+# Copyright (c) 2002 - 2015 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
 #
 # This module contains the configuration of the individual eric installation
 #

--- a/install.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/install.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2002-2015 Detlev Offenbach <detlev@die-offenbachs.de>
+# Copyright (c) 2002 - 2015 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 # This is the install script for eric6.
 

--- a/patch_modpython.py	Wed Nov 04 15:38:02 2015 +0100
+++ b/patch_modpython.py	Wed Nov 04 16:25:25 2015 +0100
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2003-2015 Detlev Offenbach <detlev@die-offenbachs.de>
+# Copyright (c) 2003 - 2015 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 # This is a  script to patch mod_python for eric6.