[pypy-svn] r19032 - in pypy/dist/pypy/rpython: . lltypesystem ootypesystem

mwh at codespeak.net mwh at codespeak.net
Wed Oct 26 20:10:49 CEST 2005


Author: mwh
Date: Wed Oct 26 20:10:42 2005
New Revision: 19032

Modified:
   pypy/dist/pypy/rpython/callparse.py
   pypy/dist/pypy/rpython/llinterp.py
   pypy/dist/pypy/rpython/lltypesystem/lltype.py
   pypy/dist/pypy/rpython/lltypesystem/rclass.py
   pypy/dist/pypy/rpython/normalizecalls.py
   pypy/dist/pypy/rpython/ootypesystem/ootype.py
   pypy/dist/pypy/rpython/raddress.py
   pypy/dist/pypy/rpython/rbool.py
   pypy/dist/pypy/rpython/rbuiltin.py
   pypy/dist/pypy/rpython/rclass.py
   pypy/dist/pypy/rpython/rdict.py
   pypy/dist/pypy/rpython/rexternalobj.py
   pypy/dist/pypy/rpython/rfloat.py
   pypy/dist/pypy/rpython/rint.py
   pypy/dist/pypy/rpython/rlist.py
   pypy/dist/pypy/rpython/rmodel.py
   pypy/dist/pypy/rpython/robject.py
   pypy/dist/pypy/rpython/rpbc.py
   pypy/dist/pypy/rpython/rptr.py
   pypy/dist/pypy/rpython/rrange.py
   pypy/dist/pypy/rpython/rslice.py
   pypy/dist/pypy/rpython/rspecialcase.py
   pypy/dist/pypy/rpython/rstr.py
   pypy/dist/pypy/rpython/rtuple.py
   pypy/dist/pypy/rpython/rtyper.py
Log:
importfun suggestions for rpython/


Modified: pypy/dist/pypy/rpython/callparse.py
==============================================================================
--- pypy/dist/pypy/rpython/callparse.py	(original)
+++ pypy/dist/pypy/rpython/callparse.py	Wed Oct 26 20:10:42 2005
@@ -2,7 +2,7 @@
 from pypy.interpreter.argument import Arguments, ArgErr
 from pypy.annotation import model as annmodel
 from pypy.rpython import rtuple
-from pypy.rpython.rmodel import TyperError
+from pypy.rpython.error import TyperError
 
 class CallPatternTooComplex(TyperError):
     pass

Modified: pypy/dist/pypy/rpython/llinterp.py
==============================================================================
--- pypy/dist/pypy/rpython/llinterp.py	(original)
+++ pypy/dist/pypy/rpython/llinterp.py	Wed Oct 26 20:10:42 2005
@@ -1,11 +1,8 @@
-from pypy.translator.translator import Translator
-from pypy.tool.sourcetools import compile2
 from pypy.objspace.flow.model import Constant, Variable, last_exception
 from pypy.rpython.rarithmetic import intmask, r_uint, ovfcheck
 from pypy.rpython.lltypesystem import lltype
 from pypy.rpython.rmodel import getfunctionptr
 from pypy.rpython.memory import lladdress
-from pypy.rpython.objectmodel import free_non_gc_object
 from pypy.rpython.ootypesystem import ootype
 
 import math

Modified: pypy/dist/pypy/rpython/lltypesystem/lltype.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/lltype.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/lltype.py	Wed Oct 26 20:10:42 2005
@@ -1,4 +1,4 @@
-import weakref, operator
+import weakref
 import py
 from pypy.rpython.rarithmetic import r_uint
 from pypy.tool.uid import Hashable
@@ -1006,17 +1006,4 @@
     func._type_method = True
     return func
     
