Skip to content

Commit 4c8e6b1

Browse files
authored
Merge pull request #59 from fdcastel/fix-issue-58
Remove extra newline in readline_timed().
2 parents 0bb5400 + 151d49d commit 4c8e6b1

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

src/firebird/driver/core.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5723,9 +5723,11 @@ def readline_timed(self, timeout: int) -> str | Sentinel | None:
57235723
data = self.response.read_sized_string(encoding=self.encoding, errors=self.encoding_errors)
57245724
if self.response.get_tag() == SrvInfoCode.TIMEOUT:
57255725
return TIMEOUT
5726-
if data:
5727-
return data + '\n'
5728-
return None
5726+
# read_sized_string() returns lines ending with '\r ' (CR + space).
5727+
# Strip the trailing space to get proper '\r' line endings.
5728+
if data and data.endswith('\r '):
5729+
data = data[:-1] # Remove space, keep '\r'
5730+
return data if data else None
57295731
def readline(self) -> str | None:
57305732
"""Get next line of textual output from last service query.
57315733

0 commit comments

Comments
 (0)