Author: Amaury Forgeot d'Arc <amaur...@gmail.com>
Branch: py3k
Changeset: r60234:5bbf664124e9
Date: 2013-01-20 14:52 +0100
http://bitbucket.org/pypy/pypy/changeset/5bbf664124e9/
Log: hg merge default again
diff --git a/goal/multibuild.py b/pypy/goal/multibuild.py
rename from goal/multibuild.py
rename to pypy/goal/multibuild.py
diff --git a/goal/targetnumpystandalone.py b/pypy/goal/targetnumpystandalone.py
rename from goal/targetnumpystandalone.py
rename to pypy/goal/targetnumpystandalone.py
diff --git a/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
rename from goal/targetpypystandalone.py
rename to pypy/goal/targetpypystandalone.py
diff --git a/pypy/interpreter/gateway.py b/pypy/interpreter/gateway.py
--- a/pypy/interpreter/gateway.py
+++ b/pypy/interpreter/gateway.py
@@ -15,7 +15,7 @@
from pypy.interpreter.eval import Code
from pypy.interpreter.argument import Arguments
-from rpython.rtyper.signature import Signature
+from pypy.interpreter.signature import Signature
from pypy.interpreter.baseobjspace import (W_Root, ObjSpace, Wrappable,
SpaceCache, DescrMismatch)
from pypy.interpreter.error import OperationError
diff --git a/pypy/interpreter/pycode.py b/pypy/interpreter/pycode.py
--- a/pypy/interpreter/pycode.py
+++ b/pypy/interpreter/pycode.py
@@ -7,7 +7,7 @@
import dis, imp, struct, types, new, sys
from pypy.interpreter import eval
-from rpython.rtyper.signature import Signature
+from pypy.interpreter.signature import Signature
from pypy.interpreter.error import OperationError
from pypy.interpreter.gateway import unwrap_spec
from pypy.interpreter.astcompiler.consts import (
diff --git a/rpython/rtyper/signature.py b/pypy/interpreter/signature.py
rename from rpython/rtyper/signature.py
rename to pypy/interpreter/signature.py
diff --git a/pypy/interpreter/test/test_argument.py
b/pypy/interpreter/test/test_argument.py
--- a/pypy/interpreter/test/test_argument.py
+++ b/pypy/interpreter/test/test_argument.py
@@ -2,7 +2,7 @@
import py
from pypy.interpreter.argument import (Arguments, ArgErr, ArgErrUnknownKwds,
ArgErrMultipleValues, ArgErrCount)
-from rpython.rtyper.signature import Signature
+from pypy.interpreter.signature import Signature
from pypy.interpreter.error import OperationError
diff --git a/pypy/interpreter/test/test_gateway.py
b/pypy/interpreter/test/test_gateway.py
--- a/pypy/interpreter/test/test_gateway.py
+++ b/pypy/interpreter/test/test_gateway.py
@@ -3,7 +3,7 @@
from pypy.interpreter import gateway, argument
from pypy.interpreter.gateway import ObjSpace, W_Root, WrappedDefault
-from rpython.rtyper.signature import Signature
+from pypy.interpreter.signature import Signature
import py
import sys
diff --git a/pypy/module/oracle/interp_pool.py
b/pypy/module/oracle/interp_pool.py
--- a/pypy/module/oracle/interp_pool.py
+++ b/pypy/module/oracle/interp_pool.py
@@ -4,8 +4,8 @@
from pypy.interpreter.typedef import TypeDef, GetSetProperty
from pypy.interpreter.typedef import interp_attrproperty, interp_attrproperty_w
from pypy.interpreter.error import OperationError
+from pypy.interpreter.signature import Signature
from rpython.rtyper.lltypesystem import rffi, lltype
-from rpython.rtyper.signature import Signature
from pypy.module.oracle import roci, config
from pypy.module.oracle import interp_error, interp_environ
diff --git a/pypy/objspace/std/dictmultiobject.py
b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -3,14 +3,12 @@
from pypy.objspace.std.register_all import register_all
from pypy.objspace.std.settype import set_typedef as settypedef
from pypy.objspace.std.frozensettype import frozenset_typedef as
frozensettypedef
-from pypy.interpreter import gateway
from pypy.interpreter.error import OperationError, operationerrfmt
+from pypy.interpreter.signature import Signature
-from rpython.rlib.objectmodel import r_dict, we_are_translated, specialize,\
- newlist_hint
+from rpython.rlib.objectmodel import r_dict, specialize, newlist_hint
from rpython.rlib.debug import mark_dict_non_null
from rpython.tool.sourcetools import func_with_new_name
-from rpython.rtyper.signature import Signature
from rpython.rlib import rerased
from rpython.rlib import jit
diff --git a/pypy/objspace/std/listobject.py b/pypy/objspace/std/listobject.py
--- a/pypy/objspace/std/listobject.py
+++ b/pypy/objspace/std/listobject.py
@@ -8,11 +8,11 @@
from pypy.objspace.std.sliceobject import W_SliceObject, normalize_simple_slice
from pypy.objspace.std import slicetype
from pypy.interpreter import gateway, baseobjspace
+from pypy.interpreter.signature import Signature
from rpython.rlib.objectmodel import (instantiate, newlist_hint, specialize,
resizelist_hint)
from rpython.rlib.listsort import make_timsort_class
from rpython.rlib import rerased, jit, debug
-from rpython.rtyper.signature import Signature
from rpython.tool.sourcetools import func_with_new_name
UNROLL_CUTOFF = 5
diff --git a/pypy/objspace/std/setobject.py b/pypy/objspace/std/setobject.py
--- a/pypy/objspace/std/setobject.py
+++ b/pypy/objspace/std/setobject.py
@@ -1,20 +1,20 @@
from pypy.objspace.std.model import registerimplementation, W_Object
from pypy.objspace.std.register_all import register_all
-from rpython.rlib.objectmodel import r_dict
-from rpython.rlib.rarithmetic import intmask, r_uint
from pypy.interpreter.error import OperationError
from pypy.interpreter import gateway
from pypy.objspace.std.settype import set_typedef as settypedef
from pypy.objspace.std.frozensettype import frozenset_typedef as
frozensettypedef
-from rpython.rlib import rerased
-from rpython.rlib.objectmodel import instantiate
-from rpython.rtyper.signature import Signature
+from pypy.interpreter.signature import Signature
from pypy.interpreter.generator import GeneratorIterator
from pypy.objspace.std.listobject import W_ListObject
from pypy.objspace.std.intobject import W_IntObject
from pypy.objspace.std.stringobject import W_StringObject
from pypy.objspace.std.unicodeobject import W_UnicodeObject
+from rpython.rlib.objectmodel import r_dict
+from rpython.rlib.rarithmetic import intmask, r_uint
+from rpython.rlib import rerased
+
class W_BaseSetObject(W_Object):
typedef = None
diff --git a/pypy/bin/rpython b/rpython/bin/rpython
rename from pypy/bin/rpython
rename to rpython/bin/rpython
diff --git a/rpython/rtyper/normalizecalls.py b/rpython/rtyper/normalizecalls.py
--- a/rpython/rtyper/normalizecalls.py
+++ b/rpython/rtyper/normalizecalls.py
@@ -1,5 +1,5 @@
from rpython.annotator import model as annmodel, description
-from rpython.rtyper.signature import Signature
+from rpython.flowspace.argument import Signature
from rpython.flowspace.model import (Variable, Constant, Block, Link,
checkgraph, FunctionGraph, SpaceOperation)
from rpython.rlib.objectmodel import ComputedIntSymbolic
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