-# FIXME
-__all__ = ['Array', 'Bool', 'Char', 'ContainerType', 'Float',
-'ForwardReference', 'FuncType', 'GC_CONTAINER', 'GcArray', 'GcForwardReference',
-'GcStruct', 'Hashable', 'InvalidCast', 'LowLevelType', 'NoneType', 'OpaqueType',
-'Primitive', 'Ptr', 'PyObject', 'PyObjectType', 'RuntimeTypeInfo', 'Signed',
-'Struct', 'TLS', 'UniChar', 'Unsigned', 'Void', '_array', '_castdepth',
-'_expose', '_func', '_opaque', '_parentable', '_ptr', '_pyobject', '_struct',
-'_struct_variety', 'attachRuntimeTypeInfo', 'cast_pointer', 'cast_ptr_to_int',
-'castable', 'flavored_malloc', 'frozendict', 'functionptr',
-'getRuntimeTypeInfo', 'log', 'malloc', 'nullptr', 'opaqueptr', 'operator',
-'parentlink', 'py', 'pyobjectptr', 'r_uint', 'runtime_type_info', 'safe_equal',
-'saferecursive', 'tlsobject', 'typeOf', 'weakref', 'isCompatibleType',
-'typeMethod']
 

Modified: pypy/dist/pypy/rpython/lltypesystem/rclass.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rclass.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rclass.py	Wed Oct 26 20:10:42 2005
@@ -1,10 +1,9 @@
 import sys
 import types
 from pypy.annotation.pairtype import pairtype, pair
-from pypy.annotation import model as annmodel
-from pypy.annotation.classdef import isclassdef
 from pypy.objspace.flow.model import Constant
-from pypy.rpython.rmodel import Repr, TyperError, inputconst, warning, needsgc
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import Repr, inputconst, warning
 from pypy.rpython.rclass import AbstractClassRepr,\
                                 AbstractInstanceRepr,\
                                 MissingRTypeAttribute,\

Modified: pypy/dist/pypy/rpython/normalizecalls.py
==============================================================================
--- pypy/dist/pypy/rpython/normalizecalls.py	(original)
+++ pypy/dist/pypy/rpython/normalizecalls.py	Wed Oct 26 20:10:42 2005
@@ -2,11 +2,12 @@
 import types
 import inspect
 from pypy.objspace.flow.model import Variable, Constant, Block, Link
-from pypy.objspace.flow.model import SpaceOperation, checkgraph
+from pypy.objspace.flow.model import checkgraph
 from pypy.annotation import model as annmodel
 from pypy.tool.sourcetools import has_varargs, valid_identifier
 from pypy.tool.sourcetools import func_with_new_name
-from pypy.rpython.rmodel import TyperError, needsgc
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import needsgc
 from pypy.rpython.objectmodel import instantiate
 
 

Modified: pypy/dist/pypy/rpython/ootypesystem/ootype.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/ootype.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/ootype.py	Wed Oct 26 20:10:42 2005
@@ -1,9 +1,3 @@
-import weakref, operator
-import py
-from pypy.rpython.rarithmetic import r_uint
-from pypy.tool.uid import Hashable
-from pypy.tool.tls import tlsobject
-from types import NoneType
 from pypy.rpython.lltypesystem.lltype import LowLevelType, Signed, Unsigned, Float, Char
 from pypy.rpython.lltypesystem.lltype import Bool, Void, UniChar, typeOf, Primitive
 from pypy.rpython.lltypesystem.lltype import frozendict

Modified: pypy/dist/pypy/rpython/raddress.py
==============================================================================
--- pypy/dist/pypy/rpython/raddress.py	(original)
+++ pypy/dist/pypy/rpython/raddress.py	Wed Oct 26 20:10:42 2005
@@ -1,8 +1,8 @@
 # rtyping of memory address operations
 from pypy.annotation.pairtype import pairtype
 from pypy.annotation import model as annmodel
-from pypy.rpython.memory.lladdress import address, NULL, Address
-from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, inputconst
+from pypy.rpython.memory.lladdress import NULL, Address
+from pypy.rpython.rmodel import Repr, IntegerRepr
 from pypy.rpython.lltypesystem import lltype
 
 class __extend__(annmodel.SomeAddress):

