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

[arigo at codespeak.net]

Author: arigo
Date: Thu Aug 25 20:42:48 2005
New Revision: 16546

Modified:
   pypy/dist/pypy/objspace/std/unicodetype.py
Log:
Renamed the 'obj' argument of unicode() to 'string', as in CPython.


Modified: pypy/dist/pypy/objspace/std/unicodetype.py
==============================================================================
--- pypy/dist/pypy/objspace/std/unicodetype.py	(original)
+++ pypy/dist/pypy/objspace/std/unicodetype.py	Thu Aug 25 20:42:48 2005
@@ -94,8 +94,9 @@
     return W_UnicodeObject(space, codelist)
 
 
-def descr__new__(space, w_unicodetype, w_obj=None, w_encoding=None, w_errors=None):
+def descr__new__(space, w_unicodetype, w_string=None, w_encoding=None, w_errors=None):
     from pypy.objspace.std.unicodeobject import W_UnicodeObject
+    w_obj = w_string
     w_obj_type = space.type(w_obj)
     
     if space.is_w(w_obj_type, space.w_unicode):