[pypy-svn] r74837 - in pypy/branch/sys-prefix/pypy: annotation lib lib/test2 module/cpyext module/cpyext/test objspace/flow rpython/lltypesystem rpython/lltypesystem/test rpython/memory rpython/ootypesystem tool tool/algo tool/test translator translator/c translator/oosupport translator/tool
antocuni at codespeak.net
antocuni at codespeak.net
Fri May 28 10:57:46 CEST 2010
Author: antocuni
Date: Fri May 28 10:57:44 2010
New Revision: 74837
Added:
pypy/branch/sys-prefix/pypy/tool/identity_dict.py
- copied unchanged from r74817, pypy/branch/sys-prefix/pypy/lib/identity_dict.py
pypy/branch/sys-prefix/pypy/tool/test/test_identitydict.py
- copied, changed from r74817, pypy/branch/sys-prefix/pypy/lib/test2/test_identitydict.py
Removed:
pypy/branch/sys-prefix/pypy/lib/identity_dict.py
pypy/branch/sys-prefix/pypy/lib/test2/test_identitydict.py
Modified:
pypy/branch/sys-prefix/pypy/annotation/bookkeeper.py
pypy/branch/sys-prefix/pypy/lib/_sre.py
pypy/branch/sys-prefix/pypy/module/cpyext/state.py
pypy/branch/sys-prefix/pypy/module/cpyext/test/test_cpyext.py
pypy/branch/sys-prefix/pypy/objspace/flow/model.py
pypy/branch/sys-prefix/pypy/rpython/lltypesystem/lltype.py
pypy/branch/sys-prefix/pypy/rpython/lltypesystem/rclass.py
pypy/branch/sys-prefix/pypy/rpython/lltypesystem/test/test_lltype.py
pypy/branch/sys-prefix/pypy/rpython/memory/gctypelayout.py
pypy/branch/sys-prefix/pypy/rpython/ootypesystem/rclass.py
pypy/branch/sys-prefix/pypy/tool/algo/graphlib.py
pypy/branch/sys-prefix/pypy/translator/c/database.py
pypy/branch/sys-prefix/pypy/translator/c/funcgen.py
pypy/branch/sys-prefix/pypy/translator/geninterplevel.py
pypy/branch/sys-prefix/pypy/translator/oosupport/function.py
pypy/branch/sys-prefix/pypy/translator/tool/lltracker.py
Log:
move identitydict.py from pypy/lib to pypy/tool
Modified: pypy/branch/sys-prefix/pypy/annotation/bookkeeper.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/annotation/bookkeeper.py (original)
+++ pypy/branch/sys-prefix/pypy/annotation/bookkeeper.py Fri May 28 10:57:44 2010
@@ -22,7 +22,7 @@
from pypy.rpython.lltypesystem import lltype, llmemory
from pypy.rpython.ootypesystem import ootype
from pypy.rpython import extregistry
-from pypy.lib.identity_dict import identity_dict
+from pypy.tool.identity_dict import identity_dict
class Stats:
Modified: pypy/branch/sys-prefix/pypy/lib/_sre.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/lib/_sre.py (original)
+++ pypy/branch/sys-prefix/pypy/lib/_sre.py Fri May 28 10:57:44 2010
@@ -19,7 +19,7 @@
import array, operator
-from identity_dict import identity_dict
+from __pypy__ import identity_dict
from sre_constants import ATCODES, OPCODES, CHCODES, MAXREPEAT
from sre_constants import SRE_INFO_PREFIX, SRE_INFO_LITERAL
Modified: pypy/branch/sys-prefix/pypy/module/cpyext/state.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/module/cpyext/state.py (original)
+++ pypy/branch/sys-prefix/pypy/module/cpyext/state.py Fri May 28 10:57:44 2010
@@ -1,6 +1,5 @@
from pypy.rlib.objectmodel import we_are_translated
from pypy.rpython.lltypesystem import rffi, lltype
-from pypy.lib.identity_dict import identity_dict
from pypy.interpreter.error import OperationError
from pypy.rpython.lltypesystem import lltype
Modified: pypy/branch/sys-prefix/pypy/module/cpyext/test/test_cpyext.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/module/cpyext/test/test_cpyext.py (original)
+++ pypy/branch/sys-prefix/pypy/module/cpyext/test/test_cpyext.py Fri May 28 10:57:44 2010
@@ -15,7 +15,7 @@
from pypy.module.cpyext.pyobject import RefcountState
from pypy.module.cpyext.pyobject import Py_DecRef, InvalidPointerException
from pypy.translator.goal import autopath
-from pypy.lib.identity_dict import identity_dict
+from pypy.tool.identity_dict import identity_dict
@api.cpython_api([], api.PyObject)
def PyPy_Crash1(space):
Modified: pypy/branch/sys-prefix/pypy/objspace/flow/model.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/objspace/flow/model.py (original)
+++ pypy/branch/sys-prefix/pypy/objspace/flow/model.py Fri May 28 10:57:44 2010
@@ -7,7 +7,7 @@
from pypy.tool.uid import uid, Hashable
from pypy.tool.descriptor import roproperty
from pypy.tool.sourcetools import PY_IDENTIFIER, nice_repr_for_func
-from pypy.lib.identity_dict import identity_dict
+from pypy.tool.identity_dict import identity_dict
"""
memory size before and after introduction of __slots__
Modified: pypy/branch/sys-prefix/pypy/rpython/lltypesystem/lltype.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/rpython/lltypesystem/lltype.py (original)
+++ pypy/branch/sys-prefix/pypy/rpython/lltypesystem/lltype.py Fri May 28 10:57:44 2010
@@ -9,7 +9,7 @@
from pypy.rlib.objectmodel import Symbolic
from pypy.tool.uid import Hashable
from pypy.tool.tls import tlsobject
-from pypy.lib.identity_dict import identity_dict
+from pypy.tool.identity_dict import identity_dict
from types import NoneType
from sys import maxint
import struct
Modified: pypy/branch/sys-prefix/pypy/rpython/lltypesystem/rclass.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/rpython/lltypesystem/rclass.py (original)
+++ pypy/branch/sys-prefix/pypy/rpython/lltypesystem/rclass.py Fri May 28 10:57:44 2010
@@ -21,7 +21,7 @@
from pypy.annotation import model as annmodel
from pypy.rlib.rarithmetic import intmask
from pypy.rlib import objectmodel
-from pypy.lib.identity_dict import identity_dict
+from pypy.tool.identity_dict import identity_dict
#
# There is one "vtable" per user class, with the following structure:
Modified: pypy/branch/sys-prefix/pypy/rpython/lltypesystem/test/test_lltype.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/rpython/lltypesystem/test/test_lltype.py (original)
+++ pypy/branch/sys-prefix/pypy/rpython/lltypesystem/test/test_lltype.py Fri May 28 10:57:44 2010
@@ -1,7 +1,7 @@
import py
from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.lltypesystem import lltype, rffi
-from pypy.lib.identity_dict import identity_dict
+from pypy.tool.identity_dict import identity_dict
def isweak(p, T):
try:
Modified: pypy/branch/sys-prefix/pypy/rpython/memory/gctypelayout.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/rpython/memory/gctypelayout.py (original)
+++ pypy/branch/sys-prefix/pypy/rpython/memory/gctypelayout.py Fri May 28 10:57:44 2010
@@ -3,7 +3,7 @@
from pypy.rpython.lltypesystem.lloperation import llop
from pypy.rlib.objectmodel import we_are_translated
from pypy.rlib.debug import ll_assert
-from pypy.lib.identity_dict import identity_dict
+from pypy.tool.identity_dict import identity_dict
class GCData(object):
Modified: pypy/branch/sys-prefix/pypy/rpython/ootypesystem/rclass.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/rpython/ootypesystem/rclass.py (original)
+++ pypy/branch/sys-prefix/pypy/rpython/ootypesystem/rclass.py Fri May 28 10:57:44 2010
@@ -10,7 +10,7 @@
from pypy.rpython.exceptiondata import standardexceptions
from pypy.tool.pairtype import pairtype
from pypy.tool.sourcetools import func_with_new_name
-from pypy.lib.identity_dict import identity_dict
+from pypy.tool.identity_dict import identity_dict
OBJECT = ootype.ROOT
META = ootype.Instance("Meta", ootype.ROOT,
Modified: pypy/branch/sys-prefix/pypy/tool/algo/graphlib.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/tool/algo/graphlib.py (original)
+++ pypy/branch/sys-prefix/pypy/tool/algo/graphlib.py Fri May 28 10:57:44 2010
@@ -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.lib.identity_dict import identity_dict
+from pypy.tool.identity_dict import identity_dict
class Edge:
Copied: pypy/branch/sys-prefix/pypy/tool/test/test_identitydict.py (from r74817, pypy/branch/sys-prefix/pypy/lib/test2/test_identitydict.py)
==============================================================================
--- pypy/branch/sys-prefix/pypy/lib/test2/test_identitydict.py (original)
+++ pypy/branch/sys-prefix/pypy/tool/test/test_identitydict.py Fri May 28 10:57:44 2010
@@ -1,5 +1,5 @@
import py
-from pypy.lib.identity_dict import identity_dict, IdentityDictPurePython
+from pypy.tool.identity_dict import identity_dict, IdentityDictPurePython
class TestIdentityDictNative:
identity_dict = identity_dict
Modified: pypy/branch/sys-prefix/pypy/translator/c/database.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/translator/c/database.py (original)
+++ pypy/branch/sys-prefix/pypy/translator/c/database.py Fri May 28 10:57:44 2010
@@ -16,7 +16,7 @@
from pypy.translator.c.extfunc import do_the_getting
from pypy import conftest
from pypy.translator.c import gc
-from pypy.lib.identity_dict import identity_dict
+from pypy.tool.identity_dict import identity_dict
class NoCorrespondingNode(Exception):
Modified: pypy/branch/sys-prefix/pypy/translator/c/funcgen.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/translator/c/funcgen.py (original)
+++ pypy/branch/sys-prefix/pypy/translator/c/funcgen.py Fri May 28 10:57:44 2010
@@ -13,7 +13,7 @@
from pypy.rpython.lltypesystem.llmemory import Address
from pypy.translator.backendopt.ssa import SSI_to_SSA
from pypy.translator.backendopt.innerloop import find_inner_loops
-from pypy.lib.identity_dict import identity_dict
+from pypy.tool.identity_dict import identity_dict
PyObjPtr = Ptr(PyObject)
Modified: pypy/branch/sys-prefix/pypy/translator/geninterplevel.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/translator/geninterplevel.py (original)
+++ pypy/branch/sys-prefix/pypy/translator/geninterplevel.py Fri May 28 10:57:44 2010
@@ -62,7 +62,7 @@
from pypy.translator.gensupp import ordered_blocks, UniqueList, builtin_base, \
uniquemodulename, C_IDENTIFIER, NameManager
-from pypy.lib.identity_dict import identity_dict
+from pypy.tool.identity_dict import identity_dict
import pypy # __path__
import py.path
Modified: pypy/branch/sys-prefix/pypy/translator/oosupport/function.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/translator/oosupport/function.py (original)
+++ pypy/branch/sys-prefix/pypy/translator/oosupport/function.py Fri May 28 10:57:44 2010
@@ -7,7 +7,7 @@
from pypy.rpython.ootypesystem import ootype
from pypy.translator.oosupport.treebuilder import SubOperation
from pypy.translator.oosupport.metavm import InstructionList, StoreResult
-from pypy.lib.identity_dict import identity_dict
+from pypy.tool.identity_dict import identity_dict
def render_sub_op(sub_op, db, generator):
Modified: pypy/branch/sys-prefix/pypy/translator/tool/lltracker.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/translator/tool/lltracker.py (original)
+++ pypy/branch/sys-prefix/pypy/translator/tool/lltracker.py Fri May 28 10:57:44 2010
@@ -8,7 +8,7 @@
from pypy.rpython.memory.gcheader import header2obj
from pypy.translator.tool.reftracker import BaseRefTrackerPage, MARKER
from pypy.tool.uid import uid
-from pypy.lib.identity_dict import identity_dict
+from pypy.tool.identity_dict import identity_dict
class LLRefTrackerPage(BaseRefTrackerPage):
More information about the Pypy-commit
mailing list