Skip to content

Remove extra newline in readline_timed(). #59

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
pcisar merged 2 commits into from
Nov 17, 2025
Merged

Remove extra newline in readline_timed(). #59

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78c79f1
Remove extra newline in readline_timed().
fdcastel Nov 17, 2025
151d49d
Remove extra trailing space.
fdcastel Nov 17, 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
8 changes: 5 additions & 3 deletions src/firebird/driver/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5723,9 +5723,11 @@ def readline_timed(self, timeout: int) -> str | Sentinel | None:
data = self.response.read_sized_string(encoding=self.encoding, errors=self.encoding_errors)
if self.response.get_tag() == SrvInfoCode.TIMEOUT:
return TIMEOUT
if data:
return data + '\n'
return None
# read_sized_string() returns lines ending with '\r ' (CR + space).
# Strip the trailing space to get proper '\r' line endings.
if data and data.endswith('\r '):
data = data[:-1] # Remove space, keep '\r'
return data if data else None
def readline(self) -> str | None:
"""Get next line of textual output from last service query.

Expand Down