[pypy-svn] r65209 - pypy/trunk/pypy/rpython/lltypesystem

[afa at codespeak.net]

Author: afa
Date: Sun May 10 22:26:51 2009
New Revision: 65209

Modified:
   pypy/trunk/pypy/rpython/lltypesystem/rffi.py
Log:
Remove confusion in imports


Modified: pypy/trunk/pypy/rpython/lltypesystem/rffi.py
==============================================================================
--- pypy/trunk/pypy/rpython/lltypesystem/rffi.py	(original)
+++ pypy/trunk/pypy/rpython/lltypesystem/rffi.py	Sun May 10 22:26:51 2009
@@ -513,10 +513,9 @@
 def make_string_mappings(strtype):
     
     if strtype is str:
-        from pypy.rpython.lltypesystem.rstr import UNICODE as STRTYPE
+        from pypy.rpython.lltypesystem.rstr import STR as STRTYPE
         from pypy.rpython.annlowlevel import llstr as llstrtype
         from pypy.rpython.annlowlevel import hlstr as hlstrtype
-        from pypy.rpython.lltypesystem.rstr import STR as STRTYPE
         TYPEP = CCHARP
         ll_char_type = lltype.Char
         emptystr = ''