Mercurial Repositories > eric / changeset

--- a/DebugClients/Python2/AsyncIO.py	Sat Sep 03 18:12:12 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2002 - 2016 Detlev Offenbach <detlev@die-offenbachs.de>
-#
-
-"""
-Module implementing a base class of an asynchronous interface for the debugger.
-"""
-
-# TODO: delete this file
-class AsyncIO(object):
-    """
-    Class implementing asynchronous reading and writing.
-    """
-    def __init__(self):
-        """
-        Constructor
-        """
-        # There is no connection yet.
-        self.disconnect()
-
-    def disconnect(self):
-        """
-        Public method to disconnect any current connection.
-        """
-        self.readfd = None
-        self.writefd = None
-
-    def setDescriptors(self, rfd, wfd):
-        """
-        Public method called to set the descriptors for the connection.
-        
-        @param rfd file descriptor of the input file (int)
-        @param wfd file descriptor of the output file (int)
-        """
-        self.rbuf = ''
-        self.readfd = rfd
-
-        self.wbuf = ''
-        self.writefd = wfd
-
-    def readReady(self, fd):
-        """
-        Public method called when there is data ready to be read.
-        
-        @param fd file descriptor of the file that has data to be read (int)
-        """
-        try:
-            got = self.readfd.readline_p()
-        except Exception:
-            return
-
-        if len(got) == 0:
-            self.sessionClose()
-            return
-
-        self.rbuf = self.rbuf + got
-
-        # Call handleLine for the line if it is complete.
-        eol = self.rbuf.find('\n')
-
-        while eol >= 0:
-            s = self.rbuf[:eol + 1]
-            self.rbuf = self.rbuf[eol + 1:]
-            self.handleLine(s)
-            eol = self.rbuf.find('\n')
-
-    def writeReady(self, fd):
-        """
-        Public method called when we are ready to write data.
-        
-        @param fd file descriptor of the file that has data to be written (int)
-        """
-        self.writefd.write(self.wbuf)
-        self.writefd.flush()
-        self.wbuf = ''
-
-    def write(self, s):
-        """
-        Public method to write a string.
-        
-        @param s the data to be written (string)
-        """
-        self.wbuf = self.wbuf + s
-
-#
-# eflag: FileType = Python2
-# eflag: noqa = M601, M702

--- a/DebugClients/Python2/DebugBase.py	Sat Sep 03 18:12:12 2016 +0200
+++ b/DebugClients/Python2/DebugBase.py	Sat Sep 03 18:24:50 2016 +0200
@@ -640,8 +640,8 @@
             fr = frame
             while (fr is not None and
                    fr.f_code not in [
-                        self._dbgClient.handleLine.func_code,
-                        self._dbgClient.handleJsonCommand.func_code]):
+                    self._dbgClient.handleLine.func_code,
+                    self._dbgClient.handleJsonCommand.func_code]):
                 self._dbgClient.mainFrame = fr
                 fr = fr.f_back
 

--- a/DebugClients/Python2/DebugClientBase.py	Sat Sep 03 18:12:12 2016 +0200
+++ b/DebugClients/Python2/DebugClientBase.py	Sat Sep 03 18:24:50 2016 +0200
@@ -791,7 +791,6 @@
                     bp.enable()
                 else:
                     bp.disable()
-            
         
         elif method == "RequestBreakpointIgnore":
             params["filename"] = params["filename"].encode(
@@ -875,8 +874,8 @@
                 from coverage import coverage
                 self.cover = coverage(
                     auto_data=True,
-                    data_file="%s.coverage" % \
-                        os.path.splitext(params["coveragefile"])[0])
+                    data_file="%s.coverage" % (
+                        os.path.splitext(params["coveragefile"])[0]))
                 if params["coverageerase"]:
                     self.cover.erase()
             else:

