[pypy-commit] pypy kill-flowobjspace: rm useless space attr from CallSpec

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: kill-flowobjspace
Changeset: r60835:2e055d6595a3
Date: 2013-02-03 02:14 +0000
http://bitbucket.org/pypy/pypy/changeset/2e055d6595a3/

Log:	rm useless space attr from CallSpec

diff --git a/rpython/flowspace/argument.py b/rpython/flowspace/argument.py
--- a/rpython/flowspace/argument.py
+++ b/rpython/flowspace/argument.py
@@ -77,11 +77,10 @@
     """Represents the arguments passed into a function call, i.e. the
     `a, b, *c, **d` part in `return func(a, b, *c, **d)`.
     """
-    def __init__(self, space, args_w, keywords=None, w_stararg=None,
+    def __init__(self, args_w, keywords=None, w_stararg=None,
             w_starstararg=None):
         self.w_stararg = w_stararg
         assert w_starstararg is None, "No **-unpacking in RPython"
-        self.space = space
         assert isinstance(args_w, list)
         self.arguments_w = args_w
         self.keywords = keywords or {}
diff --git a/rpython/flowspace/flowcontext.py b/rpython/flowspace/flowcontext.py
--- a/rpython/flowspace/flowcontext.py
+++ b/rpython/flowspace/flowcontext.py
@@ -982,7 +982,7 @@
             key = self.space.str_w(w_key)
             keywords[key] = w_value
         arguments = self.popvalues(n_arguments)
-        args = CallSpec(self.space, arguments, keywords, w_star, w_starstar)
+        args = CallSpec(arguments, keywords, w_star, w_starstar)
         w_function  = self.popvalue()
         w_result = self.space.call_args(w_function, args)
         self.pushvalue(w_result)
diff --git a/rpython/flowspace/objspace.py b/rpython/flowspace/objspace.py
--- a/rpython/flowspace/objspace.py
+++ b/rpython/flowspace/objspace.py
@@ -393,7 +393,7 @@
         return self.call_function(w_meth, *arg_w)
 
     def call_function(self, w_func, *args_w):
-        args = CallSpec(self, list(args_w))
+        args = CallSpec(list(args_w))
         return self.call_args(w_func, args)
 
     def appcall(self, func, *args_w):