Merged remote changes. 5_0_x

Wed, 05 Jan 2011 16:22:18 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 05 Jan 2011 16:22:18 +0100
branch
5_0_x
changeset 810
09ab11885d37
parent 809
0f19e2fdce8f (current diff)
parent 807
ecc71fdd67f1 (diff)
child 820
3336024d064a

Merged remote changes.

--- a/DebugClients/Python/AsyncFile.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/AsyncFile.py	Wed Jan 05 16:22:18 2011 +0100
@@ -8,10 +8,8 @@
 """
 
 import socket
-import sys
 
-from DebugProtocol import EOT, RequestOK
-
+from DebugProtocol import EOT
 
 def AsyncPendingWrite(file):
     """
@@ -290,3 +288,6 @@
         @param list the list to be written (list of string)
         """
         map(self.write,list)
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/AsyncIO.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/AsyncIO.py	Wed Jan 05 16:22:18 2011 +0100
@@ -84,3 +84,6 @@
         @param s the data to be written (string)
         """
         self.wbuf = self.wbuf + s
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/DCTestResult.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/DCTestResult.py	Wed Jan 05 16:22:18 2011 +0100
@@ -77,4 +77,7 @@
         rrdy, wrdy, xrdy = select.select([self.parent.readstream],[],[], 0.01)
 
         if self.parent.readstream in rrdy:
-            self.parent.readReady(self.parent.readstream.fileno())
\ No newline at end of file
+            self.parent.readReady(self.parent.readstream.fileno())
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/DebugBase.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/DebugBase.py	Wed Jan 05 16:22:18 2011 +0100
@@ -8,7 +8,6 @@
 """
 
 import sys
-import traceback
 import bdb
 import os
 import types
@@ -25,7 +24,6 @@
     
     @param s data to be printed
     """
-    import sys
     sys.__stderr__.write('%s\n' % unicode(s))
     sys.__stderr__.flush()
 
@@ -720,3 +718,6 @@
         @return last debugger event (string)
         """
         return self.__event
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/DebugClient.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/DebugClient.py	Wed Jan 05 16:22:18 2011 +0100
@@ -36,3 +36,6 @@
 if __name__ == '__main__':
     debugClient = DebugClient()
     debugClient.main()
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/DebugClientBase.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/DebugClientBase.py	Wed Jan 05 16:22:18 2011 +0100
@@ -16,12 +16,10 @@
 import time
 import imp
 import re
-import distutils.sysconfig
-
 
 from DebugProtocol import *
 import DebugClientCapabilities
-from DebugBase import setRecursionLimit, printerr
+from DebugBase import setRecursionLimit, printerr   # __IGNORE_WARNING__
 from AsyncFile import *
 from DebugConfig import ConfigVarTypeStrings
 from FlexCompleter import Completer
@@ -933,7 +931,7 @@
         @return client capabilities (integer)
         """
         try:
-            import PyProfile
+            import PyProfile    # __IGNORE_WARNING__
             try:
                 del sys.modules['PyProfile']
             except KeyError:
@@ -1935,3 +1933,6 @@
         sysPath.insert(0, firstEntry)
         sysPath.insert(0, '')
         return sysPath
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/DebugClientCapabilities.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/DebugClientCapabilities.py	Wed Jan 05 16:22:18 2011 +0100
@@ -17,3 +17,6 @@
 
 HasAll = HasDebugger | HasInterpreter | HasProfiler | \
          HasCoverage | HasCompleter | HasUnittest | HasShell
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/DebugClientThreads.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/DebugClientThreads.py	Wed Jan 05 16:22:18 2011 +0100
@@ -191,3 +191,6 @@
 if __name__ == '__main__':
     debugClient = DebugClientThreads()
     debugClient.main()
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/DebugConfig.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/DebugConfig.py	Wed Jan 05 16:22:18 2011 +0100
@@ -15,3 +15,6 @@
         'instance method', 'property', 'generator',\
         'function', 'builtin_function_or_method', 'code', 'module',\
         'ellipsis', 'traceback', 'frame', 'other']
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/DebugProtocol.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/DebugProtocol.py	Wed Jan 05 16:22:18 2011 +0100
@@ -75,3 +75,6 @@
 PassiveStartup =           '>PassiveStartup<'
 
 EOT = '>EOT<\n'
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/DebugThread.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/DebugThread.py	Wed Jan 05 16:22:18 2011 +0100
@@ -126,3 +126,6 @@
             self._dbgClient.unlockClient()
         
         return retval
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/FlexCompleter.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/FlexCompleter.py	Wed Jan 05 16:22:18 2011 +0100
@@ -244,4 +244,7 @@
     if hasattr(klass,'__bases__'):
         for base in klass.__bases__:
             ret = ret + get_class_members(base)
