Skip to content

Support multiline function/class definitions in REPL and InteractiveConsole #5743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 3 commits into from
Apr 30, 2025
Merged

Support multiline function/class definitions in REPL and InteractiveConsole #5743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39e0d5e
Support multiline function/class definitions in REPL and InteractiveC…
aneeshdurg Apr 24, 2025
8c4e62f
lint
aneeshdurg Apr 24, 2025
ffb051c
Update Lib/codeop.py
youknowone Apr 30, 2025
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
7 changes: 6 additions & 1 deletion Lib/codeop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,12 @@ def _maybe_compile(compiler, source, filename, symbol):
compiler(source + "\n", filename, symbol)
return None
except SyntaxError as e:
if "incomplete input" in str(e):
# XXX: RustPython; support multiline definitions in REPL
# See also: https://github.com/RustPython/RustPython/pull/5743
strerr = str(e)
Comment thread
youknowone marked this conversation as resolved.
if source.endswith(":") and "expected an indented block" in strerr:
return None
elif "incomplete input" in str(e):
return None
# fallthrough

Expand Down
17 changes: 10 additions & 7 deletions src/shell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,16 @@ fn shell_exec(

let bad_error = match err {
CompileError::Parse(ref p) => {
if matches!(
p.error,
ParseErrorType::Lexical(LexicalErrorType::IndentationError)
) {
continuing // && p.location.is_some()
} else {
true // !matches!(p, ParseErrorType::UnrecognizedToken(Tok::Dedent, _))
match &p.error {
ParseErrorType::Lexical(LexicalErrorType::IndentationError) => continuing, // && p.location.is_some()
ParseErrorType::OtherError(msg) => {
if msg.starts_with("Expected an indented block") {
continuing
} else {
true
}
}
_ => true, // !matches!(p, ParseErrorType::UnrecognizedToken(Tok::Dedent, _))
}
}
_ => true, // It is a bad error for everything else
Expand Down