[pypy-commit] pypy split-rpython: Moved pypy.tool.identity_dict and pypy.tool.uid to rpython

[Aquana]

Author: Alexander Hesse <webmaster at aquanasoft.de>
Branch: split-rpython
Changeset: r59700:24e99ed7dda1
Date: 2013-01-02 03:04 +0100
http://bitbucket.org/pypy/pypy/changeset/24e99ed7dda1/

Log:	Moved pypy.tool.identity_dict and pypy.tool.uid to rpython

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -7,7 +7,7 @@
 from pypy.interpreter.argument import Arguments
 from pypy.interpreter.miscutils import ThreadLocals
 from pypy.tool.cache import Cache
-from pypy.tool.uid import HUGEVAL_BYTES
+from rpython.tool.uid import HUGEVAL_BYTES
 from rpython.rlib import jit
 from rpython.rlib.debug import make_sure_not_resized
 from rpython.rlib.objectmodel import we_are_translated, newlist_hint,\
diff --git a/pypy/interpreter/nestedscope.py b/pypy/interpreter/nestedscope.py
--- a/pypy/interpreter/nestedscope.py
+++ b/pypy/interpreter/nestedscope.py
@@ -4,7 +4,7 @@
 from pypy.interpreter.mixedmodule import MixedModule
 from pypy.interpreter.astcompiler import consts
 from rpython.rlib import jit
-from pypy.tool.uid import uid
+from rpython.tool.uid import uid
 
 class Cell(Wrappable):
     "A simple container for a wrapped value."
diff --git a/pypy/module/cpyext/test/test_cpyext.py b/pypy/module/cpyext/test/test_cpyext.py
--- a/pypy/module/cpyext/test/test_cpyext.py
+++ b/pypy/module/cpyext/test/test_cpyext.py
@@ -16,7 +16,7 @@
 from pypy.module.cpyext.pyobject import RefcountState
 from pypy.module.cpyext.pyobject import Py_DecRef, InvalidPointerException
 from rpython.translator.goal import autopath
-from pypy.tool.identity_dict import identity_dict
+from rpython.tool.identity_dict import identity_dict
 from pypy.tool import leakfinder
 
 @api.cpython_api([], api.PyObject)
