--- a/eric6/Debugger/DebugServer.py Mon Sep 09 18:52:08 2019 +0200
+++ b/eric6/Debugger/DebugServer.py Thu Oct 03 11:12:10 2019 +0200
@@ -7,18 +7,14 @@
Module implementing the debug server.
"""
-from __future__ import unicode_literals
-try:
- str = unicode
-except NameError:
- pass
import os
import sys
from PyQt5.QtCore import pyqtSignal, QModelIndex
-from PyQt5.QtNetwork import QTcpServer, QHostAddress, QHostInfo, \
- QNetworkInterface
+from PyQt5.QtNetwork import (
+ QTcpServer, QHostAddress, QHostInfo, QNetworkInterface
+)
from E5Gui.E5Application import e5App
from E5Gui import E5MessageBox
@@ -185,10 +181,10 @@
# create our models
self.breakpointModel = BreakPointModel(self)
self.watchpointModel = WatchPointModel(self)
- self.watchSpecialCreated = \
- self.tr("created", "must be same as in EditWatchpointDialog")
- self.watchSpecialChanged = \
- self.tr("changed", "must be same as in EditWatchpointDialog")
+ self.watchSpecialCreated = self.tr(
+ "created", "must be same as in EditWatchpointDialog")
+ self.watchSpecialChanged = self.tr(
+ "changed", "must be same as in EditWatchpointDialog")
self.networkInterface = Preferences.getDebugger("NetworkInterface")
if self.networkInterface == "all":
@@ -197,11 +193,11 @@
hostAddress = QHostAddress("::") # QHostAddress.AnyIPv6)
else:
hostAddress = QHostAddress(self.networkInterface)
- self.networkInterfaceName, self.networkInterfaceIndex = \
- self.__getNetworkInterfaceAndIndex(self.networkInterface)
+ self.networkInterfaceName, self.networkInterfaceIndex = (
+ self.__getNetworkInterfaceAndIndex(self.networkInterface))
- if not preventPassiveDebugging and \
- Preferences.getDebugger("PassiveDbgEnabled"):
+ if (not preventPassiveDebugging and
+ Preferences.getDebugger("PassiveDbgEnabled")):
sock = Preferences.getDebugger("PassiveDbgPort") # default: 42424
self.listen(hostAddress, sock)
self.passive = True
@@ -217,17 +213,13 @@
self.running = False
self.clientProcess = None
self.clientInterpreter = ""
- self.clientType = \
- Preferences.Prefs.settings.value('DebugClient/Type')
+ self.clientType = Preferences.Prefs.settings.value('DebugClient/Type')
if self.clientType is None:
- if sys.version_info[0] == 2:
- self.clientType = 'Python2'
- else:
- self.clientType = 'Python3'
+ self.clientType = 'Python3'
# Change clientType if dependent interpreter does not exist anymore
# (maybe deinstalled,...)
elif self.clientType == 'Python2' and Preferences.getDebugger(
- "Python2VirtualEnv") == '' and sys.version_info[0] == 3:
+ "Python2VirtualEnv") == '' and sys.version_info[0] >= 3:
self.clientType = 'Python3'
elif self.clientType == 'Python3' and Preferences.getDebugger(
"Python3VirtualEnv") == '' and sys.version_info[0] == 2:
@@ -295,10 +287,10 @@
addressEntries = networkInterface.addressEntries()
if len(addressEntries) > 0:
for addressEntry in addressEntries:
- if addressEntry.ip().toString().lower() == \
- address.lower():
- return networkInterface.humanReadableName(), \
- networkInterface.index()
+ if (addressEntry.ip().toString().lower() ==
+ address.lower()):
+ return (networkInterface.humanReadableName(),
+ networkInterface.index())
return "", 0
@@ -308,8 +300,8 @@
"""
registeredInterfaces = {}
for interfaceName in self.__debuggerInterfaces:
- registeredInterfaces[interfaceName] = \
- self.__debuggerInterfaces[interfaceName]
+ registeredInterfaces[interfaceName] = (
+ self.__debuggerInterfaces[interfaceName])
self.__debuggerInterfaceRegistry = {}
for interfaceName, getRegistryData in registeredInterfaces.items():
@@ -346,8 +338,8 @@
self.__debuggerInterfaces[interfaceName] = getRegistryData
registryDataList = getRegistryData()
if registryDataList:
- for clientLanguage, clientCapabilities, clientExtensions, \
- interfaceCreator in registryDataList:
+ for (clientLanguage, clientCapabilities, clientExtensions,
+ interfaceCreator) in registryDataList:
self.__debuggerInterfaceRegistry[clientLanguage] = [
clientCapabilities, clientExtensions, interfaceCreator,
interfaceName]
@@ -361,8 +353,8 @@
"""
if interfaceName in self.__debuggerInterfaces:
clientLanguages = []
- for clientLanguage, registryData in \
- self.__debuggerInterfaceRegistry.items():
+ for clientLanguage, registryData in (
+ self.__debuggerInterfaceRegistry.items()):
if interfaceName == registryData[-1]:
clientLanguages.append(clientLanguage)
for clientLanguage in clientLanguages:
@@ -412,10 +404,9 @@
pass # it is not in the list
if shellOnly:
- languages = \
- [lang for lang in languages
- if self.__debuggerInterfaceRegistry[lang][0] &
- DebugClientCapabilities.HasShell]
+ languages = [lang for lang in languages
+ if self.__debuggerInterfaceRegistry[lang][0] &
+ DebugClientCapabilities.HasShell]
return languages[:]
@@ -430,7 +421,7 @@
if language in self.__debuggerInterfaceRegistry:
return tuple(self.__debuggerInterfaceRegistry[language][1])
else:
- return tuple()
+ return ()
def __createDebuggerInterface(self, clientType=None):
"""
@@ -442,13 +433,13 @@
if clientType is None:
clientType = self.clientType
if clientType in self.__debuggerInterfaceRegistry:
- self.debuggerInterface = \
+ self.debuggerInterface = (
self.__debuggerInterfaceRegistry[clientType][2](
- self, self.passive)
+ self, self.passive))
else:
- self.debuggerInterface = \
+ self.debuggerInterface = (
self.__debuggerInterfaceRegistry["None"][2](
- self, self.passive)
+ self, self.passive))
self.clientType = "None"
def __setClientType(self, clType):
@@ -509,20 +500,20 @@
if forProject:
project = e5App().getObject("Project")
if not project.isDebugPropertiesLoaded():
- self.clientProcess, isNetworked, clientInterpreter = \
+ self.clientProcess, isNetworked, clientInterpreter = (
self.debuggerInterface.startRemote(
self.serverPort(), runInConsole, venvName,
- self.__originalPathString, workingDir=workingDir)
+ self.__originalPathString, workingDir=workingDir))
else:
- self.clientProcess, isNetworked, clientInterpreter = \
+ self.clientProcess, isNetworked, clientInterpreter = (
self.debuggerInterface.startRemoteForProject(
self.serverPort(), runInConsole, venvName,
- self.__originalPathString, workingDir=workingDir)
+ self.__originalPathString, workingDir=workingDir))
else:
- self.clientProcess, isNetworked, clientInterpreter = \
+ self.clientProcess, isNetworked, clientInterpreter = (
self.debuggerInterface.startRemote(
self.serverPort(), runInConsole, venvName,
- self.__originalPathString, workingDir=workingDir)
+ self.__originalPathString, workingDir=workingDir))
if self.clientProcess:
self.clientProcess.readyReadStandardError.connect(
@@ -590,8 +581,8 @@
if self.debugging:
for row in range(start, end + 1):
index = self.breakpointModel.index(row, 0, parentIndex)
- fn, lineno = \
- self.breakpointModel.getBreakPointByIndex(index)[0:2]
+ fn, lineno = (
+ self.breakpointModel.getBreakPointByIndex(index)[0:2])
self.remoteBreakpoint(fn, lineno, False)
def __changeBreakPoints(self, startIndex, endIndex):
@@ -628,8 +619,8 @@
if self.debugging:
for row in range(start, end + 1):
index = self.breakpointModel.index(row, 0, parentIndex)
- fn, line, cond, temp, enabled, ignorecount = \
- self.breakpointModel.getBreakPointByIndex(index)[:6]
+ fn, line, cond, temp, enabled, ignorecount = (
+ self.breakpointModel.getBreakPointByIndex(index)[:6])
self.remoteBreakpoint(fn, line, True, cond, temp)
if not enabled:
self.__remoteBreakpointEnable(fn, line, False)
@@ -695,8 +686,8 @@
if self.debugging:
for row in range(start, end + 1):
index = self.watchpointModel.index(row, 0, parentIndex)
- cond, special = \
- self.watchpointModel.getWatchPointByIndex(index)[0:2]
+ cond, special = (
+ self.watchpointModel.getWatchPointByIndex(index)[0:2])
cond = self.__makeWatchCondition(cond, special)
self.__remoteWatchpoint(cond, False)
@@ -723,8 +714,8 @@
if self.debugging:
for row in range(start, end + 1):
index = self.watchpointModel.index(row, 0, parentIndex)
- cond, special, temp, enabled, ignorecount = \
- self.watchpointModel.getWatchPointByIndex(index)[:5]
+ cond, special, temp, enabled, ignorecount = (
+ self.watchpointModel.getWatchPointByIndex(index)[:5])
cond = self.__makeWatchCondition(cond, special)
self.__remoteWatchpoint(cond, True, temp)
if not enabled:
