Author: Antonio Cuni <[email protected]>
Branch: py3k
Changeset: r56171:7e217c7ff3a4
Date: 2012-07-18 17:15 +0200
http://bitbucket.org/pypy/pypy/changeset/7e217c7ff3a4/
Log: bah
diff --git a/pypy/objspace/std/longtype.py b/pypy/objspace/std/longtype.py
--- a/pypy/objspace/std/longtype.py
+++ b/pypy/objspace/std/longtype.py
@@ -33,7 +33,7 @@
unicode_to_decimal_w(space, w_value))
elif space.isinstance_w(w_value, space.w_bytearray):
strvalue = space.bufferstr_w(w_value)
- return string_to_w_long(space, w_longtype,
strvalue.decode('latin-11'))
+ return string_to_w_long(space, w_longtype,
strvalue.decode('latin-1'))
else:
# otherwise, use the __int__() or the __trunc__ methods
w_obj = w_value
@@ -58,7 +58,7 @@
else:
try:
strval = space.bufferstr_w(w_value)
- s = strval.decode('latin1')
+ s = strval.decode('latin-1')
except OperationError, e:
raise OperationError(space.w_TypeError,
space.wrap("long() can't convert
non-string "
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
