[pypy-svn] r76152 - pypy/branch/fast-forward/pypy/objspace/std

[benjamin at codespeak.net]

Author: benjamin
Date: Mon Jul 12 17:02:53 2010
New Revision: 76152

Modified:
   pypy/branch/fast-forward/pypy/objspace/std/newformat.py
Log:
must compare only chars

Modified: pypy/branch/fast-forward/pypy/objspace/std/newformat.py
==============================================================================
--- pypy/branch/fast-forward/pypy/objspace/std/newformat.py	(original)
+++ pypy/branch/fast-forward/pypy/objspace/std/newformat.py	Mon Jul 12 17:02:53 2010
@@ -127,7 +127,7 @@
                         raise OperationError(self.space.w_ValueError, w_msg)
                     conversion = s[i]
                 else:
-                    conversion = None
+                    conversion = self.empty
                 i += 1
                 return s[start:end_name], conversion, i
             i += 1
@@ -228,9 +228,10 @@
 
     def _convert(self, w_obj, conversion):
         space = self.space
-        if conversion == "r":
+        conv = conversion[0]
+        if conv == "r":
             return space.repr(w_obj)
-        elif conversion == "s":
+        elif conv == "s":
             if self.is_unicode:
                 return space.call_function(space.w_unicode, w_obj)
             return space.str(w_obj)