-    return ret
\ No newline at end of file
+    return ret
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/PyProfile.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/PyProfile.py	Wed Jan 05 16:22:18 2011 +0100
@@ -159,3 +159,6 @@
         "c_exception": profile.Profile.trace_dispatch_return,  # the C function returned
         "c_return": profile.Profile.trace_dispatch_return,
         }
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/__init__.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/__init__.py	Wed Jan 05 16:22:18 2011 +0100
@@ -8,3 +8,6 @@
 
 It consists of different kinds of debug clients.
 """
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/__init__.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/__init__.py	Wed Jan 05 16:22:18 2011 +0100
@@ -80,4 +80,7 @@
 # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 # TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-# DAMAGE.
\ No newline at end of file
+# DAMAGE.
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/annotate.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/annotate.py	Wed Jan 05 16:22:18 2011 +0100
@@ -94,4 +94,7 @@
                 dest.write('! ')
             dest.write(line)
         source.close()
-        dest.close()
\ No newline at end of file
+        dest.close()
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/backward.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/backward.py	Wed Jan 05 16:22:18 2011 +0100
@@ -70,3 +70,6 @@
 """,
     "<exec_function>", "exec"
     ))
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/bytecode.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/bytecode.py	Wed Jan 05 16:22:18 2011 +0100
@@ -79,3 +79,6 @@
         raise StopIteration
 
     next = __next__
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/cmdline.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/cmdline.py	Wed Jan 05 16:22:18 2011 +0100
@@ -592,4 +592,7 @@
         _, err, _ = sys.exc_info()
         print(err)
         status = ERR
-    return status
\ No newline at end of file
+    return status
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/codeunit.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/codeunit.py	Wed Jan 05 16:22:18 2011 +0100
@@ -141,4 +141,7 @@
         # Couldn't find source.
         raise CoverageException(
             "No source for code %r." % self.filename
-            )
\ No newline at end of file
+            )
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/collector.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/collector.py	Wed Jan 05 16:22:18 2011 +0100
@@ -270,4 +270,7 @@
         if self.branch:
             return self.data
         else:
-            return {}
\ No newline at end of file
+            return {}
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/control.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/control.py	Wed Jan 05 16:22:18 2011 +0100
@@ -343,4 +343,7 @@
                     if re.search("^COV|^PY", k)
                 ]),
             ]
-        return info
\ No newline at end of file
+        return info
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/data.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/data.py	Wed Jan 05 16:22:18 2011 +0100
@@ -247,4 +247,7 @@
         fname = sys.argv[1]
     else:
         fname = covdata.filename
-    pprint.pprint(covdata.raw_data(fname))
\ No newline at end of file
+    pprint.pprint(covdata.raw_data(fname))
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/execfile.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/execfile.py	Wed Jan 05 16:22:18 2011 +0100
@@ -47,4 +47,7 @@
 
         # Restore the old argv and path
         sys.argv = old_argv
