Author: Ronny Pfannschmidt <[email protected]>
Branch: py3k-readline
Changeset: r207:3400dcbc7022
Date: 2013-01-15 11:48 +0100
http://bitbucket.org/pypy/pyrepl/changeset/3400dcbc7022/
Log: take in changes from pypy
diff --git a/pyrepl/readline.py b/pyrepl/readline.py
--- a/pyrepl/readline.py
+++ b/pyrepl/readline.py
@@ -185,7 +185,7 @@
def __init__(self):
self.f_in = os.dup(0)
- self.f_ut = os.dup(1)
+ self.f_out = os.dup(1)
def get_reader(self):
if self.reader is None:
@@ -241,7 +241,7 @@
try:
return unicode(line, ENCODING)
except UnicodeDecodeError: # bah, silently fall back...
- return unicode(line, 'utf-8')
+ return unicode(line, 'utf-8', 'replace')
def get_history_length(self):
return self.saved_history_length
diff --git a/pyrepl/unix_console.py b/pyrepl/unix_console.py
--- a/pyrepl/unix_console.py
+++ b/pyrepl/unix_console.py
@@ -477,7 +477,7 @@
if iscode:
self.__tputs(text)
else:
- os.write(self.output_fd, text.encode(self.encoding))
+ os.write(self.output_fd, text.encode(self.encoding, 'replace'))
del self.__buffer[:]
def __tputs(self, fmt, prog=delayprog):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
