Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

ls broken after merge of #1089 #1111

Closed
jenshnielsen opened this Issue · 5 comments

3 participants

Jens Hedegaard Nielsen Min RK Matthias Bussonnier
Jens Hedegaard Nielsen

After the merge of #1089 ls in the qtconsole prints blank lines and not the contents of the dir.
On ubuntu 11.10 using python2.7

Min RK
Owner

This affects everything - '\r\n' is not being properly treated as a newline, because the carriage-return action is clearing the line.

Matthias Bussonnier
Owner

Confirmed, on mac os also. Havent done bisect but it's between 2f41c98 and bdcfcc6

Min RK
Owner

It's definitely the carriage return action. '\r' effectively clears a line, so '\r\n' line-endings (which come from pexpect - affecting all system calls on Unix, and all everything on Windows) effectively replace each line with '\n'. The proper action should be to catch '\r', as long as it is not followed by '\n'.

Min RK minrk referenced this issue from a commit
Commit has since been removed from the repository and is no longer available.
Min RK minrk referenced this issue from a commit
Commit has since been removed from the repository and is no longer available.
Min RK
Owner

PR #1118 should fix this

Jens Hedegaard Nielsen

That indeed fixed it and the test passes. Thanks

Min RK minrk referenced this issue from a commit
Commit has since been removed from the repository and is no longer available.
Min RK minrk referenced this issue from a commit
Commit has since been removed from the repository and is no longer available.
Jens Hedegaard Nielsen jenshnielsen referenced this issue from a commit
Commit has since been removed from the repository and is no longer available.
Jens Hedegaard Nielsen jenshnielsen referenced this issue from a commit
Commit has since been removed from the repository and is no longer available.
Min RK minrk closed this issue from a commit
Min RK minrk [qtconsole] carriage-return action matches CR only, not CRLF
CarriageReturn action introduced in #1089 clears a line in the qtconsole, which means that CRLF line endings would replace whole lines with '\n'.

This changes the regex to only match `\r` not followed by `\n` preventing the CR action from firing on CRLF.

Test included

closes #1111
814d5b9
Min RK minrk closed this in 814d5b9
Brian E. Granger ellisonbg referenced this issue from a commit
Commit has since been removed from the repository and is no longer available.
matthew von rocketstein mattvonrocketstein referenced this issue from a commit in mattvonrocketstein/ipython
Min RK minrk [qtconsole] carriage-return action matches CR only, not CRLF
CarriageReturn action introduced in #1089 clears a line in the qtconsole, which means that CRLF line endings would replace whole lines with '\n'.

This changes the regex to only match `\r` not followed by `\n` preventing the CR action from firing on CRLF.

Test included

closes #1111
c061f16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.