Author: Carl Friedrich Bolz <[email protected]>
Branch: space-newtext
Changeset: r88050:3e9bc4ff4247
Date: 2016-11-01 19:08 +0100
http://bitbucket.org/pypy/pypy/changeset/3e9bc4ff4247/
Log: warning module
diff --git a/pypy/module/_warnings/interp_warnings.py
b/pypy/module/_warnings/interp_warnings.py
--- a/pypy/module/_warnings/interp_warnings.py
+++ b/pypy/module/_warnings/interp_warnings.py
@@ -3,14 +3,14 @@
def create_filter(space, w_category, action):
return space.newtuple([
- space.wrap(action), space.w_None, w_category,
- space.w_None, space.wrap(0)])
+ space.newtext(action), space.w_None, w_category,
+ space.w_None, space.newint(0)])
class State:
def __init__(self, space):
self.init_filters(space)
self.w_once_registry = space.newdict()
- self.w_default_action = space.wrap("default")
+ self.w_default_action = space.newtext("default")
def init_filters(self, space):
filters_w = []
@@ -40,14 +40,14 @@
def get_warnings_attr(space, name):
try:
w_module = space.getitem(space.sys.get('modules'),
- space.wrap('warnings'))
+ space.newtext('warnings'))
except OperationError as e:
if not e.match(space, space.w_KeyError):
raise
return None
try:
- return space.getattr(w_module, space.wrap(name))
+ return space.getattr(w_module, space.newtext(name))
except OperationError as e:
if not e.match(space, space.w_AttributeError):
raise
@@ -83,43 +83,43 @@
# setup registry
try:
- w_registry = space.getitem(w_globals,
space.wrap("__warningregistry__"))
+ w_registry = space.getitem(w_globals,
space.newtext("__warningregistry__"))
except OperationError as e:
if not e.match(space, space.w_KeyError):
raise
w_registry = space.newdict()
- space.setitem(w_globals, space.wrap("__warningregistry__"), w_registry)
+ space.setitem(w_globals, space.newtext("__warningregistry__"),
w_registry)
# setup module
try:
- w_module = space.getitem(w_globals, space.wrap("__name__"))
+ w_module = space.getitem(w_globals, space.newtext("__name__"))
except OperationError as e:
if not e.match(space, space.w_KeyError):
raise
- w_module = space.wrap("<string>")
+ w_module = space.newtext("<string>")
# setup filename
try:
- w_filename = space.getitem(w_globals, space.wrap("__file__"))
+ w_filename = space.getitem(w_globals, space.newtext("__file__"))
filename = space.str_w(w_filename)
except OperationError as e:
if space.str_w(w_module) == '__main__':
w_argv = space.sys.getdictvalue(space, 'argv')
if w_argv and space.len_w(w_argv) > 0:
- w_filename = space.getitem(w_argv, space.wrap(0))
+ w_filename = space.getitem(w_argv, space.newint(0))
if not space.is_true(w_filename):
- w_filename = space.wrap('__main__')
+ w_filename = space.newtext('__main__')
else:
# embedded interpreters don't have sys.argv
- w_filename = space.wrap('__main__')
+ w_filename = space.newtext('__main__')
else:
w_filename = w_module
else:
lc_filename = filename.lower()
- if (lc_filename.endswith(".pyc") or
+ if (lc_filename.endswith(".pyc") or
lc_filename.endswith(".pyo")):
# strip last character
- w_filename = space.wrap(filename[:-1])
+ w_filename = space.newtext(filename[:-1])
return (w_filename, lineno, w_module, w_registry)
@@ -186,24 +186,24 @@
def normalize_module(space, w_filename):
if not space.is_true(w_filename):
- return space.wrap("<unknown>")
+ return space.newtext("<unknown>")
filename = space.str_w(w_filename)
if filename.endswith(".py"):
n = len(filename) - 3
assert n >= 0
filename = filename[:n]
- return space.wrap(filename)
+ return space.newtext(filename)
def show_warning(space, w_filename, lineno, w_text, w_category,
w_sourceline=None):
- w_name = space.getattr(w_category, space.wrap("__name__"))
+ w_name = space.getattr(w_category, space.newtext("__name__"))
w_stderr = space.sys.get("stderr")
# Print "filename:lineno: category: text\n"
message = "%s:%d: %s: %s\n" % (space.str_w(w_filename), lineno,
space.str_w(w_name), space.str_w(w_text))
- space.call_method(w_stderr, "write", space.wrap(message))
+ space.call_method(w_stderr, "write", space.newtext(message))
# Print " source_line\n"
if not w_sourceline:
@@ -211,9 +211,9 @@
# sourceline = linecache.getline(filename, lineno).strip()
w_builtins = space.getbuiltinmodule('__builtin__')
w_linecachemodule = space.call_method(w_builtins, '__import__',
- space.wrap("linecache"))
+ space.newtext("linecache"))
w_sourceline = space.call_method(w_linecachemodule, "getline",
- w_filename, space.wrap(lineno))
+ w_filename, space.newint(lineno))
w_sourceline = space.call_method(w_sourceline, "strip")
except OperationError:
w_sourceline = None
@@ -230,7 +230,7 @@
if c not in ' \t\014':
message = " %s\n" % (line[i:],)
break
- space.call_method(w_stderr, "write", space.wrap(message))
+ space.call_method(w_stderr, "write", space.newtext(message))
def do_warn(space, w_message, w_category, stacklevel):
context_w = setup_context(space, stacklevel)
@@ -256,7 +256,7 @@
w_text = w_message
w_message = space.call_function(w_category, w_message)
- w_lineno = space.wrap(lineno)
+ w_lineno = space.newint(lineno)
# create key
w_key = space.newtuple([w_text, w_category, w_lineno])
@@ -318,8 +318,8 @@
# Check/get the requisite pieces needed for the loader.
try:
- w_loader = space.getitem(w_globals, space.wrap("__loader__"))
- w_module_name = space.getitem(w_globals, space.wrap("__name__"))
+ w_loader = space.getitem(w_globals, space.newtext("__loader__"))
+ w_module_name = space.getitem(w_globals, space.newtext("__name__"))
except OperationError as e:
if not e.match(space, space.w_KeyError):
raise
@@ -327,7 +327,7 @@
# Make sure the loader implements the optional get_source() method.
try:
- w_get_source = space.getattr(w_loader, space.wrap("get_source"))
+ w_get_source = space.getattr(w_loader, space.newtext("get_source"))
except OperationError as e:
if not e.match(space, space.w_AttributeError):
raise
@@ -342,7 +342,7 @@
w_source_list = space.call_method(w_source, "splitlines")
# Get the source line.
- w_source_line = space.getitem(w_source_list, space.wrap(lineno - 1))
+ w_source_line = space.getitem(w_source_list, space.newint(lineno - 1))
return w_source_line
@unwrap_spec(lineno=int, w_module = WrappedDefault(None),
diff --git a/pypy/module/pypyjit/interp_jit.py
b/pypy/module/pypyjit/interp_jit.py
--- a/pypy/module/pypyjit/interp_jit.py
+++ b/pypy/module/pypyjit/interp_jit.py
@@ -213,7 +213,7 @@
@dont_look_inside
def get_jitcell_at_key(space, next_instr, is_being_profiled, w_pycode):
ll_pycode = cast_instance_to_gcref(w_pycode)
- return space.wrap(bool(jit_hooks.get_jitcell_at_key(
+ return space.newbool(bool(jit_hooks.get_jitcell_at_key(
'pypyjit', r_uint(next_instr), int(is_being_profiled), ll_pycode)))
@unwrap_spec(next_instr=int, is_being_profiled=bool, w_pycode=PyCode)
@@ -269,7 +269,7 @@
# return
# for i, op in enumerate(debug_info.operations):
# if op.is_guard():
-# w_t = space.newtuple([space.wrap(i),
space.wrap(op.getopnum()), space.wrap(op.getdescr().get_jitcounter_hash())])
+# w_t = space.newtuple([space.newint(i),
space.newint(op.getopnum()), space.newint(op.getdescr().get_jitcounter_hash())])
# l_w.append(w_t)
# try:
# cache.in_recursion = True
@@ -287,7 +287,7 @@
# return
# if not space.is_true(cache.w_compile_bridge):
# return
-# w_hash = space.wrap(debug_info.fail_descr.get_jitcounter_hash())
+# w_hash = space.newint(debug_info.fail_descr.get_jitcounter_hash())
# try:
# cache.in_recursion = True
# try:
diff --git a/pypy/module/pypyjit/interp_resop.py
b/pypy/module/pypyjit/interp_resop.py
--- a/pypy/module/pypyjit/interp_resop.py
+++ b/pypy/module/pypyjit/interp_resop.py
@@ -39,10 +39,10 @@
ll_code = lltype.cast_opaque_ptr(lltype.Ptr(OBJECT),
greenkey[2].getref_base())
pycode = cast_base_ptr_to_instance(PyCode, ll_code)
- return space.newtuple([space.wrap(pycode), space.wrap(next_instr),
+ return space.newtuple([pycode, space.newint(next_instr),
space.newbool(bool(is_being_profiled))])
else:
- return space.wrap(greenkey_repr)
+ return space.newtext(greenkey_repr)
@unwrap_spec(operations=bool)
def set_compile_hook(space, w_hook, operations=True):
@@ -152,10 +152,10 @@
self.repr_of_resop = repr_of_resop
def descr_repr(self, space):
- return space.wrap(self.repr_of_resop)
+ return space.newtext(self.repr_of_resop)
def descr_name(self, space):
- return space.wrap(self.name)
+ return space.newtext(self.name)
class GuardOp(WrappedOp):
def __init__(self, name, offset, repr_of_resop, hash):
@@ -178,20 +178,20 @@
def get_pycode(self, space):
if self.jd_name == pypyjitdriver.name:
- return space.getitem(self.w_greenkey, space.wrap(0))
+ return space.getitem(self.w_greenkey, space.newint(0))
raise oefmt(space.w_AttributeError,
"This DebugMergePoint doesn't belong to the main Python "
"JitDriver")
def get_bytecode_no(self, space):
if self.jd_name == pypyjitdriver.name:
- return space.getitem(self.w_greenkey, space.wrap(1))
+ return space.getitem(self.w_greenkey, space.newint(1))
raise oefmt(space.w_AttributeError,
"This DebugMergePoint doesn't belong to the main Python "
"JitDriver")
def get_jitdriver_name(self, space):
- return space.wrap(self.jd_name)
+ return space.newtext(self.jd_name)
WrappedOp.typedef = TypeDef(
'ResOperation',
@@ -281,12 +281,12 @@
code_repr = 'bridge no %d' % self.bridge_no
else:
code_repr = space.str_w(space.repr(self.w_green_key))
- return space.wrap('<JitLoopInfo %s, %d operations, starting at <%s>>' %
- (self.jd_name, lgt, code_repr))
+ return space.newtext('<JitLoopInfo %s, %d operations, starting at
<%s>>' %
+ (self.jd_name, lgt, code_repr))
def descr_get_bridge_no(self, space):
if space.is_none(self.w_green_key):
- return space.wrap(self.bridge_no)
+ return space.newint(self.bridge_no)
raise oefmt(space.w_TypeError, "not a bridge")
@@ -374,15 +374,14 @@
space.setitem_str(w_counter_times, 'TRACING', space.wrap(tr_time))
b_time = jit_hooks.stats_get_times_value(None, Counters.BACKEND)
space.setitem_str(w_counter_times, 'BACKEND', space.wrap(b_time))
- return space.wrap(W_JitInfoSnapshot(space, w_times, w_counters,
- w_counter_times))
+ return W_JitInfoSnapshot(space, w_times, w_counters, w_counter_times)
def get_stats_asmmemmgr(space):
"""Returns the raw memory currently used by the JIT backend,
as a pair (total_memory_allocated, memory_in_use)."""
m1 = jit_hooks.stats_asmmemmgr_allocated(None)
m2 = jit_hooks.stats_asmmemmgr_used(None)
- return space.newtuple([space.wrap(m1), space.wrap(m2)])
+ return space.newtuple([space.newint(m1), space.newint(m2)])
def enable_debug(space):
""" Set the jit debugging - completely necessary for some stats to work,
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
