[pypy-svn] r47315 - in pypy/dist/pypy: annotation annotation/test jit/hintannotator jit/timeshifter rlib rpython rpython/lltypesystem rpython/module rpython/numpy rpython/ootypesystem rpython/rctypes translator/cli

cfbolz at codespeak.net cfbolz at codespeak.net
Mon Oct 8 21:50:53 CEST 2007


Author: cfbolz
Date: Mon Oct  8 21:50:52 2007
New Revision: 47315

Removed:
   pypy/dist/pypy/annotation/pairtype.py
Modified:
   pypy/dist/pypy/annotation/annrpython.py
   pypy/dist/pypy/annotation/binaryop.py
   pypy/dist/pypy/annotation/description.py
   pypy/dist/pypy/annotation/model.py
   pypy/dist/pypy/annotation/test/test_pairtype.py
   pypy/dist/pypy/jit/hintannotator/model.py
   pypy/dist/pypy/jit/timeshifter/hrtyper.py
   pypy/dist/pypy/rlib/rmarshal.py
   pypy/dist/pypy/rpython/controllerentry.py
   pypy/dist/pypy/rpython/lltypesystem/rbuiltin.py
   pypy/dist/pypy/rpython/lltypesystem/rclass.py
   pypy/dist/pypy/rpython/lltypesystem/rdict.py
   pypy/dist/pypy/rpython/lltypesystem/rlist.py
   pypy/dist/pypy/rpython/lltypesystem/rpbc.py
   pypy/dist/pypy/rpython/lltypesystem/rslice.py
   pypy/dist/pypy/rpython/lltypesystem/rstr.py
   pypy/dist/pypy/rpython/lltypesystem/rtuple.py
   pypy/dist/pypy/rpython/module/ll_os_stat.py
   pypy/dist/pypy/rpython/numpy/aarray.py
   pypy/dist/pypy/rpython/numpy/rarray.py
   pypy/dist/pypy/rpython/ootypesystem/rbltregistry.py
   pypy/dist/pypy/rpython/ootypesystem/rclass.py
   pypy/dist/pypy/rpython/ootypesystem/rdict.py
   pypy/dist/pypy/rpython/ootypesystem/rlist.py
   pypy/dist/pypy/rpython/ootypesystem/rootype.py
   pypy/dist/pypy/rpython/ootypesystem/rpbc.py
   pypy/dist/pypy/rpython/raddress.py
   pypy/dist/pypy/rpython/rbool.py
   pypy/dist/pypy/rpython/rbuiltin.py
   pypy/dist/pypy/rpython/rctypes/afunc.py
   pypy/dist/pypy/rpython/rctypes/atype.py
   pypy/dist/pypy/rpython/rctypes/rarray.py
   pypy/dist/pypy/rpython/rctypes/rchar_p.py
   pypy/dist/pypy/rpython/rctypes/rmodel.py
   pypy/dist/pypy/rpython/rctypes/rpointer.py
   pypy/dist/pypy/rpython/rctypes/rprimitive.py
   pypy/dist/pypy/rpython/rctypes/rpyobject.py
   pypy/dist/pypy/rpython/rctypes/rstringbuf.py
   pypy/dist/pypy/rpython/rctypes/rtype.py
   pypy/dist/pypy/rpython/rctypes/rvoid_p.py
   pypy/dist/pypy/rpython/rdict.py
   pypy/dist/pypy/rpython/rexternalobj.py
   pypy/dist/pypy/rpython/rfloat.py
   pypy/dist/pypy/rpython/rgeneric.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/rstr.py
   pypy/dist/pypy/rpython/rtuple.py
   pypy/dist/pypy/rpython/rtyper.py
   pypy/dist/pypy/rpython/typesystem.py
   pypy/dist/pypy/translator/cli/dotnet.py
Log:
continue the move of pypy.annotation.pairtype to pypy.tool.pairtype: fix
imports and kill the import forwarding file.