diff --git a/pypy/tool/algo/graphlib.py b/pypy/tool/algo/graphlib.py
--- a/pypy/tool/algo/graphlib.py
+++ b/pypy/tool/algo/graphlib.py
@@ -6,7 +6,7 @@
   'edges' is a dict mapping vertices to a list of edges with its source.
   Note that we can usually use 'edges' as the set of 'vertices' too.
 """
-from pypy.tool.identity_dict import identity_dict
+from rpython.tool.identity_dict import identity_dict
 
 
 class Edge:
diff --git a/pypy/tool/test/test_identitydict.py b/pypy/tool/test/test_identitydict.py
--- a/pypy/tool/test/test_identitydict.py
+++ b/pypy/tool/test/test_identitydict.py
@@ -1,5 +1,5 @@
 import py
-from pypy.tool.identity_dict import identity_dict, IdentityDictPurePython
+from rpython.tool.identity_dict import identity_dict, IdentityDictPurePython
 
 class TestIdentityDictNative:
     identity_dict = identity_dict
diff --git a/rpython/annotator/bookkeeper.py b/rpython/annotator/bookkeeper.py
--- a/rpython/annotator/bookkeeper.py
+++ b/rpython/annotator/bookkeeper.py
@@ -25,7 +25,7 @@
 from rpython.rtyper.lltypesystem import lltype, llmemory
 from rpython.rtyper.ootypesystem import ootype
 from rpython.rtyper import extregistry
-from pypy.tool.identity_dict import identity_dict
+from rpython.tool.identity_dict import identity_dict
 
 class Stats(object):
 
diff --git a/rpython/annotator/specialize.py b/rpython/annotator/specialize.py
--- a/rpython/annotator/specialize.py
+++ b/rpython/annotator/specialize.py
@@ -1,6 +1,6 @@
 # specialization support
 import py
-from pypy.tool.uid import uid
+from rpython.tool.uid import uid
 from rpython.tool.sourcetools import func_with_new_name
 from pypy.tool.algo.unionfind import UnionFind
 from rpython.flowspace.model import Block, Link, Variable, SpaceOperation
diff --git a/rpython/flowspace/model.py b/rpython/flowspace/model.py
--- a/rpython/flowspace/model.py
+++ b/rpython/flowspace/model.py
@@ -4,7 +4,7 @@
 # the below object/attribute model evolved from
 # a discussion in Berlin, 4th of october 2003
 import py
-from pypy.tool.uid import uid, Hashable
+from rpython.tool.uid import uid, Hashable
 from rpython.tool.sourcetools import PY_IDENTIFIER, nice_repr_for_func
 from rpython.rlib.rarithmetic import is_valid_int, r_longlong, r_ulonglong, r_uint
 
diff --git a/rpython/rlib/unroll.py b/rpython/rlib/unroll.py
--- a/rpython/rlib/unroll.py
+++ b/rpython/rlib/unroll.py
@@ -1,4 +1,4 @@
-from pypy.tool.uid import uid
+from rpython.tool.uid import uid
 
 # Support for explicit specialization: in code using global constants
 # that are instances of SpecTag, code paths are not merged when
diff --git a/rpython/rtyper/extregistry.py b/rpython/rtyper/extregistry.py
--- a/rpython/rtyper/extregistry.py
+++ b/rpython/rtyper/extregistry.py
@@ -1,6 +1,6 @@
 import weakref
 import UserDict
-from pypy.tool.uid import Hashable
+from rpython.tool.uid import Hashable
 
 
 class AutoRegisteringType(type):
diff --git a/rpython/rtyper/lltypesystem/ll2ctypes.py b/rpython/rtyper/lltypesystem/ll2ctypes.py
--- a/rpython/rtyper/lltypesystem/ll2ctypes.py
+++ b/rpython/rtyper/lltypesystem/ll2ctypes.py
@@ -19,7 +19,7 @@
 from rpython.rtyper.lltypesystem import lltype, llmemory
 from rpython.rtyper.extfunc import ExtRegistryEntry
 from rpython.rlib.objectmodel import Symbolic, ComputedIntSymbolic
-from pypy.tool.uid import fixid
+from rpython.tool.uid import fixid
 from rpython.rlib.rarithmetic import r_singlefloat, r_longfloat, base_int, intmask
 from rpython.rlib.rarithmetic import is_emulated_long, maxint
 from rpython.annotator import model as annmodel
diff --git a/rpython/rtyper/lltypesystem/llmemory.py b/rpython/rtyper/lltypesystem/llmemory.py
--- a/rpython/rtyper/lltypesystem/llmemory.py
+++ b/rpython/rtyper/lltypesystem/llmemory.py
@@ -7,7 +7,7 @@
 import weakref
 from rpython.rlib.objectmodel import Symbolic
 from rpython.rtyper.lltypesystem import lltype
-from pypy.tool.uid import uid
+from rpython.tool.uid import uid
 from rpython.rlib.rarithmetic import is_valid_int
 
 
diff --git a/rpython/rtyper/lltypesystem/lltype.py b/rpython/rtyper/lltypesystem/lltype.py
--- a/rpython/rtyper/lltypesystem/lltype.py
+++ b/rpython/rtyper/lltypesystem/lltype.py
@@ -2,7 +2,7 @@
                                    r_ulonglong, r_longlong, r_longfloat, r_longlonglong,
                                    base_int, normalizedinttype, longlongmask, longlonglongmask)
 from rpython.rlib.objectmodel import Symbolic
-from pypy.tool.identity_dict import identity_dict
+from rpython.tool.identity_dict import identity_dict
 from pypy.tool import leakfinder
 from types import NoneType
 from rpython.rlib.rarithmetic import maxint, is_valid_int, is_emulated_long
diff --git a/rpython/rtyper/lltypesystem/rclass.py b/rpython/rtyper/lltypesystem/rclass.py
--- a/rpython/rtyper/lltypesystem/rclass.py
+++ b/rpython/rtyper/lltypesystem/rclass.py
@@ -20,7 +20,7 @@
 from rpython.annotator import model as annmodel
 from rpython.rlib.rarithmetic import intmask
 from rpython.rlib import objectmodel
-from pypy.tool.identity_dict import identity_dict
+from rpython.tool.identity_dict import identity_dict
 from rpython.rtyper.lltypesystem.lloperation import llop
 
 #
diff --git a/rpython/rtyper/lltypesystem/test/test_lltype.py b/rpython/rtyper/lltypesystem/test/test_lltype.py
--- a/rpython/rtyper/lltypesystem/test/test_lltype.py
+++ b/rpython/rtyper/lltypesystem/test/test_lltype.py
@@ -2,7 +2,7 @@
 import py
 from rpython.rtyper.lltypesystem.lltype import *
 from rpython.rtyper.lltypesystem import lltype, rffi
-from pypy.tool.identity_dict import identity_dict
+from rpython.tool.identity_dict import identity_dict
 from pypy.tool import leakfinder
 
 def isweak(p, T):
diff --git a/rpython/rtyper/memory/gctypelayout.py b/rpython/rtyper/memory/gctypelayout.py
--- a/rpython/rtyper/memory/gctypelayout.py
+++ b/rpython/rtyper/memory/gctypelayout.py
@@ -3,7 +3,7 @@
 from rpython.rtyper.lltypesystem.lloperation import llop
 from rpython.rlib.debug import ll_assert
 from rpython.rlib.rarithmetic import intmask
-from pypy.tool.identity_dict import identity_dict
+from rpython.tool.identity_dict import identity_dict
 
 
 class GCData(object):
diff --git a/rpython/rtyper/memory/support.py b/rpython/rtyper/memory/support.py
--- a/rpython/rtyper/memory/support.py
+++ b/rpython/rtyper/memory/support.py
@@ -2,7 +2,7 @@
 from rpython.rlib.objectmodel import free_non_gc_object, we_are_translated
 from rpython.rlib.rarithmetic import r_uint, LONG_BIT
 from rpython.rlib.debug import ll_assert
-from pypy.tool.identity_dict import identity_dict
+from rpython.tool.identity_dict import identity_dict
 
 
 def mangle_hash(i):
diff --git a/rpython/rtyper/ootypesystem/ootype.py b/rpython/rtyper/ootypesystem/ootype.py
--- a/rpython/rtyper/ootypesystem/ootype.py
+++ b/rpython/rtyper/ootypesystem/ootype.py
@@ -7,7 +7,7 @@
 from rpython.rtyper.lltypesystem.lltype import identityhash
 from rpython.rlib.rarithmetic import intmask
 from rpython.rlib import objectmodel
-from pypy.tool.uid import uid
+from rpython.tool.uid import uid
 
 
 STATICNESS = True
diff --git a/rpython/rtyper/ootypesystem/rclass.py b/rpython/rtyper/ootypesystem/rclass.py
--- a/rpython/rtyper/ootypesystem/rclass.py
+++ b/rpython/rtyper/ootypesystem/rclass.py
@@ -10,7 +10,7 @@
 from rpython.rtyper.exceptiondata import standardexceptions
 from rpython.tool.pairtype import pairtype
 from rpython.tool.sourcetools import func_with_new_name
-from pypy.tool.identity_dict import identity_dict
+from rpython.tool.identity_dict import identity_dict
 
 OBJECT = ootype.ROOT
 META = ootype.Instance("Meta", ootype.ROOT,
diff --git a/pypy/tool/identity_dict.py b/rpython/tool/identity_dict.py
rename from pypy/tool/identity_dict.py
rename to rpython/tool/identity_dict.py
diff --git a/pypy/tool/uid.py b/rpython/tool/uid.py
rename from pypy/tool/uid.py
rename to rpython/tool/uid.py
diff --git a/rpython/translator/backendopt/escape.py b/rpython/translator/backendopt/escape.py
--- a/rpython/translator/backendopt/escape.py
+++ b/rpython/translator/backendopt/escape.py
@@ -1,7 +1,7 @@
 from rpython.flowspace.model import Variable
 from rpython.rtyper.lltypesystem import lltype
 from rpython.translator.simplify import get_graph
-from pypy.tool.uid import uid
+from rpython.tool.uid import uid
 
 
 class CreationPoint(object):
diff --git a/rpython/translator/c/database.py b/rpython/translator/c/database.py
--- a/rpython/translator/c/database.py
+++ b/rpython/translator/c/database.py
@@ -15,7 +15,7 @@
 from rpython.translator.c.support import log, barebonearray
 from rpython.translator.c.extfunc import do_the_getting
 from rpython.translator.c import gc
-from pypy.tool.identity_dict import identity_dict
+from rpython.tool.identity_dict import identity_dict
 
 
 class NoCorrespondingNode(Exception):
diff --git a/rpython/translator/c/funcgen.py b/rpython/translator/c/funcgen.py
--- a/rpython/translator/c/funcgen.py
+++ b/rpython/translator/c/funcgen.py
@@ -12,7 +12,7 @@
 from rpython.rtyper.lltypesystem.llmemory import Address
 from rpython.translator.backendopt.ssa import SSI_to_SSA
 from rpython.translator.backendopt.innerloop import find_inner_loops
-from pypy.tool.identity_dict import identity_dict
+from rpython.tool.identity_dict import identity_dict
 
 
 LOCALVAR = 'l_%s'
diff --git a/rpython/translator/oosupport/function.py b/rpython/translator/oosupport/function.py
--- a/rpython/translator/oosupport/function.py
+++ b/rpython/translator/oosupport/function.py
@@ -7,7 +7,7 @@
 from rpython.rtyper.ootypesystem import ootype
 from rpython.translator.oosupport.treebuilder import SubOperation
 from rpython.translator.oosupport.metavm import InstructionList, StoreResult
-from pypy.tool.identity_dict import identity_dict
+from rpython.tool.identity_dict import identity_dict
 
 
 def render_sub_op(sub_op, db, generator):
diff --git a/rpython/translator/tool/graphpage.py b/rpython/translator/tool/graphpage.py
--- a/rpython/translator/tool/graphpage.py
+++ b/rpython/translator/tool/graphpage.py
@@ -5,7 +5,7 @@
 from rpython.annotator.model import SomePBC
 from rpython.annotator.description import MethodDesc
 from rpython.annotator.classdef import ClassDef
-from pypy.tool.uid import uid
+from rpython.tool.uid import uid
 from rpython.tool.udir import udir
 
 from dotviewer.graphpage import GraphPage as BaseGraphPage
diff --git a/rpython/translator/tool/lltracker.py b/rpython/translator/tool/lltracker.py
--- a/rpython/translator/tool/lltracker.py
+++ b/rpython/translator/tool/lltracker.py
@@ -7,8 +7,8 @@
 from rpython.rtyper.lltypesystem import lltype, llmemory
 from rpython.rtyper.memory.gcheader import header2obj
 from rpython.translator.tool.reftracker import BaseRefTrackerPage, MARKER
-from pypy.tool.uid import uid
-from pypy.tool.identity_dict import identity_dict
+from rpython.tool.uid import uid
+from rpython.tool.identity_dict import identity_dict
 
 
 class LLRefTrackerPage(BaseRefTrackerPage):
diff --git a/rpython/translator/tool/reftracker.py b/rpython/translator/tool/reftracker.py
--- a/rpython/translator/tool/reftracker.py
+++ b/rpython/translator/tool/reftracker.py
@@ -6,7 +6,7 @@
 import autopath, sys, os, types
 import gc
 from rpython.translator.tool.graphpage import GraphPage, DotGen
-from pypy.tool.uid import uid
+from rpython.tool.uid import uid
 
 
 MARKER = object()