Author: Brian Kearns <[email protected]>
Branch:
Changeset: r61633:25d39ec60174
Date: 2013-02-22 19:55 -0500
http://bitbucket.org/pypy/pypy/changeset/25d39ec60174/
Log: a more correct simplification for this import
diff --git a/rpython/rtyper/lltypesystem/rdict.py
b/rpython/rtyper/lltypesystem/rdict.py
--- a/rpython/rtyper/lltypesystem/rdict.py
+++ b/rpython/rtyper/lltypesystem/rdict.py
@@ -1,8 +1,6 @@
from rpython.tool.pairtype import pairtype
from rpython.flowspace.model import Constant
-# rtype_newdict is accessed through this module in other places
-from rpython.rtyper.rdict import (AbstractDictRepr, AbstractDictIteratorRepr,
- rtype_newdict)
+from rpython.rtyper.rdict import AbstractDictRepr, AbstractDictIteratorRepr
from rpython.rtyper.lltypesystem import lltype
from rpython.rlib import objectmodel, jit
from rpython.rlib.debug import ll_assert
diff --git a/rpython/rtyper/ootypesystem/rdict.py
b/rpython/rtyper/ootypesystem/rdict.py
--- a/rpython/rtyper/ootypesystem/rdict.py
+++ b/rpython/rtyper/ootypesystem/rdict.py
@@ -7,8 +7,6 @@
from rpython.rtyper.ootypesystem import ootype
from rpython.rlib import objectmodel
from rpython.rtyper import rmodel, llinterp
-# This is needed by other things, don't remove!
-from rpython.rtyper.rdict import rtype_newdict
class DictRepr(AbstractDictRepr):
diff --git a/rpython/rtyper/rtyper.py b/rpython/rtyper/rtyper.py
--- a/rpython/rtyper/rtyper.py
+++ b/rpython/rtyper/rtyper.py
@@ -624,7 +624,7 @@
return rlist.rtype_newlist(hop)
def translate_op_newdict(self, hop):
- return self.type_system.rdict.rtype_newdict(hop)
+ return rdict.rtype_newdict(hop)
def translate_op_alloc_and_set(self, hop):
return rlist.rtype_alloc_and_set(hop)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