Modified: pypy/dist/pypy/rpython/rbool.py
==============================================================================
--- pypy/dist/pypy/rpython/rbool.py	(original)
+++ pypy/dist/pypy/rpython/rbool.py	Wed Oct 26 20:10:42 2005
@@ -1,7 +1,8 @@
 from pypy.annotation.pairtype import pairtype
 from pypy.annotation import model as annmodel
-from pypy.rpython.lltypesystem.lltype import Signed, Unsigned, Bool, Float, pyobjectptr
-from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, BoolRepr
+from pypy.rpython.lltypesystem.lltype import Signed, Unsigned, Bool, Float
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import IntegerRepr, BoolRepr
 from pypy.rpython.robject import PyObjRepr, pyobj_repr
 from pypy.rpython.rmodel import log
 

Modified: pypy/dist/pypy/rpython/rbuiltin.py
==============================================================================
--- pypy/dist/pypy/rpython/rbuiltin.py	(original)
+++ pypy/dist/pypy/rpython/rbuiltin.py	Wed Oct 26 20:10:42 2005
@@ -1,14 +1,13 @@
 from pypy.annotation.pairtype import pairtype
 from pypy.annotation import model as annmodel
+from pypy.objspace.flow.model import Constant
 from pypy.rpython.lltypesystem import lltype
 from pypy.rpython import rarithmetic, objectmodel, rstack
-from pypy.rpython.rtyper import TyperError
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import Repr, IntegerRepr
 from pypy.rpython.rrange import rtype_builtin_range, rtype_builtin_xrange 
-from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, Constant
 from pypy.rpython import rptr
 from pypy.rpython.robject import pyobj_repr
-from pypy.rpython.rfloat import float_repr, FloatRepr
-from pypy.rpython.rbool import bool_repr
 from pypy.rpython.rdict import rtype_r_dict
 from pypy.tool import sourcetools
 

Modified: pypy/dist/pypy/rpython/rclass.py
==============================================================================
--- pypy/dist/pypy/rpython/rclass.py	(original)
+++ pypy/dist/pypy/rpython/rclass.py	Wed Oct 26 20:10:42 2005
@@ -1,10 +1,8 @@
-import sys
 import types
-from pypy.annotation.pairtype import pairtype, pair
 from pypy.annotation import model as annmodel
 from pypy.annotation.classdef import isclassdef
-from pypy.objspace.flow.model import Constant
-from pypy.rpython.rmodel import Repr, TyperError, needsgc
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import Repr, needsgc
 
 def getclassrepr(rtyper, classdef):
     try:

Modified: pypy/dist/pypy/rpython/rdict.py
==============================================================================
--- pypy/dist/pypy/rpython/rdict.py	(original)
+++ pypy/dist/pypy/rpython/rdict.py	Wed Oct 26 20:10:42 2005
@@ -4,7 +4,6 @@
 from pypy.rpython.lltypesystem import lltype
 from pypy.rpython.rarithmetic import r_uint
 from pypy.rpython.objectmodel import hlinvoke
-from pypy.rpython import rlist
 from pypy.rpython import robject
 from pypy.rpython import objectmodel
 from pypy.rpython import rmodel

Modified: pypy/dist/pypy/rpython/rexternalobj.py
==============================================================================
--- pypy/dist/pypy/rpython/rexternalobj.py	(original)
+++ pypy/dist/pypy/rpython/rexternalobj.py	Wed Oct 26 20:10:42 2005
@@ -1,4 +1,3 @@
-from pypy.annotation.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.rpython.lltypesystem import lltype
 from pypy.rpython.rmodel import Repr
@@ -6,7 +5,6 @@
 from pypy.rpython import rbuiltin
 from pypy.rpython.module.support import init_opaque_object
 from pypy.objspace.flow.model import Constant
-from pypy.tool import sourcetools
 
 
 class __extend__(annmodel.SomeExternalObject):

Modified: pypy/dist/pypy/rpython/rfloat.py
==============================================================================
--- pypy/dist/pypy/rpython/rfloat.py	(original)
+++ pypy/dist/pypy/rpython/rfloat.py	Wed Oct 26 20:10:42 2005
@@ -1,12 +1,12 @@
 from pypy.annotation.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.rpython.lltypesystem.lltype import \
