[pypy-svn] r55165 - pypy/dist/pypy/objspace/std

fijal at codespeak.net fijal at codespeak.net
Sat May 24 00:09:57 CEST 2008


Author: fijal
Date: Sat May 24 00:09:53 2008
New Revision: 55165

Modified:
   pypy/dist/pypy/objspace/std/marshal_impl.py
   pypy/dist/pypy/objspace/std/ropeunicodeobject.py
   pypy/dist/pypy/objspace/std/unicodeobject.py
Log:
Fix imports


Modified: pypy/dist/pypy/objspace/std/marshal_impl.py
==============================================================================
--- pypy/dist/pypy/objspace/std/marshal_impl.py	(original)
+++ pypy/dist/pypy/objspace/std/marshal_impl.py	Sat May 24 00:09:53 2008
@@ -18,7 +18,7 @@
 from pypy.interpreter.special import Ellipsis
 from pypy.interpreter.pycode import PyCode
 from pypy.interpreter import gateway
-from pypy.module.struct import ieee
+from pypy.rlib.rstruct import ieee
 
 from pypy.objspace.std.boolobject    import W_BoolObject
 from pypy.objspace.std.complexobject import W_ComplexObject

Modified: pypy/dist/pypy/objspace/std/ropeunicodeobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/ropeunicodeobject.py	(original)
+++ pypy/dist/pypy/objspace/std/ropeunicodeobject.py	Sat May 24 00:09:53 2008
@@ -910,8 +910,7 @@
     return mod_format(space, w_format, w_values, do_unicode=True)
 
 def buffer__RopeUnicode(space, w_unicode):
-    # xxx this is a slightly strange thing...
-    from pypy.module.struct.unichar import pack_unichar
+    from pypy.rlib.rstruct.unichar import pack_unichar
     charlist = []
     node = w_unicode._node
     iter = rope.ItemIterator(node)

Modified: pypy/dist/pypy/objspace/std/unicodeobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/unicodeobject.py	(original)
+++ pypy/dist/pypy/objspace/std/unicodeobject.py	Sat May 24 00:09:53 2008
@@ -944,8 +944,7 @@
     return mod_format(space, w_format, w_values, do_unicode=True)
 
 def buffer__Unicode(space, w_unicode):
-    # xxx this is a slightly strange thing...
-    from pypy.module.struct.unichar import pack_unichar
+    from pypy.rlib.rstruct.unichar import pack_unichar
     charlist = []
     for unich in w_unicode._value:
         pack_unichar(unich, charlist)



More information about the Pypy-commit mailing list