--- a/DebugClients/Python2/DebugProtocol.py	Sat Sep 03 18:12:12 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2002 - 2016 Detlev Offenbach <detlev@die-offenbachs.de>
-#
-
-"""
-Module defining the debug protocol tokens.
-"""
-# TODO: delete this file
-# The address used for debugger/client communications.
-DebugAddress = '127.0.0.1'
-
-# The protocol "words".
-RequestOK = '>OK?<'
-RequestEnv = '>Environment<'
-RequestCapabilities = '>Capabilities<'
-RequestLoad = '>Load<'
-RequestRun = '>Run<'
-RequestCoverage = '>Coverage<'
-RequestProfile = '>Profile<'
-RequestContinue = '>Continue<'
-RequestStep = '>Step<'
-RequestStepOver = '>StepOver<'
-RequestStepOut = '>StepOut<'
-RequestStepQuit = '>StepQuit<'
-RequestBreak = '>Break<'
-RequestBreakEnable = '>EnableBreak<'
-RequestBreakIgnore = '>IgnoreBreak<'
-RequestWatch = '>Watch<'
-RequestWatchEnable = '>EnableWatch<'
-RequestWatchIgnore = '>IgnoreWatch<'
-RequestVariables = '>Variables<'
-RequestVariable = '>Variable<'
-RequestSetFilter = '>SetFilter<'
-RequestThreadList = '>ThreadList<'
-RequestThreadSet = '>ThreadSet<'
-RequestEval = '>Eval<'
-RequestExec = '>Exec<'
-RequestShutdown = '>Shutdown<'
-RequestBanner = '>Banner<'
-RequestCompletion = '>Completion<'
-RequestUTPrepare = '>UTPrepare<'
-RequestUTRun = '>UTRun<'
-RequestUTStop = '>UTStop<'
-RequestForkTo = '>ForkTo<'
-RequestForkMode = '>ForkMode<'
-
-ResponseOK = '>OK<'
-ResponseCapabilities = RequestCapabilities
-ResponseContinue = '>Continue<'
-ResponseException = '>Exception<'
-ResponseSyntax = '>SyntaxError<'
-ResponseSignal = '>Signal<'
-ResponseExit = '>Exit<'
-ResponseLine = '>Line<'
-ResponseRaw = '>Raw<'
-ResponseClearBreak = '>ClearBreak<'
-ResponseBPConditionError = '>BPConditionError<'
-ResponseClearWatch = '>ClearWatch<'
-ResponseWPConditionError = '>WPConditionError<'
-ResponseVariables = RequestVariables
-ResponseVariable = RequestVariable
-ResponseThreadList = RequestThreadList
-ResponseThreadSet = RequestThreadSet
-ResponseStack = '>CurrentStack<'
-ResponseBanner = RequestBanner
-ResponseCompletion = RequestCompletion
-ResponseUTPrepared = '>UTPrepared<'
-ResponseUTStartTest = '>UTStartTest<'
-ResponseUTStopTest = '>UTStopTest<'
-ResponseUTTestFailed = '>UTTestFailed<'
-ResponseUTTestErrored = '>UTTestErrored<'
-ResponseUTTestSkipped = '>UTTestSkipped<'
-ResponseUTTestFailedExpected = '>UTTestFailedExpected<'
-ResponseUTTestSucceededUnexpected = '>UTTestSucceededUnexpected<'
-ResponseUTFinished = '>UTFinished<'
-ResponseForkTo = RequestForkTo
-
-PassiveStartup = '>PassiveStartup<'
-
-RequestCallTrace = '>CallTrace<'
-CallTrace = '>CallTrace<'
-
-EOT = '>EOT<\n'
-
-#
-# eflag: FileType = Python2
-# eflag: noqa = M601, M702

--- a/eric6.e4p	Sat Sep 03 18:12:12 2016 +0200
+++ b/eric6.e4p	Sat Sep 03 18:24:50 2016 +0200
@@ -27,7 +27,6 @@
     <Source>DataViews/PyProfileDialog.py</Source>
     <Source>DataViews/__init__.py</Source>
     <Source>DebugClients/Python2/AsyncFile.py</Source>
-    <Source>DebugClients/Python2/AsyncIO.py</Source>
     <Source>DebugClients/Python2/DCTestResult.py</Source>
     <Source>DebugClients/Python2/DebugBase.py</Source>
     <Source>DebugClients/Python2/DebugClient.py</Source>
@@ -35,7 +34,6 @@
     <Source>DebugClients/Python2/DebugClientCapabilities.py</Source>
     <Source>DebugClients/Python2/DebugClientThreads.py</Source>
     <Source>DebugClients/Python2/DebugConfig.py</Source>
-    <Source>DebugClients/Python2/DebugProtocol.py</Source>
     <Source>DebugClients/Python2/DebugThread.py</Source>
     <Source>DebugClients/Python2/DebugUtilities.py</Source>
     <Source>DebugClients/Python2/FlexCompleter.py</Source>
@@ -1990,7 +1988,6 @@
     <Other>Dictionaries</Other>
     <Other>Documentation/Help</Other>
     <Other>Documentation/Source</Other>
-    <Other>Documentation/Source/eric6.Debugger.DebuggerInterfacePython2.html</Other>
     <Other>Documentation/eric6-plugin.odt</Other>
     <Other>Documentation/eric6-plugin.pdf</Other>
     <Other>Documentation/mod_python.odt</Other>