Skip to content

Python3 and non-latin letters support #10

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Python3 and non-latin letters support #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
651f1cb
python3 bytes/str support
smihael Feb 3, 2022
b5e990f
handle non-latin letters
smihael Feb 3, 2022
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
4 changes: 2 additions & 2 deletions notebook_xterm/terminalclient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ TerminalClient.prototype.receive_data_callback = function(data) {
}

try {
var decoded = atob(data.content.text);
var decoded = decodeURIComponent(escape(window.atob(data.content.text)));
this.term.write(decoded);
}
catch(e) {
Expand All @@ -147,7 +147,7 @@ TerminalClient.prototype.handle_transmit = function(data) {
this.curPollInterval = MIN_POLL_INTERVAL;

// transmit data to the server, but b64 encode it
this.server_exec(PY_TERMINAL_SERVER + '.transmit(b"' + btoa(data) + '")');
this.server_exec(PY_TERMINAL_SERVER + '.transmit(b"' + btoa(unescape(encodeURIComponent(data))) + '")');
}

TerminalClient.prototype.handle_resize = function() {
Expand Down
2 changes: 1 addition & 1 deletion notebook_xterm/terminalserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def receive(self):
data = os.read(self.fd, 8192)
except OSError:
data = b''
sys.stdout.write(base64.b64encode(data))
sys.stdout.write(base64.b64encode(data).decode('utf-8'))

def update_window_size(self, rows, cols):
#notify that the pty size should change to match xterm.js
Expand Down