Modified: pypy/dist/pypy/annotation/annrpython.py
==============================================================================
--- pypy/dist/pypy/annotation/annrpython.py	(original)
+++ pypy/dist/pypy/annotation/annrpython.py	Mon Oct  8 21:50:52 2007
@@ -3,7 +3,7 @@
 from types import ClassType, FunctionType
 from pypy.tool.ansi_print import ansi_log, raise_nicer_exception
 from pypy.annotation import model as annmodel
-from pypy.annotation.pairtype import pair
+from pypy.tool.pairtype import pair
 from pypy.annotation.bookkeeper import Bookkeeper, getbookkeeper
 from pypy.annotation import signature
 from pypy.objspace.flow.model import Variable, Constant

Modified: pypy/dist/pypy/annotation/binaryop.py
==============================================================================
--- pypy/dist/pypy/annotation/binaryop.py	(original)
+++ pypy/dist/pypy/annotation/binaryop.py	Mon Oct  8 21:50:52 2007
@@ -4,7 +4,7 @@
 
 import py
 import operator
-from pypy.annotation.pairtype import pair, pairtype
+from pypy.tool.pairtype import pair, pairtype
 from pypy.annotation.model import SomeObject, SomeInteger, SomeBool, s_Bool
 from pypy.annotation.model import SomeString, SomeChar, SomeList, SomeDict
 from pypy.annotation.model import SomeUnicodeCodePoint

Modified: pypy/dist/pypy/annotation/description.py
==============================================================================
--- pypy/dist/pypy/annotation/description.py	(original)
+++ pypy/dist/pypy/annotation/description.py	Mon Oct  8 21:50:52 2007
@@ -4,7 +4,7 @@
 from pypy.interpreter.argument import rawshape
 from pypy.interpreter.argument import ArgErr
 from pypy.tool.sourcetools import valid_identifier