-        sys.path[0] = old_path0
\ No newline at end of file
+        sys.path[0] = old_path0
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/files.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/files.py	Wed Jan 05 16:22:18 2011 +0100
@@ -71,3 +71,6 @@
                     data = data.decode('utf8') # TODO: How to do this properly?
                 return data
         return None
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/html.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/html.py	Wed Jan 05 16:22:18 2011 +0100
@@ -179,4 +179,7 @@
 
     """
     html = re.sub(">\s+<p ", ">\n<p ", html)
-    return html
\ No newline at end of file
+    return html
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/misc.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/misc.py	Wed Jan 05 16:22:18 2011 +0100
@@ -67,3 +67,6 @@
 class NoSource(CoverageException):
     """Used to indicate we couldn't find the source for a module."""
     pass
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/parser.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/parser.py	Wed Jan 05 16:22:18 2011 +0100
@@ -741,4 +741,7 @@
         return arc_width, arc_chars
 
 if __name__ == '__main__':
-    AdHocMain().main(sys.argv[1:])
\ No newline at end of file
+    AdHocMain().main(sys.argv[1:])
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/phystokens.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/phystokens.py	Wed Jan 05 16:22:18 2011 +0100
@@ -104,4 +104,7 @@
             col = ecol
 
     if line:
-        yield line
\ No newline at end of file
+        yield line
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/report.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/report.py	Wed Jan 05 16:22:18 2011 +0100
@@ -57,4 +57,7 @@
                 report_fn(cu, self.coverage._analyze(cu))
             except NoSource:
                 if not self.ignore_errors:
-                    raise
\ No newline at end of file
+                    raise
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/results.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/results.py	Wed Jan 05 16:22:18 2011 +0100
@@ -172,4 +172,7 @@
         # Implementing 0+Numbers allows us to sum() a list of Numbers.
         if other == 0:
             return self
-        raise NotImplemented
\ No newline at end of file
+        raise NotImplemented
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/summary.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/summary.py	Wed Jan 05 16:22:18 2011 +0100
@@ -73,4 +73,7 @@
             args += (total.pc_covered,)
             if self.show_missing:
                 args += ("",)
-            outfile.write(fmt_coverage % args)
\ No newline at end of file
+            outfile.write(fmt_coverage % args)
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/templite.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/templite.py	Wed Jan 05 16:22:18 2011 +0100
@@ -164,3 +164,6 @@
         else:
             value = self.context[expr]
         return value
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/coverage/xmlreport.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/coverage/xmlreport.py	Wed Jan 05 16:22:18 2011 +0100
@@ -143,4 +143,7 @@
         package[1] += class_hits
         package[2] += class_lines
         package[3] += class_branch_hits
-        package[4] += class_branches
\ No newline at end of file
+        package[4] += class_branches
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/eric5dbgstub.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/eric5dbgstub.py	Wed Jan 05 16:22:18 2011 +0100
@@ -79,4 +79,7 @@
     global debugger
     if debugger:
         debugger.startDebugger(enableTrace = enableTrace, exceptions = exceptions, 
-            tracePython = tracePython, redirect = redirect)
\ No newline at end of file
+            tracePython = tracePython, redirect = redirect)
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python/getpass.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python/getpass.py	Wed Jan 05 16:22:18 2011 +0100
@@ -49,3 +49,6 @@
 unix_getpass = getpass
 win_getpass = getpass
 default_getpass = getpass
+
+#
+# eflag: FileType = Python2
--- a/DebugClients/Python3/DebugClientBase.py	Wed Jan 05 16:21:11 2011 +0100
+++ b/DebugClients/Python3/DebugClientBase.py	Wed Jan 05 16:22:18 2011 +0100
@@ -20,7 +20,7 @@
 
 from DebugProtocol import *
 import DebugClientCapabilities
-from DebugBase import setRecursionLimit, printerr
+from DebugBase import setRecursionLimit, printerr   # __IGNORE_WARNING__
 from AsyncFile import *
 from DebugConfig import ConfigVarTypeStrings
 from FlexCompleter import Completer
@@ -932,7 +932,7 @@
         @return client capabilities (integer)
         """
         try:
-            import PyProfile
+            import PyProfile    # __IGNORE_WARNING__
             try:
                 del sys.modules['PyProfile']
             except KeyError:

eric ide

mercurial