-     Signed, Unsigned, Bool, Float, Void, Ptr, \
-     PyObject, Array, Char, functionptr, FuncType, malloc
-from pypy.rpython.rmodel import Repr, TyperError, FloatRepr
-from pypy.rpython.rmodel import IntegerRepr, BoolRepr
+     Signed, Unsigned, Bool, Float, Void
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import FloatRepr
+from pypy.rpython.rmodel import IntegerRepr, BoolRepr, StringRepr
 from pypy.rpython.robject import PyObjRepr, pyobj_repr
-from pypy.rpython.rstr import STR, string_repr
+from pypy.rpython.rstr import string_repr
 from pypy.rpython import rstr
 from pypy.rpython.rmodel import log
 
@@ -81,7 +81,7 @@
     def rtype_ge(_, hop):
         return _rtype_compare_template(hop, 'ge')
 
-class __extend__(pairtype(rstr.StringRepr, FloatRepr)):
+class __extend__(pairtype(StringRepr, FloatRepr)):
     def rtype_mod(_, hop):
         return rstr.do_stringformat(hop, [(hop.args_v[1], hop.args_r[1])])
 

Modified: pypy/dist/pypy/rpython/rint.py
==============================================================================
--- pypy/dist/pypy/rpython/rint.py	(original)
+++ pypy/dist/pypy/rpython/rint.py	Wed Oct 26 20:10:42 2005
@@ -4,10 +4,10 @@
 from pypy.objspace.flow.objspace import op_appendices
 from pypy.rpython.lltypesystem.lltype import Signed, Unsigned, Bool, Float, \
      Void, Char, UniChar, GcArray, malloc, Array, pyobjectptr
-from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, CharRepr, \
-     inputconst
+from pypy.rpython.rmodel import IntegerRepr, inputconst
 from pypy.rpython.robject import PyObjRepr, pyobj_repr
 from pypy.rpython.rarithmetic import intmask, r_uint
+from pypy.rpython.error import TyperError
 from pypy.rpython.rmodel import log
 
 

Modified: pypy/dist/pypy/rpython/rlist.py
==============================================================================
--- pypy/dist/pypy/rpython/rlist.py	(original)
+++ pypy/dist/pypy/rpython/rlist.py	Wed Oct 26 20:10:42 2005
@@ -1,7 +1,8 @@
 from pypy.annotation.pairtype import pairtype, pair
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow.model import Constant
-from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, inputconst
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import Repr, IntegerRepr, inputconst
 from pypy.rpython.rmodel import IteratorRepr, externalvsinternal
 from pypy.rpython.rslice import SliceRepr
 from pypy.rpython.rslice import startstop_slice_repr, startonly_slice_repr

Modified: pypy/dist/pypy/rpython/rmodel.py
==============================================================================
--- pypy/dist/pypy/rpython/rmodel.py	(original)
+++ pypy/dist/pypy/rpython/rmodel.py	Wed Oct 26 20:10:42 2005
@@ -1,10 +1,9 @@
-from pypy.annotation.pairtype import pair, pairtype, extendabletype
+from pypy.annotation.pairtype import pairtype, extendabletype
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow.model import Constant
 from pypy.rpython.lltypesystem.lltype import \
      Void, Bool, Float, Signed, Char, UniChar, \
-     typeOf, LowLevelType, Ptr, PyObject, \
-     FuncType, functionptr, cast_ptr_to_int
+     typeOf, LowLevelType, Ptr, PyObject
 from pypy.rpython.ootypesystem import ootype
 from pypy.rpython.error import TyperError, MissingRTypeOperation 
 

Modified: pypy/dist/pypy/rpython/robject.py
==============================================================================
--- pypy/dist/pypy/rpython/robject.py	(original)
+++ pypy/dist/pypy/rpython/robject.py	Wed Oct 26 20:10:42 2005
@@ -1,8 +1,8 @@
-from pypy.annotation.pairtype import pair, pairtype
+from pypy.annotation.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.rpython.lltypesystem.lltype import \
-     PyObject, Ptr, Void, Bool, pyobjectptr, nullptr
-from pypy.rpython.rmodel import Repr, TyperError, VoidRepr, inputconst
+     PyObject, Ptr, Void, pyobjectptr, nullptr
+from pypy.rpython.rmodel import Repr, VoidRepr, inputconst
 from pypy.rpython import rclass
 from pypy.tool.sourcetools import func_with_new_name
 