-from pypy.annotation.pairtype import extendabletype
+from pypy.tool.pairtype import extendabletype
 
 class CallFamily:
     """A family of Desc objects that could be called from common call sites.

Modified: pypy/dist/pypy/annotation/model.py
==============================================================================
--- pypy/dist/pypy/annotation/model.py	(original)
+++ pypy/dist/pypy/annotation/model.py	Mon Oct  8 21:50:52 2007
@@ -30,7 +30,7 @@
 
 from types import BuiltinFunctionType, MethodType, FunctionType
 import pypy.tool.instancemethod
-from pypy.annotation.pairtype import pair, extendabletype
+from pypy.tool.pairtype import pair, extendabletype
 from pypy.tool.tls import tlsobject
 from pypy.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong, base_int
 from pypy.rlib.rarithmetic import r_singlefloat

Modified: pypy/dist/pypy/annotation/test/test_pairtype.py
==============================================================================
--- pypy/dist/pypy/annotation/test/test_pairtype.py	(original)
+++ pypy/dist/pypy/annotation/test/test_pairtype.py	Mon Oct  8 21:50:52 2007
@@ -1,5 +1,5 @@
 
-from pypy.annotation.pairtype import pairtype, pair, extendabletype
+from pypy.tool.pairtype import pairtype, pair, extendabletype
 
 def test_binop(): 
     ### Binary operation example

Modified: pypy/dist/pypy/jit/hintannotator/model.py
==============================================================================
--- pypy/dist/pypy/jit/hintannotator/model.py	(original)
+++ pypy/dist/pypy/jit/hintannotator/model.py	Mon Oct  8 21:50:52 2007
@@ -1,5 +1,5 @@
 from pypy.annotation import model as annmodel
-from pypy.annotation.pairtype import pair, pairtype
+from pypy.tool.pairtype import pair, pairtype
 from pypy.jit.hintannotator.bookkeeper import getbookkeeper
 from pypy.rpython.lltypesystem import lltype, lloperation
 

Modified: pypy/dist/pypy/jit/timeshifter/hrtyper.py
==============================================================================
--- pypy/dist/pypy/jit/timeshifter/hrtyper.py	(original)
+++ pypy/dist/pypy/jit/timeshifter/hrtyper.py	Mon Oct  8 21:50:52 2007
@@ -6,7 +6,7 @@
 from pypy.translator.backendopt.ssa import SSA_to_SSI
 from pypy.annotation import model as annmodel
 from pypy.annotation import listdef
-from pypy.annotation.pairtype import pair, pairtype
+from pypy.tool.pairtype import pair, pairtype
 from pypy.rpython.annlowlevel import PseudoHighLevelCallable
 from pypy.rpython.annlowlevel import cast_instance_to_base_ptr
 from pypy.rpython.annlowlevel import cast_base_ptr_to_instance

Modified: pypy/dist/pypy/rlib/rmarshal.py
==============================================================================
--- pypy/dist/pypy/rlib/rmarshal.py	(original)
+++ pypy/dist/pypy/rlib/rmarshal.py	Mon Oct  8 21:50:52 2007
@@ -5,7 +5,7 @@
 from pypy.annotation import model as annmodel
 from pypy.annotation.signature import annotation
 from pypy.annotation.listdef import ListDef, TooLateForChange
-from pypy.annotation.pairtype import pair, pairtype
+from pypy.tool.pairtype import pair, pairtype
 from pypy.rlib.rarithmetic import formatd, r_longlong, intmask
 from pypy.rlib.rarithmetic import break_up_float, parts_to_float
 from pypy.rlib.unroll import unrolling_iterable

Modified: pypy/dist/pypy/rpython/controllerentry.py
==============================================================================
--- pypy/dist/pypy/rpython/controllerentry.py	(original)
+++ pypy/dist/pypy/rpython/controllerentry.py	Mon Oct  8 21:50:52 2007
@@ -1,5 +1,5 @@
 from pypy.annotation import model as annmodel
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.annotation.bookkeeper import getbookkeeper
 from pypy.rpython.extregistry import ExtRegistryEntry
 from pypy.rpython.annlowlevel import cachedtype

Modified: pypy/dist/pypy/rpython/lltypesystem/rbuiltin.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rbuiltin.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rbuiltin.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.rpython.lltypesystem import lltype
 from pypy.rpython.lltypesystem import rclass

Modified: pypy/dist/pypy/rpython/lltypesystem/rclass.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rclass.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rclass.py	Mon Oct  8 21:50:52 2007
@@ -1,6 +1,6 @@
 import sys
 import types
-from pypy.annotation.pairtype import pairtype, pair
+from pypy.tool.pairtype import pairtype, pair
 from pypy.objspace.flow.model import Constant
 from pypy.rpython.error import TyperError
 from pypy.rpython.rmodel import Repr, inputconst, warning, mangle

Modified: pypy/dist/pypy/rpython/lltypesystem/rdict.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rdict.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rdict.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow.model import Constant
 from pypy.rpython.rdict import AbstractDictRepr, AbstractDictIteratorRepr,\

Modified: pypy/dist/pypy/rpython/lltypesystem/rlist.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rlist.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rlist.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype, pair
+from pypy.tool.pairtype import pairtype, pair
 from pypy.annotation import model as annmodel
 from pypy.rpython.error import TyperError
 from pypy.rpython.rmodel import Repr, IntegerRepr, inputconst

Modified: pypy/dist/pypy/rpython/lltypesystem/rpbc.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rpbc.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rpbc.py	Mon Oct  8 21:50:52 2007
@@ -1,6 +1,6 @@
 import types
 import sys
-from pypy.annotation.pairtype import pairtype, pair
+from pypy.tool.pairtype import pairtype, pair
 from pypy.annotation import model as annmodel
 from pypy.annotation import description
 from pypy.objspace.flow.model import Constant, Variable

Modified: pypy/dist/pypy/rpython/lltypesystem/rslice.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rslice.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rslice.py	Mon Oct  8 21:50:52 2007
@@ -1,7 +1,7 @@
 from pypy.rpython.rslice import AbstractSliceRepr
 from pypy.rpython.lltypesystem.lltype import \
      GcStruct, Signed, Ptr, Void, malloc, PyObject, nullptr
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.rpython.robject import PyObjRepr, pyobj_repr
 from pypy.rpython.rmodel import inputconst, PyObjPtr, IntegerRepr
 

Modified: pypy/dist/pypy/rpython/lltypesystem/rstr.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rstr.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rstr.py	Mon Oct  8 21:50:52 2007
@@ -1,5 +1,5 @@
 from weakref import WeakValueDictionary
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.rpython.error import TyperError
 from pypy.rlib.objectmodel import malloc_zero_filled, we_are_translated
 from pypy.rlib.objectmodel import debug_assert

Modified: pypy/dist/pypy/rpython/lltypesystem/rtuple.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rtuple.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rtuple.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.rpython.rmodel import inputconst
 from pypy.rpython.robject import PyObjRepr, pyobj_repr
 from pypy.rpython.rtuple import AbstractTupleRepr, AbstractTupleIteratorRepr

Modified: pypy/dist/pypy/rpython/module/ll_os_stat.py
==============================================================================
--- pypy/dist/pypy/rpython/module/ll_os_stat.py	(original)
+++ pypy/dist/pypy/rpython/module/ll_os_stat.py	Mon Oct  8 21:50:52 2007
@@ -4,7 +4,7 @@
 """
 import os, sys
 from pypy.annotation import model as annmodel
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.tool.sourcetools import func_with_new_name
 from pypy.rpython import extregistry
 from pypy.rpython.extfunc import register_external

