Author: Antonio Cuni <anto.c...@gmail.com>
Branch: py3k
Changeset: r53803:ae43b9af1094
Date: 2012-03-19 16:34 +0100
http://bitbucket.org/pypy/pypy/changeset/ae43b9af1094/
Log: merge heads
diff --git a/pypy/module/_continuation/test/test_generator.py
b/pypy/module/_continuation/test/test_generator.py
--- a/pypy/module/_continuation/test/test_generator.py
+++ b/pypy/module/_continuation/test/test_generator.py
@@ -22,7 +22,7 @@
assert res == 24
res = next(g)
assert res == 13
- raises(StopIteration, g.__next__)
+ raises(StopIteration, next, g)
def test_iterator(self):
from _continuation import generator
@@ -67,4 +67,4 @@
g = f(10)
res = next(g)
assert res == 11
- raises(TypeError, g.__next__)
+ raises(TypeError, next, g)
diff --git a/pypy/module/cpyext/pyfile.py b/pypy/module/cpyext/pyfile.py
--- a/pypy/module/cpyext/pyfile.py
+++ b/pypy/module/cpyext/pyfile.py
@@ -4,9 +4,6 @@
from pypy.module.cpyext.pyobject import PyObject, borrow_from
from pypy.module.cpyext.object import Py_PRINT_RAW
from pypy.interpreter.error import OperationError
-from pypy.module._file.interp_file import W_File
-
-PyFile_Check, PyFile_CheckExact = build_type_checkers("File", W_File)
@cpython_api([PyObject, rffi.INT_real], PyObject)
def PyFile_GetLine(space, w_obj, n):
diff --git a/pypy/module/cpyext/unicodeobject.py
b/pypy/module/cpyext/unicodeobject.py
--- a/pypy/module/cpyext/unicodeobject.py
+++ b/pypy/module/cpyext/unicodeobject.py
@@ -11,7 +11,6 @@
PyObject, PyObjectP, Py_DecRef, make_ref, from_ref, track_reference,
make_typedescr, get_typedescr)
from pypy.module.cpyext.stringobject import PyString_Check
-from pypy.module.sys.interp_encoding import setdefaultencoding
from pypy.objspace.std import unicodeobject, unicodetype, stringtype
from pypy.rlib import runicode
from pypy.tool.sourcetools import func_renamer
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
