[pypy-commit] pypy py3k: py3k syntax
mattip
noreply at buildbot.pypy.org
Sat Jul 14 13:43:58 CEST 2012
Author: Matti Picus <matti.picus at gmail.com>
Branch: py3k
Changeset: r56077:0797e074be47
Date: 2012-07-14 14:43 +0300
http://bitbucket.org/pypy/pypy/changeset/0797e074be47/
Log: py3k syntax
diff --git a/pypy/interpreter/gateway.py b/pypy/interpreter/gateway.py
--- a/pypy/interpreter/gateway.py
+++ b/pypy/interpreter/gateway.py
@@ -108,7 +108,8 @@
self.func = original_sig.func
self.orig_arg = iter(original_sig.argnames).next
- def visit_function(self, (func, cls), app_sig):
+ def visit_function(self, func_cls, app_sig):
+ func, cls = func_cls
self.dispatch(cls, app_sig)
def visit_self(self, cls, app_sig):
@@ -208,7 +209,8 @@
def scopenext(self):
return "scope_w[%d]" % self.succ()
- def visit_function(self, (func, cls)):
+ def visit_function(self, func_cls):
+ func, cls = func_cls
self.run_args.append("%s(%s)" % (self.use(func),
self.scopenext()))
@@ -294,7 +296,7 @@
def _run(self, space, scope_w):
return self.behavior(%s)
\n""" % (', '.join(self.run_args),)
- exec compile2(source) in self.miniglobals, d
+ exec(compile2(source) in self.miniglobals, d)
activation_cls = type("BuiltinActivation_UwS_%s" % label,
(BuiltinActivation,), d)
@@ -320,7 +322,7 @@
def _run(self, space, scope_w):
"""Subclasses with behavior specific for an unwrap spec are generated"""
- raise TypeError, "abstract"
+ raise TypeError("abstract")
#________________________________________________________________
@@ -346,7 +348,7 @@
self.args.append(arg)
return arg
- def visit_function(self, (func, cls)):
+ def visit_function(self, func_cls):
raise FastFuncNotSupported
def visit_self(self, typ):
@@ -434,7 +436,7 @@
\n""" % (func.__name__, narg,
', '.join(args),
', '.join(unwrap_info.unwrap))
- exec compile2(source) in unwrap_info.miniglobals, d
+ exec(compile2(source) in unwrap_info.miniglobals, d)
fastfunc = d['fastfunc_%s_%d' % (func.__name__, narg)]
return narg, fastfunc
make_fastfunc = staticmethod(make_fastfunc)
@@ -627,7 +629,7 @@
self.descrmismatch_op,
self.descr_reqcls,
args)
- except Exception, e:
+ except Exception as e:
self.handle_exception(space, e)
w_result = None
if w_result is None:
@@ -644,7 +646,7 @@
space.w_None)
except MemoryError:
raise OperationError(space.w_MemoryError, space.w_None)
- except rstackovf.StackOverflow, e:
+ except rstackovf.StackOverflow as e:
rstackovf.check_stack_overflow()
raise space.prebuilt_recursion_error
except RuntimeError: # not on top of py.py
@@ -664,7 +666,7 @@
self.descrmismatch_op,
self.descr_reqcls,
args)
- except Exception, e:
+ except Exception as e:
self.handle_exception(space, e)
w_result = None
if w_result is None:
@@ -684,7 +686,7 @@
self.descrmismatch_op,
self.descr_reqcls,
args.prepend(w_obj))
- except Exception, e:
+ except Exception as e:
self.handle_exception(space, e)
w_result = None
if w_result is None:
@@ -701,7 +703,7 @@
except DescrMismatch:
raise OperationError(space.w_SystemError,
space.wrap("unexpected DescrMismatch error"))
- except Exception, e:
+ except Exception as e:
self.handle_exception(space, e)
w_result = None
if w_result is None:
@@ -720,7 +722,7 @@
self.descrmismatch_op,
self.descr_reqcls,
Arguments(space, [w1]))
- except Exception, e:
+ except Exception as e:
self.handle_exception(space, e)
w_result = None
if w_result is None:
@@ -739,7 +741,7 @@
self.descrmismatch_op,
self.descr_reqcls,
Arguments(space, [w1, w2]))
- except Exception, e:
+ except Exception as e:
self.handle_exception(space, e)
w_result = None
if w_result is None:
@@ -758,7 +760,7 @@
self.descrmismatch_op,
self.descr_reqcls,
Arguments(space, [w1, w2, w3]))
- except Exception, e:
+ except Exception as e:
self.handle_exception(space, e)
w_result = None
if w_result is None:
@@ -778,7 +780,7 @@
self.descr_reqcls,
Arguments(space,
[w1, w2, w3, w4]))
- except Exception, e:
+ except Exception as e:
self.handle_exception(space, e)
w_result = None
if w_result is None:
@@ -812,10 +814,10 @@
self_type = f.im_class
f = f.im_func
if not isinstance(f, types.FunctionType):
- raise TypeError, "function expected, got %r instead" % f
+ raise TypeError("function expected, got %r instead" % f)
if app_name is None:
if f.func_name.startswith('app_'):
- raise ValueError, ("function name %r suspiciously starts "
+ raise ValueError("function name %r suspiciously starts "
"with 'app_'" % f.func_name)
app_name = f.func_name
More information about the pypy-commit
mailing list