From 87da34ebf2225a2b7e8ba21a411ee05b3c807ea2 Mon Sep 17 00:00:00 2001
From: Jorgen Stenarson <jorgen.stenarson@bostream.nu>
Date: Sun, 11 Jan 2009 17:53:31 +0100
Subject: [PATCH] Add some ensure_unicode, ensure_str.

---
 pyreadline/console/console.py      | 3 +++
 pyreadline/test/lineeditor_test.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pyreadline/console/console.py b/pyreadline/console/console.py
index 9c645a6..6c9af69 100644
--- a/pyreadline/console/console.py
+++ b/pyreadline/console/console.py
@@ -359,6 +359,7 @@ class Console(object):
 
     def write_plain(self, text, attr=None):
         u'''write text at current cursor position.'''
+        text = ensure_unicode(text)
         log(u'write("%s", %s)' %(text, attr))
         if attr is None:
             attr = self.attr
@@ -373,6 +374,7 @@ class Console(object):
     #Emacs sets the EMACS environment variable
     if os.environ.has_key(u"EMACS"):
         def write_color(self, text, attr=None):
+            text = ensure_str(text)
             junk = c_int(0)
             self.WriteFile(self.hout, text, len(text), byref(junk), None)
             return len(text)
@@ -380,6 +382,7 @@ class Console(object):
 
     # make this class look like a file object
     def write(self, text):
+        text = ensure_unicode(text)
         log(u'write("%s")' % text)
         return self.write_color(text)
 
diff --git a/pyreadline/test/lineeditor_test.py b/pyreadline/test/lineeditor_test.py
index 5ae1f3a..3b1c9a5 100644
--- a/pyreadline/test/lineeditor_test.py
+++ b/pyreadline/test/lineeditor_test.py
@@ -387,4 +387,4 @@ def get_mark_pos(mstr):
 if __name__ == u'__main__':
     unittest.main()
 
-    l=lineobj.ReadLineTextBuffer(u"First Second Third")
\ No newline at end of file
+    l=lineobj.ReadLineTextBuffer(u"First Second Third")