Author: Carl Friedrich Bolz <[email protected]>
Branch: space-newtext
Changeset: r88117:e2a03c55685b
Date: 2016-11-03 12:13 +0100
http://bitbucket.org/pypy/pypy/changeset/e2a03c55685b/
Log: _locale
diff --git a/pypy/module/_locale/interp_locale.py
b/pypy/module/_locale/interp_locale.py
--- a/pypy/module/_locale/interp_locale.py
+++ b/pypy/module/_locale/interp_locale.py
@@ -13,36 +13,36 @@
import sys
def make_error(space, msg):
- return OperationError(space.gettypeobject(W_Error.typedef),
space.wrap(msg))
+ return OperationError(space.gettypeobject(W_Error.typedef),
space.newtext(msg))
def rewrap_error(space, e):
return OperationError(space.gettypeobject(W_Error.typedef),
- space.wrap(e.message))
+ space.newtext(e.message))
def _fixup_ulcase(space):
stringmod = space.call_function(
space.getattr(space.getbuiltinmodule('__builtin__'),
- space.wrap('__import__')), space.wrap('string'))
+ space.newtext('__import__')), space.newtext('string'))
# create uppercase map string
ul = []
for c in xrange(256):
if rlocale.isupper(c):
ul.append(chr(c))
- space.setattr(stringmod, space.wrap('uppercase'), space.wrap(''.join(ul)))
+ space.setattr(stringmod, space.newtext('uppercase'),
space.newbytes(''.join(ul)))
# create lowercase string
ul = []
for c in xrange(256):
if rlocale.islower(c):
ul.append(chr(c))
- space.setattr(stringmod, space.wrap('lowercase'), space.wrap(''.join(ul)))
+ space.setattr(stringmod, space.newtext('lowercase'),
space.newbytes(''.join(ul)))
# create letters string
ul = []
for c in xrange(256):
if rlocale.isalpha(c):
ul.append(chr(c))
- space.setattr(stringmod, space.wrap('letters'), space.wrap(''.join(ul)))
+ space.setattr(stringmod, space.newtext('letters'),
space.newbytes(''.join(ul)))
@unwrap_spec(category=int)
def setlocale(space, category, w_locale=None):
@@ -61,12 +61,12 @@
if category in (rlocale.LC_CTYPE, rlocale.LC_ALL):
_fixup_ulcase(space)
- return space.wrap(result)
+ return space.newtext(result)
def _w_copy_grouping(space, text):
- groups = [ space.wrap(ord(group)) for group in text ]
+ groups = [ space.newint(ord(group)) for group in text ]
if groups:
- groups.append(space.wrap(0))
+ groups.append(space.newint(0))
return space.newlist(groups)
def localeconv(space):
@@ -75,43 +75,42 @@
# Numeric information
w_result = space.newdict()
- w = space.wrap
- space.setitem(w_result, w("decimal_point"),
- w(rffi.charp2str(lp.c_decimal_point)))
- space.setitem(w_result, w("thousands_sep"),
- w(rffi.charp2str(lp.c_thousands_sep)))
- space.setitem(w_result, w("grouping"),
+ space.setitem(w_result, space.newtext("decimal_point"),
+ space.newtext(rffi.charp2str(lp.c_decimal_point)))
+ space.setitem(w_result, space.newtext("thousands_sep"),
+ space.newtext(rffi.charp2str(lp.c_thousands_sep)))
+ space.setitem(w_result, space.newtext("grouping"),
_w_copy_grouping(space, rffi.charp2str(lp.c_grouping)))
- space.setitem(w_result, w("int_curr_symbol"),
- w(rffi.charp2str(lp.c_int_curr_symbol)))
- space.setitem(w_result, w("currency_symbol"),
- w(rffi.charp2str(lp.c_currency_symbol)))
- space.setitem(w_result, w("mon_decimal_point"),
- w(rffi.charp2str(lp.c_mon_decimal_point)))
- space.setitem(w_result, w("mon_thousands_sep"),
- w(rffi.charp2str(lp.c_mon_thousands_sep)))
- space.setitem(w_result, w("mon_grouping"),
+ space.setitem(w_result, space.newtext("int_curr_symbol"),
+ space.newtext(rffi.charp2str(lp.c_int_curr_symbol)))
+ space.setitem(w_result, space.newtext("currency_symbol"),
+ space.newtext(rffi.charp2str(lp.c_currency_symbol)))
+ space.setitem(w_result, space.newtext("mon_decimal_point"),
+ space.newtext(rffi.charp2str(lp.c_mon_decimal_point)))
+ space.setitem(w_result, space.newtext("mon_thousands_sep"),
+ space.newtext(rffi.charp2str(lp.c_mon_thousands_sep)))
+ space.setitem(w_result, space.newtext("mon_grouping"),
_w_copy_grouping(space, rffi.charp2str(lp.c_mon_grouping)))
- space.setitem(w_result, w("positive_sign"),
- w(rffi.charp2str(lp.c_positive_sign)))
- space.setitem(w_result, w("negative_sign"),
- w(rffi.charp2str(lp.c_negative_sign)))
- space.setitem(w_result, w("int_frac_digits"),
- w(lp.c_int_frac_digits))
- space.setitem(w_result, w("frac_digits"),
- w(lp.c_frac_digits))
- space.setitem(w_result, w("p_cs_precedes"),
- w(lp.c_p_cs_precedes))
- space.setitem(w_result, w("p_sep_by_space"),
- w(lp.c_p_sep_by_space))
- space.setitem(w_result, w("n_cs_precedes"),
- w(lp.c_n_cs_precedes))
- space.setitem(w_result, w("n_sep_by_space"),
- w(lp.c_n_sep_by_space))
- space.setitem(w_result, w("p_sign_posn"),
- w(lp.c_p_sign_posn))
- space.setitem(w_result, w("n_sign_posn"),
- w(lp.c_n_sign_posn))
+ space.setitem(w_result, space.newtext("positive_sign"),
+ space.newtext(rffi.charp2str(lp.c_positive_sign)))
+ space.setitem(w_result, space.newtext("negative_sign"),
+ space.newtext(rffi.charp2str(lp.c_negative_sign)))
+ space.setitem(w_result, space.newtext("int_frac_digits"),
+ space.newint(lp.c_int_frac_digits))
+ space.setitem(w_result, space.newtext("frac_digits"),
+ space.newint(lp.c_frac_digits))
+ space.setitem(w_result, space.newtext("p_cs_precedes"),
+ space.newint(lp.c_p_cs_precedes))
+ space.setitem(w_result, space.newtext("p_sep_by_space"),
+ space.newint(lp.c_p_sep_by_space))
+ space.setitem(w_result, space.newtext("n_cs_precedes"),
+ space.newint(lp.c_n_cs_precedes))
+ space.setitem(w_result, space.newtext("n_sep_by_space"),
+ space.newint(lp.c_n_sep_by_space))
+ space.setitem(w_result, space.newtext("p_sign_posn"),
+ space.newint(lp.c_p_sign_posn))
+ space.setitem(w_result, space.newtext("n_sign_posn"),
+ space.newint(lp.c_n_sign_posn))
return w_result
@@ -129,7 +128,7 @@
s1_c = rffi.str2charp(s1)
s2_c = rffi.str2charp(s2)
try:
- return space.wrap(_strcoll(s1_c, s2_c))
+ return space.newint(_strcoll(s1_c, s2_c))
finally:
rffi.free_charp(s1_c)
rffi.free_charp(s2_c)
@@ -144,7 +143,7 @@
rffi.free_wcharp(s1_c)
rffi.free_wcharp(s2_c)
- return space.wrap(result)
+ return space.newint(result)
_strxfrm = rlocale.external('strxfrm',
[rffi.CCHARP, rffi.CCHARP, rffi.SIZE_T], rffi.SIZE_T)
@@ -174,7 +173,7 @@
val = rffi.charp2str(buf)
lltype.free(buf, flavor="raw")
- return space.wrap(val)
+ return space.newtext(val)
if rlocale.HAVE_LANGINFO:
@@ -184,7 +183,7 @@
Return the value for the locale information associated with key."""
try:
- return space.wrap(rlocale.nl_langinfo(key))
+ return space.newtext(rlocale.nl_langinfo(key))
except ValueError:
raise oefmt(space.w_ValueError, "unsupported langinfo constant")
@@ -200,7 +199,7 @@
Return translation of msg."""
msg_c = rffi.str2charp(msg)
try:
- return space.wrap(rffi.charp2str(_gettext(msg_c)))
+ return space.newtext(rffi.charp2str(_gettext(msg_c)))
finally:
rffi.free_charp(msg_c)
@@ -235,7 +234,7 @@
rffi.free_charp(domain_c)
rffi.free_charp(msg_c)
- return space.wrap(result)
+ return space.newtext(result)
_dcgettext = rlocale.external('dcgettext', [rffi.CCHARP, rffi.CCHARP,
rffi.INT],
rffi.CCHARP)
@@ -271,7 +270,7 @@
rffi.free_charp(domain_c)
rffi.free_charp(msg_c)
- return space.wrap(result)
+ return space.newtext(result)
_textdomain = rlocale.external('textdomain', [rffi.CCHARP], rffi.CCHARP)
@@ -296,7 +295,7 @@
finally:
rffi.free_charp(domain_c)
- return space.wrap(result)
+ return space.newtext(result)
_bindtextdomain = rlocale.external('bindtextdomain', [rffi.CCHARP,
rffi.CCHARP],
rffi.CCHARP,
@@ -326,8 +325,8 @@
if not dirname:
errno = rposix.get_saved_errno()
- raise OperationError(space.w_OSError, space.wrap(errno))
- return space.wrap(rffi.charp2str(dirname))
+ raise OperationError(space.w_OSError, space.newint(errno))
+ return space.newtext(rffi.charp2str(dirname))
_bind_textdomain_codeset = rlocale.external('bind_textdomain_codeset',
[rffi.CCHARP, rffi.CCHARP], rffi.CCHARP)
@@ -358,9 +357,9 @@
if not result:
return space.w_None
else:
- return space.wrap(rffi.charp2str(result))
+ return space.newtext(rffi.charp2str(result))
if sys.platform == 'win32':
def getdefaultlocale(space):
language, encoding = rlocale.getdefaultlocale()
- return space.newtuple([space.wrap(language), space.wrap(encoding)])
+ return space.newtuple([space.newtext(language),
space.newtext(encoding)])
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
