[pypy-commit] pypy py3k: remove py2 cruft

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r53750:160f2096f2cf
Date: 2012-03-16 22:28 -0700
http://bitbucket.org/pypy/pypy/changeset/160f2096f2cf/

Log:	remove py2 cruft

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