Modified: pypy/dist/pypy/rpython/numpy/aarray.py
==============================================================================
--- pypy/dist/pypy/rpython/numpy/aarray.py	(original)
+++ pypy/dist/pypy/rpython/numpy/aarray.py	Mon Oct  8 21:50:52 2007
@@ -1,5 +1,5 @@
 from pypy.rpython.extregistry import ExtRegistryEntry
-from pypy.annotation.pairtype import pair, pairtype
+from pypy.tool.pairtype import pair, pairtype
 from pypy.annotation.model import SomeExternalObject, SomeList, SomeImpossibleValue
 from pypy.annotation.model import SomeObject, SomeInteger, SomeFloat, SomeString, SomeChar, SomeTuple, SomeSlice
 from pypy.tool.error import AnnotatorError

Modified: pypy/dist/pypy/rpython/numpy/rarray.py
==============================================================================
--- pypy/dist/pypy/rpython/numpy/rarray.py	(original)
+++ pypy/dist/pypy/rpython/numpy/rarray.py	Mon Oct  8 21:50:52 2007
@@ -2,7 +2,7 @@
 from pypy.annotation.model import lltype_to_annotation, SomeObject, SomeInteger
 from pypy.rpython.numpy import aarray
 from pypy.rpython.numpy.aarray import SomeArray
-from pypy.annotation.pairtype import pairtype, pair
+from pypy.tool.pairtype import pairtype, pair
 from pypy.rlib.unroll import unrolling_iterable
 from pypy.annotation import listdef
 from pypy.rlib.objectmodel import debug_assert

Modified: pypy/dist/pypy/rpython/ootypesystem/rbltregistry.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/rbltregistry.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/rbltregistry.py	Mon Oct  8 21:50:52 2007
@@ -3,7 +3,7 @@
 from pypy.rpython.ootypesystem import ootype, bltregistry
 from pypy.rpython.rmodel import Repr
 from pypy.annotation.signature import annotation
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 
     
 class ExternalInstanceRepr(Repr):