Modified: pypy/dist/pypy/rpython/rpbc.py
==============================================================================
--- pypy/dist/pypy/rpython/rpbc.py	(original)
+++ pypy/dist/pypy/rpython/rpbc.py	Wed Oct 26 20:10:42 2005
@@ -1,17 +1,15 @@
 import types
 import sys
-from pypy.annotation.pairtype import pairtype, pair
+from pypy.annotation.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.annotation.classdef import isclassdef
 from pypy.objspace.flow.model import Constant
 from pypy.rpython.lltypesystem.lltype import \
-     typeOf, Void, ForwardReference, Struct, Bool, \
-     Ptr, malloc, nullptr
-from pypy.rpython.rmodel import Repr, TyperError, inputconst, warning
+     typeOf, Void, Bool, nullptr
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import Repr, inputconst
 from pypy.rpython import rclass
 from pypy.rpython import robject
-from pypy.rpython import rtuple
-from pypy.tool.sourcetools import has_varargs
 
 from pypy.rpython import callparse
 

Modified: pypy/dist/pypy/rpython/rptr.py
==============================================================================
--- pypy/dist/pypy/rpython/rptr.py	(original)
+++ pypy/dist/pypy/rpython/rptr.py	Wed Oct 26 20:10:42 2005
@@ -2,8 +2,9 @@
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow import model as flowmodel
 from pypy.rpython.lltypesystem.lltype import \
-     Ptr, _ptr, ContainerType, Void, Signed, Bool, FuncType, typeOf
-from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, inputconst
+     Ptr, ContainerType, Void, Signed, Bool, FuncType, typeOf
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import Repr, IntegerRepr
 
 
 class __extend__(annmodel.SomePtr):

Modified: pypy/dist/pypy/rpython/rrange.py
==============================================================================
--- pypy/dist/pypy/rpython/rrange.py	(original)
+++ pypy/dist/pypy/rpython/rrange.py	Wed Oct 26 20:10:42 2005
@@ -1,9 +1,9 @@
 from pypy.annotation.pairtype import pairtype
-from pypy.annotation import model as annmodel
-from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, IteratorRepr
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import Repr, IntegerRepr, IteratorRepr
 from pypy.rpython.lltypesystem.lltype import Ptr, GcStruct, Signed, malloc, Void
 from pypy.objspace.flow.model import Constant
-from pypy.rpython.rlist import ll_newlist, dum_nocheck, dum_checkidx
+from pypy.rpython.rlist import dum_nocheck, dum_checkidx
 
 # ____________________________________________________________
 #

Modified: pypy/dist/pypy/rpython/rslice.py
==============================================================================
--- pypy/dist/pypy/rpython/rslice.py	(original)
+++ pypy/dist/pypy/rpython/rslice.py	Wed Oct 26 20:10:42 2005
@@ -1,8 +1,7 @@
-from pypy.annotation.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow.model import Constant
-from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr
-import sys
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import Repr
 from pypy.rpython.lltypesystem.lltype import \
      GcStruct, Signed, Ptr, Void, malloc
 

Modified: pypy/dist/pypy/rpython/rspecialcase.py
==============================================================================
--- pypy/dist/pypy/rpython/rspecialcase.py	(original)
+++ pypy/dist/pypy/rpython/rspecialcase.py	Wed Oct 26 20:10:42 2005
@@ -1,8 +1,5 @@
-from pypy.annotation.pairtype import pairtype
-from pypy.annotation import model as annmodel
-from pypy.objspace.flow.model import Constant
-from pypy.rpython import rclass
-from pypy.rpython.rmodel import TyperError, inputconst
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import inputconst
 
 
 def rtype_call_specialcase(hop):

