[pypy-svn] r11995 - in pypy/dist/pypy: interpreter module/builtin

[pedronis at codespeak.net]

Author: pedronis
Date: Fri May  6 00:30:31 2005
New Revision: 11995

Modified:
   pypy/dist/pypy/interpreter/pyopcode.py
   pypy/dist/pypy/module/builtin/compiling.py
Log:
fixes to pass test_compile again



Modified: pypy/dist/pypy/interpreter/pyopcode.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyopcode.py	(original)
+++ pypy/dist/pypy/interpreter/pyopcode.py	Fri May  6 00:30:31 2005
@@ -882,10 +882,11 @@
             try:
                 prog = compile(prog, filename, 'exec', compile_flags, 1)
             except SyntaxError, e: # exec SyntaxErrors have filename==None
-               msg, loc = e.args
-               loc1 = (None,) + loc[1:]
-               e.args = msg, loc1
-               e.filename = None
+               if len(e.args) == 2:
+                   msg, loc = e.args
+                   loc1 = (None,) + loc[1:]
+                   e.args = msg, loc1
+                   e.filename = None
                raise e
         return (prog, globals, locals)
 ''', filename=__file__)

Modified: pypy/dist/pypy/module/builtin/compiling.py
==============================================================================
--- pypy/dist/pypy/module/builtin/compiling.py	(original)
+++ pypy/dist/pypy/module/builtin/compiling.py	Fri May  6 00:30:31 2005
@@ -41,10 +41,11 @@
         except OperationError, e:
             if e.match(space, space.w_SyntaxError):
                 e_value_w = space.unpacktuple(e.w_value)
-                e_loc_w = space.unpacktuple(e_value_w[1])
-                e.w_value = space.newtuple([e_value_w[0],
-                                            space.newtuple([space.w_None]+
-                                                           e_loc_w[1:])])
+                if len(e_value_w) == 2:
+                    e_loc_w = space.unpacktuple(e_value_w[1])
+                    e.w_value = space.newtuple([e_value_w[0],
+                                                space.newtuple([space.w_None]+
+                                                               e_loc_w[1:])])
                 raise e
             else:
                 raise