From 102d1208a8dcf9a502a8720fe5642ee33520d84f Mon Sep 17 00:00:00 2001 From: "Andrew M. Kuchling" Date: Fri, 29 Mar 2002 16:20:33 +0000 Subject: [Bug #536241] string.zfill() produces mangled output for a Unicode string. Walter Doerwald provided a patch, which I've modified in two ways: 1) (Uncontroversial) Removed code to make module work in earlier versions of Python without the unicode() built-in 2) (Poss. controversial) Instead of making string.zfill take the repr() of non-string objects, take the str(). Should a warning be added to this branch of the code so that the automatic str() can be deprecated? 2.2.2 bugfix candidate, assuming the repr()->str() change is deemed OK. --- Lib/string.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Lib/string.py b/Lib/string.py index a416530..d68b0bf 100644 --- a/Lib/string.py +++ b/Lib/string.py @@ -190,7 +190,7 @@ def rfind(s, *args): _float = float _int = int _long = long -_StringType = type('') +_StringTypes = (str, unicode) # Convert string to float def atof(s): @@ -276,14 +276,14 @@ def zfill(x, width): of the specified width. The string x is never truncated. """ - if type(x) == type(''): s = x - else: s = `x` - n = len(s) - if n >= width: return s + if not isinstance(x, _StringTypes): + x = str(x) + n = len(x) + if n >= width: return x sign = '' - if s[0] in ('-', '+'): - sign, s = s[0], s[1:] - return sign + '0'*(width-n) + s + if x[0] in '-+': + sign, x = x[0], x[1:] + return sign + '0'*(width-n) + x # Expand tabs in a string. # Doesn't take non-printing chars into account, but does understand \n. -- cgit v0.12