Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Forum topic 5740 #417

Merged
merged 4 commits into from
Mar 3, 2020
Merged

Forum topic 5740 #417

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7f173a
Merge pull request #110 from pycom/rc6
peter-pycom Feb 28, 2020
1a12aed
Update pyexec.c
Xykon Mar 2, 2020
e4be1c6
Merge pull request #111 from pycom/forum_topic_5740
Xykon Mar 2, 2020
4461c63
Merge branch 'master' into forum_topic_5740_rel
Xykon Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/utils/pyexec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,13 +491,18 @@ int pyexec_friendly_repl(void) {
} else if (ret == CHAR_CTRL_D) {
// exit for a soft reset
mp_hal_stdout_tx_str("\r\n");
#if (VARIANT == PYBYTES)
if (config_get_pybytes_autostart()) {
continue;
}
else {
vstr_clear(&line);
return PYEXEC_FORCED_EXIT;
}
#else
vstr_clear(&line);
return PYEXEC_FORCED_EXIT;
#endif
} else if (ret == CHAR_CTRL_E) {
// paste mode
mp_hal_stdout_tx_str("\r\npaste mode; Ctrl-C to cancel, Ctrl-D to finish\r\n=== ");
Expand Down