Modified: pypy/dist/pypy/rpython/rstr.py
==============================================================================
--- pypy/dist/pypy/rpython/rstr.py	(original)
+++ pypy/dist/pypy/rpython/rstr.py	Wed Oct 26 20:10:42 2005
@@ -1,9 +1,10 @@
 from weakref import WeakValueDictionary
 from pypy.annotation.pairtype import pairtype
 from pypy.annotation import model as annmodel
-from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, IteratorRepr
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import IntegerRepr, IteratorRepr
 from pypy.rpython.rmodel import StringRepr, CharRepr, inputconst, UniCharRepr
-from pypy.rpython.rarithmetic import intmask, _hash_string
+from pypy.rpython.rarithmetic import _hash_string
 from pypy.rpython.robject import PyObjRepr, pyobj_repr
 from pypy.rpython.rtuple import TupleRepr
 from pypy.rpython import rint
@@ -12,7 +13,7 @@
 from pypy.rpython.rslice import minusone_slice_repr
 from pypy.rpython.lltypesystem.lltype import \
      GcStruct, Signed, Array, Char, Ptr, malloc, \
-     Bool, Void, GcArray, nullptr, typeOf, pyobjectptr
+     Bool, Void, GcArray, nullptr, pyobjectptr
 
 
 # ____________________________________________________________

Modified: pypy/dist/pypy/rpython/rtuple.py
==============================================================================
--- pypy/dist/pypy/rpython/rtuple.py	(original)
+++ pypy/dist/pypy/rpython/rtuple.py	Wed Oct 26 20:10:42 2005
@@ -1,7 +1,8 @@
 from pypy.annotation.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow.model import Constant
-from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, inputconst
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import Repr, IntegerRepr, inputconst
 from pypy.rpython.rmodel import IteratorRepr
 from pypy.rpython.robject import PyObjRepr, pyobj_repr
 from pypy.rpython.lltypesystem.lltype import \

Modified: pypy/dist/pypy/rpython/rtyper.py
==============================================================================
--- pypy/dist/pypy/rpython/rtyper.py	(original)
+++ pypy/dist/pypy/rpython/rtyper.py	Wed Oct 26 20:10:42 2005
@@ -12,11 +12,11 @@
 """
 
 from __future__ import generators
-import sys, os
+import os
 import py
 from pypy.annotation.pairtype import pair
 from pypy.annotation import model as annmodel
-from pypy.objspace.flow.model import Variable, Constant, Block, Link
+from pypy.objspace.flow.model import Variable, Constant
 from pypy.objspace.flow.model import SpaceOperation, last_exception
 from pypy.rpython.lltypesystem.lltype import \
      Signed, Unsigned, Float, Char, Bool, Void, \
@@ -24,11 +24,10 @@
      FuncType, functionptr, typeOf, RuntimeTypeInfo, \
      attachRuntimeTypeInfo, Primitive
 from pypy.rpython.ootypesystem import ootype
-from pypy.tool.sourcetools import func_with_new_name, valid_identifier
 from pypy.translator.unsimplify import insert_empty_block
 from pypy.translator.transform import insert_stackcheck
-from pypy.rpython.rmodel import Repr, inputconst
-from pypy.rpython.rmodel import TyperError, BrokenReprTyperError
+from pypy.rpython.error import TyperError
+from pypy.rpython.rmodel import Repr, inputconst, BrokenReprTyperError
 from pypy.rpython.rmodel import warning
 from pypy.rpython.normalizecalls import perform_normalizations
 from pypy.rpython.annlowlevel import annotate_lowlevel_helper
@@ -812,7 +811,7 @@
 # and the rtyper_chooserepr() methods
 from pypy.rpython import robject
 from pypy.rpython import rint, rbool, rfloat
-from pypy.rpython import rslice
+from pypy.rpython import rslice, rrange
 from pypy.rpython import rlist, rstr, rtuple, rdict 
 from pypy.rpython import rclass, rbuiltin, rpbc, rspecialcase
 from pypy.rpython import rexternalobj



More information about the Pypy-commit mailing list