Modified: pypy/dist/pypy/rpython/ootypesystem/rclass.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/rclass.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/rclass.py	Mon Oct  8 21:50:52 2007
@@ -7,7 +7,7 @@
 from pypy.rpython.rclass import AbstractClassRepr, AbstractInstanceRepr, \
                                 getinstancerepr, getclassrepr, get_type_repr
 from pypy.rpython.ootypesystem import ootype
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.tool.sourcetools import func_with_new_name
 
 CLASSTYPE = ootype.Instance("Object_meta", ootype.ROOT,

Modified: pypy/dist/pypy/rpython/ootypesystem/rdict.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/rdict.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/rdict.py	Mon Oct  8 21:50:52 2007
@@ -1,5 +1,5 @@
 from pypy.rpython.error import TyperError
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow.model import Constant
 from pypy.rpython.rdict import AbstractDictRepr, AbstractDictIteratorRepr,\

Modified: pypy/dist/pypy/rpython/ootypesystem/rlist.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/rlist.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/rlist.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.rpython.rlist import AbstractBaseListRepr, AbstractListRepr, \
         AbstractListIteratorRepr, rtype_newlist, rtype_alloc_and_set
 from pypy.rpython.rmodel import Repr, IntegerRepr

Modified: pypy/dist/pypy/rpython/ootypesystem/rootype.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/rootype.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/rootype.py	Mon Oct  8 21:50:52 2007
@@ -2,7 +2,7 @@
 from pypy.rpython.rmodel import Repr
 from pypy.rpython.ootypesystem import ootype
 from pypy.rpython.ootypesystem.ootype import Void, Class
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 
 class __extend__(annmodel.SomeOOClass):
     def rtyper_makerepr(self, rtyper):

Modified: pypy/dist/pypy/rpython/ootypesystem/rpbc.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/rpbc.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/rpbc.py	Mon Oct  8 21:50:52 2007
@@ -11,7 +11,7 @@
 from pypy.rpython.ootypesystem.rclass import mangle
 from pypy.annotation import model as annmodel
 from pypy.annotation import description
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.objspace.flow.model import Constant, Variable
 import types
 

Modified: pypy/dist/pypy/rpython/raddress.py
==============================================================================
--- pypy/dist/pypy/rpython/raddress.py	(original)
+++ pypy/dist/pypy/rpython/raddress.py	Mon Oct  8 21:50:52 2007
@@ -1,5 +1,5 @@
 # rtyping of memory address operations
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.rpython.lltypesystem.llmemory import NULL, Address, \
      cast_adr_to_int, fakeaddress

Modified: pypy/dist/pypy/rpython/rbool.py
==============================================================================
--- pypy/dist/pypy/rpython/rbool.py	(original)
+++ pypy/dist/pypy/rpython/rbool.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.rpython.lltypesystem.lltype import Signed, Unsigned, Bool, Float
 from pypy.rpython.error import TyperError

Modified: pypy/dist/pypy/rpython/rbuiltin.py
==============================================================================
--- pypy/dist/pypy/rpython/rbuiltin.py	(original)
+++ pypy/dist/pypy/rpython/rbuiltin.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow.model import Constant
 from pypy.rpython.lltypesystem import lltype, rclass, llmemory

Modified: pypy/dist/pypy/rpython/rctypes/afunc.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/afunc.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/afunc.py	Mon Oct  8 21:50:52 2007
@@ -1,6 +1,6 @@
 from pypy.annotation.model import SomeCTypesObject
 from pypy.annotation import model as annmodel
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.rpython.error import TyperError
 from pypy.rpython.rctypes.implementation import CTypesEntry
 from pypy.rpython.lltypesystem import lltype

Modified: pypy/dist/pypy/rpython/rctypes/atype.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/atype.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/atype.py	Mon Oct  8 21:50:52 2007
@@ -4,7 +4,7 @@
 
 from pypy.annotation.model import SomeCTypesObject
 from pypy.annotation.model import SomeBuiltin, SomeInteger, SomeString
-from pypy.annotation.pairtype import pair, pairtype
+from pypy.tool.pairtype import pair, pairtype
 from pypy.rpython.extregistry import ExtRegistryEntry
 
 

Modified: pypy/dist/pypy/rpython/rctypes/rarray.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/rarray.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/rarray.py	Mon Oct  8 21:50:52 2007
@@ -4,7 +4,7 @@
 from pypy.rpython.rmodel import IntegerRepr, inputconst
 from pypy.rpython.rslice import AbstractSliceRepr
 from pypy.rpython.lltypesystem import lltype
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.rpython.rctypes.rmodel import CTypesRefRepr, CTypesValueRepr
 from pypy.rpython.rctypes.rmodel import genreccopy_arrayitem, reccopy, C_ZERO
 from pypy.rpython.rctypes.rmodel import unsafe_getfield

Modified: pypy/dist/pypy/rpython/rctypes/rchar_p.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/rchar_p.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/rchar_p.py	Mon Oct  8 21:50:52 2007
@@ -6,7 +6,7 @@
 from pypy.rpython.rctypes.rmodel import unsafe_getfield
 from pypy.rpython.rctypes.rarray import ArrayRepr
 from pypy.rpython.rctypes.rstringbuf import StringBufRepr
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 
 from ctypes import c_char, c_char_p, cast
 

Modified: pypy/dist/pypy/rpython/rctypes/rmodel.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/rmodel.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/rmodel.py	Mon Oct  8 21:50:52 2007
@@ -2,7 +2,7 @@
 from pypy.rpython.error import TyperError
 from pypy.rpython.lltypesystem import lltype, llmemory
 from pypy.annotation.model import SomeCTypesObject
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 
 
 class CTypesRepr(Repr):

Modified: pypy/dist/pypy/rpython/rctypes/rpointer.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/rpointer.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/rpointer.py	Mon Oct  8 21:50:52 2007
@@ -1,7 +1,7 @@
 from pypy.rpython.rmodel import IntegerRepr, inputconst
 from pypy.rpython.error import TyperError
 from pypy.rpython.lltypesystem import lltype
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.rpython.rctypes.rmodel import CTypesValueRepr, genreccopy
 from pypy.annotation.model import SomeCTypesObject
 from pypy.objspace.flow.model import Constant

Modified: pypy/dist/pypy/rpython/rctypes/rprimitive.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/rprimitive.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/rprimitive.py	Mon Oct  8 21:50:52 2007
@@ -1,7 +1,7 @@
 from pypy.rpython.rmodel import inputconst
 from pypy.rpython.lltypesystem import lltype
 from pypy.rpython.lltypesystem.rstr import CharRepr, UniCharRepr
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.rpython.rmodel import IntegerRepr, FloatRepr
 from pypy.rpython.error import TyperError
 from pypy.rpython.rctypes.rmodel import CTypesValueRepr

Modified: pypy/dist/pypy/rpython/rctypes/rpyobject.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/rpyobject.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/rpyobject.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.rpython.rmodel import inputconst
 from pypy.rpython.lltypesystem import lltype
 from pypy.rpython.rctypes.rmodel import CTypesValueRepr

Modified: pypy/dist/pypy/rpython/rctypes/rstringbuf.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/rstringbuf.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/rstringbuf.py	Mon Oct  8 21:50:52 2007
@@ -1,5 +1,5 @@
 from pypy.rpython.lltypesystem import lltype
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.rpython.rmodel import IntegerRepr, inputconst
 from pypy.rpython.rctypes.rmodel import CTypesRefRepr
 from pypy.objspace.flow.model import Constant

Modified: pypy/dist/pypy/rpython/rctypes/rtype.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/rtype.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/rtype.py	Mon Oct  8 21:50:52 2007
@@ -1,5 +1,5 @@
 from pypy.objspace.flow.model import Constant
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.rpython.lltypesystem import lltype
 from pypy.rpython.rmodel import Repr, IntegerRepr, inputconst
 from pypy.rpython.error import TyperError

Modified: pypy/dist/pypy/rpython/rctypes/rvoid_p.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/rvoid_p.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/rvoid_p.py	Mon Oct  8 21:50:52 2007
@@ -1,7 +1,7 @@
 from pypy.rpython.rctypes.rmodel import CTypesValueRepr, C_ZERO
 from pypy.rpython.rctypes.rmodel import unsafe_getfield
 from pypy.rpython.rctypes.rstringbuf import StringBufRepr
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.rpython.rstr import AbstractStringRepr
 from pypy.rpython.lltypesystem.rstr import string_repr
 from pypy.rpython.rctypes.rchar_p import CCharPRepr

Modified: pypy/dist/pypy/rpython/rdict.py
==============================================================================
--- pypy/dist/pypy/rpython/rdict.py	(original)
+++ pypy/dist/pypy/rpython/rdict.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow.model import Constant
 from pypy.rpython.lltypesystem import lltype

Modified: pypy/dist/pypy/rpython/rexternalobj.py
==============================================================================
--- pypy/dist/pypy/rpython/rexternalobj.py	(original)
+++ pypy/dist/pypy/rpython/rexternalobj.py	Mon Oct  8 21:50:52 2007
@@ -8,7 +8,7 @@
 from pypy.objspace.flow.model import Constant, Variable
 from pypy.rpython import extregistry
 from pypy.annotation.signature import annotation
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 
 # ExternalObjects
 

Modified: pypy/dist/pypy/rpython/rfloat.py
==============================================================================
--- pypy/dist/pypy/rpython/rfloat.py	(original)
+++ pypy/dist/pypy/rpython/rfloat.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.rpython.lltypesystem.lltype import \
      Signed, Unsigned, SignedLongLong, Bool, Float, Void, pyobjectptr

Modified: pypy/dist/pypy/rpython/rgeneric.py
==============================================================================
--- pypy/dist/pypy/rpython/rgeneric.py	(original)
+++ pypy/dist/pypy/rpython/rgeneric.py	Mon Oct  8 21:50:52 2007
@@ -2,7 +2,7 @@
 from pypy.rpython.rmodel import Repr
 from pypy.rpython.rpbc import AbstractFunctionsPBCRepr,\
      AbstractMethodsPBCRepr
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.rpython.lltypesystem import lltype
 
 class AbstractGenericCallableRepr(Repr):

Modified: pypy/dist/pypy/rpython/rint.py
==============================================================================
--- pypy/dist/pypy/rpython/rint.py	(original)
+++ pypy/dist/pypy/rpython/rint.py	Mon Oct  8 21:50:52 2007
@@ -1,5 +1,5 @@
 import sys
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow.objspace import op_appendices
 from pypy.rpython.lltypesystem.lltype import Signed, Unsigned, Bool, Float, \

Modified: pypy/dist/pypy/rpython/rlist.py
==============================================================================
--- pypy/dist/pypy/rpython/rlist.py	(original)
+++ pypy/dist/pypy/rpython/rlist.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype, pair
+from pypy.tool.pairtype import pairtype, pair
 from pypy.objspace.flow.model import Constant
 from pypy.annotation import model as annmodel
 from pypy.rpython.error import TyperError

Modified: pypy/dist/pypy/rpython/rmodel.py
==============================================================================
--- pypy/dist/pypy/rpython/rmodel.py	(original)
+++ pypy/dist/pypy/rpython/rmodel.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype, extendabletype, pair
+from pypy.tool.pairtype import pairtype, extendabletype, pair
 from pypy.annotation import model as annmodel
 from pypy.annotation import description
 from pypy.objspace.flow.model import Constant

Modified: pypy/dist/pypy/rpython/robject.py
==============================================================================
--- pypy/dist/pypy/rpython/robject.py	(original)
+++ pypy/dist/pypy/rpython/robject.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.rpython.lltypesystem.lltype import \
      PyObject, Ptr, Void, pyobjectptr, nullptr, Bool

Modified: pypy/dist/pypy/rpython/rpbc.py
==============================================================================
--- pypy/dist/pypy/rpython/rpbc.py	(original)
+++ pypy/dist/pypy/rpython/rpbc.py	Mon Oct  8 21:50:52 2007
@@ -1,6 +1,6 @@
 import types
 import sys
-from pypy.annotation.pairtype import pair, pairtype
+from pypy.tool.pairtype import pair, pairtype
 from pypy.annotation import model as annmodel
 from pypy.annotation import description
 from pypy.objspace.flow.model import Constant

Modified: pypy/dist/pypy/rpython/rptr.py
==============================================================================
--- pypy/dist/pypy/rpython/rptr.py	(original)
+++ pypy/dist/pypy/rpython/rptr.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow import model as flowmodel
 from pypy.rpython.lltypesystem import lltype

Modified: pypy/dist/pypy/rpython/rrange.py
==============================================================================
--- pypy/dist/pypy/rpython/rrange.py	(original)
+++ pypy/dist/pypy/rpython/rrange.py	Mon Oct  8 21:50:52 2007
@@ -1,4 +1,4 @@
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.rpython.error import TyperError
 from pypy.rpython.lltypesystem.lltype import Signed, Void, Ptr
 from pypy.rpython.rmodel import Repr, IntegerRepr, IteratorRepr

Modified: pypy/dist/pypy/rpython/rstr.py
==============================================================================
--- pypy/dist/pypy/rpython/rstr.py	(original)
+++ pypy/dist/pypy/rpython/rstr.py	Mon Oct  8 21:50:52 2007
@@ -1,5 +1,5 @@
 from pypy.tool.staticmethods import StaticMethods
-from pypy.annotation.pairtype import pairtype, pair
+from pypy.tool.pairtype import pairtype, pair
 from pypy.annotation import model as annmodel
 from pypy.rpython.error import TyperError
 from pypy.rpython.rmodel import IntegerRepr, IteratorRepr

Modified: pypy/dist/pypy/rpython/rtuple.py
==============================================================================
--- pypy/dist/pypy/rpython/rtuple.py	(original)
+++ pypy/dist/pypy/rpython/rtuple.py	Mon Oct  8 21:50:52 2007
@@ -1,5 +1,5 @@
 import operator
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow.model import Constant
 from pypy.rpython.error import TyperError

Modified: pypy/dist/pypy/rpython/rtyper.py
==============================================================================
--- pypy/dist/pypy/rpython/rtyper.py	(original)
+++ pypy/dist/pypy/rpython/rtyper.py	Mon Oct  8 21:50:52 2007
@@ -14,7 +14,7 @@
 from __future__ import generators
 import os
 import py
-from pypy.annotation.pairtype import pair
+from pypy.tool.pairtype import pair
 from pypy.annotation import model as annmodel
 from pypy.objspace.flow.model import Variable, Constant
 from pypy.objspace.flow.model import SpaceOperation, c_last_exception

Modified: pypy/dist/pypy/rpython/typesystem.py
==============================================================================
--- pypy/dist/pypy/rpython/typesystem.py	(original)
+++ pypy/dist/pypy/rpython/typesystem.py	Mon Oct  8 21:50:52 2007
@@ -1,7 +1,7 @@
 
 """typesystem.py -- Typesystem-specific operations for RTyper."""
 
-from pypy.annotation.pairtype import extendabletype
+from pypy.tool.pairtype import extendabletype
 
 from pypy.rpython.ootypesystem import ootype
 from pypy.rpython.lltypesystem import lltype
@@ -178,7 +178,7 @@
 
 # Multiple dispatch on type system and high-level annotation
 
-from pypy.annotation.pairtype import pairtype
+from pypy.tool.pairtype import pairtype
 from pypy.annotation.model import SomeObject
 
 class __extend__(pairtype(TypeSystem, SomeObject)):

Modified: pypy/dist/pypy/translator/cli/dotnet.py
==============================================================================
--- pypy/dist/pypy/translator/cli/dotnet.py	(original)
+++ pypy/dist/pypy/translator/cli/dotnet.py	Mon Oct  8 21:50:52 2007
@@ -1,6 +1,6 @@
 import types
 
-from pypy.annotation.pairtype import pair, pairtype
+from pypy.tool.pairtype import pair, pairtype
 from pypy.annotation.model import SomeObject, SomeInstance, SomeOOInstance, SomeInteger, s_None,\
      s_ImpossibleValue, lltype_to_annotation, annotation_to_lltype, SomeChar, SomeString, SomePBC
 from pypy.annotation.binaryop import _make_none_union



More information about the Pypy-commit mailing list