[pypy-commit] pypy py3k: 2to3

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r68254:422a28c0490d
Date: 2013-11-19 17:44 -0800
http://bitbucket.org/pypy/pypy/changeset/422a28c0490d/

Log:	2to3

diff --git a/pypy/module/cpyext/test/test_getargs.py b/pypy/module/cpyext/test/test_getargs.py
--- a/pypy/module/cpyext/test/test_getargs.py
+++ b/pypy/module/cpyext/test/test_getargs.py
@@ -174,7 +174,7 @@
             if (!PyArg_ParseTuple(args, "s#", &buf, &y)) {
                 return NULL;
             }
-            return PyInt_FromSsize_t(y);
+            return PyLong_FromSsize_t(y);
             ''')
         if sys.maxsize < 2**32:
             expected = 5
@@ -182,7 +182,7 @@
             expected = -0xfffffffb
         else:
             expected = 0x5ffffffff
-        assert charbuf('12345') == expected
+        assert charbuf(b'12345') == expected
 
     def test_pyarg_parse_with_py_ssize_t(self):
         charbuf = self.import_parser(
@@ -192,6 +192,6 @@
             if (!PyArg_ParseTuple(args, "s#", &buf, &y)) {
                 return NULL;
             }
-            return PyInt_FromSsize_t(y);
+            return PyLong_FromSsize_t(y);
             ''', PY_SSIZE_T_CLEAN=True)
-        assert charbuf('12345') == 5
+        assert charbuf(b'12345') == 5