feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Fixed an error "SyntaxError: 'return' with argument inside generator" for PIO Unified Debugger when Python 2.7 is used

Browse Source
This commit is contained in:
Ivan Kravets
2020-03-20 13:01:33 +02:00
parent 4b62af1675
commit 6b2ff04bbf
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY.rst
View File

@ -6,6 +6,11 @@ Release Notes
PlatformIO Core 4 PlatformIO Core 4
----------------- -----------------
4.3.1 (2020-??-??)
~~~~~~~~~~~~~~~~~~
* Fixed a "SyntaxError: 'return' with argument inside generator" for PIO Unified Debugger when Python 2.7 is used
4.3.0 (2020-03-19) 4.3.0 (2020-03-19)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~

8
platformio/commands/debug/server.py
View File

@ -42,11 +42,11 @@ class DebugServer(BaseProcess):
systype = util.get_systype() systype = util.get_systype()
server = self.debug_options.get("server") server = self.debug_options.get("server")
if not server: if not server:
return None defer.returnValue(None)
server = self.apply_patterns(server, patterns) server = self.apply_patterns(server, patterns)
server_executable = server["executable"] server_executable = server["executable"]
if not server_executable: if not server_executable:
return None defer.returnValue(None)
if server["cwd"]: if server["cwd"]:
server_executable = join(server["cwd"], server_executable) server_executable = join(server["cwd"], server_executable)
if ( if (
@ -83,7 +83,7 @@ class DebugServer(BaseProcess):
) )
self._debug_port = '| "%s" %s' % (server_executable, str_args) self._debug_port = '| "%s" %s' % (server_executable, str_args)
self._debug_port = fs.to_unix_path(self._debug_port) self._debug_port = fs.to_unix_path(self._debug_port)
return self._debug_port defer.returnValue(self._debug_port)
env = os.environ.copy() env = os.environ.copy()
# prepend server "lib" folder to LD path # prepend server "lib" folder to LD path
@ -120,7 +120,7 @@ class DebugServer(BaseProcess):
yield self._wait_until_ready() yield self._wait_until_ready()
return self._debug_port defer.returnValue(self._debug_port)
@defer.inlineCallbacks @defer.inlineCallbacks
def _wait_until_ready(self): def _wait_until_ready(self):