diff --git a/tests/system/libraries/nvdaRobotLib.py b/tests/system/libraries/nvdaRobotLib.py index 60cf322cfc5..efd50c51ebb 100644 --- a/tests/system/libraries/nvdaRobotLib.py +++ b/tests/system/libraries/nvdaRobotLib.py @@ -63,8 +63,7 @@ def _findDepPath(depFileName, searchPaths): # relative to the python path requiredPythonImportsForSystemTestSpyPackage = [ r"robotremoteserver", - r"SimpleXMLRPCServer", - r"xmlrpclib", + r"xmlrpc", ] def _createNvdaSpyPackage(): diff --git a/tests/system/libraries/systemTestSpy.py b/tests/system/libraries/systemTestSpy.py index 37af4dfe803..f2bc3c31565 100644 --- a/tests/system/libraries/systemTestSpy.py +++ b/tests/system/libraries/systemTestSpy.py @@ -9,7 +9,7 @@ """ import globalPluginHandler import threading -from systemTestUtils import _blockUntilConditionMet +from .systemTestUtils import _blockUntilConditionMet from logHandler import log from time import clock as _timer @@ -64,7 +64,7 @@ def _flattenCommandsSeparatingWithNewline(self, commandArray): def _getJoinedBaseStringsFromCommands(self, speechCommandArray): wsChars = whitespaceMinusSlashN - baseStrings = [c.strip(wsChars) for c in speechCommandArray if isinstance(c, basestring)] + baseStrings = [c.strip(wsChars) for c in speechCommandArray if isinstance(c, str)] return ''.join(baseStrings).strip() # Public methods @@ -95,7 +95,7 @@ def getIndexOfSpeech(self, speech, startFromIndex=0): with threading.Lock(): for index, commands in enumerate(self._nvdaSpeech[startFromIndex:]): index = index + startFromIndex - baseStrings = [c.strip() for c in commands if isinstance(c, basestring)] + baseStrings = [c.strip() for c in commands if isinstance(c, str)] if any(speech in x for x in baseStrings): return index return -1