[pypy-commit] pypy py3k: Terminal functions usually work with bytes strings.

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3k
Changeset: r57460:c494e513a2b0
Date: 2012-09-13 21:58 +0200
http://bitbucket.org/pypy/pypy/changeset/c494e513a2b0/

Log:	Terminal functions usually work with bytes strings.

diff --git a/pypy/module/_minimal_curses/interp_curses.py b/pypy/module/_minimal_curses/interp_curses.py
--- a/pypy/module/_minimal_curses/interp_curses.py
+++ b/pypy/module/_minimal_curses/interp_curses.py
@@ -83,12 +83,12 @@
         return space.w_None
     except curses_error, e:
         raise convert_error(space, e)
-    return space.wrap(result)
+    return space.wrapbytes(result)
 
- at unwrap_spec(s=str)
+ at unwrap_spec(s='bufferstr')
 def tparm(space, s, args_w):
     args = [space.int_w(a) for a in args_w]
     try:
-        return space.wrap(_curses_tparm(s, args))
+        return space.wrapbytes(_curses_tparm(s, args))
     except curses_error, e:
         raise convert_error(space, e)
diff --git a/pypy/module/_minimal_curses/test/test_curses.py b/pypy/module/_minimal_curses/test/test_curses.py
--- a/pypy/module/_minimal_curses/test/test_curses.py
+++ b/pypy/module/_minimal_curses/test/test_curses.py
@@ -51,7 +51,7 @@
         source = py.code.Source("""
         import _minimal_curses
         _minimal_curses.setupterm()
-        assert _minimal_curses.tigetstr('cup') == '\x1b[%i%p1%d;%p2%dH'
+        assert _minimal_curses.tigetstr('cup') == b'\x1b[%i%p1%d;%p2%dH'
         print('ok!')
         """)
         f = udir.join("test_tigetstr.py")
@@ -63,7 +63,7 @@
         source = py.code.Source("""
         import _minimal_curses
         _minimal_curses.setupterm()
-        assert _minimal_curses.tparm(_minimal_curses.tigetstr('cup'), 5, 3) == '\033[6;4H'
+        assert _minimal_curses.tparm(_minimal_curses.tigetstr('cup'), 5, 3) == b'\033[6;4H'
         print('ok!')
         """)
         f = udir.join("test_tparm.py")
diff --git a/pypy/module/fcntl/interp_fcntl.py b/pypy/module/fcntl/interp_fcntl.py
--- a/pypy/module/fcntl/interp_fcntl.py
+++ b/pypy/module/fcntl/interp_fcntl.py
@@ -268,7 +268,7 @@
         lltype.free(ll_arg, flavor='raw')
         if rv < 0:
             raise _get_error(space, "ioctl")
-        return space.wrap(arg)
+        return space.wrapbytes(arg)
 
     raise OperationError(space.w_TypeError,
                          space.wrap("int or string or buffer required"))