[pypy-commit] pypy default: Fix: only 'exec' was broken.

arigo noreply at buildbot.pypy.org
Tue Sep 6 06:37:14 CEST 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r47099:2c2f3d3849d5
Date: 2011-09-06 06:35 +0200
http://bitbucket.org/pypy/pypy/changeset/2c2f3d3849d5/

Log:	Fix: only 'exec' was broken.

diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -1523,10 +1523,8 @@
 
         if not isinstance(prog, codetype):
             filename = '<string>'
-            if not isinstance(prog, str):
-                if isinstance(prog, basestring):
-                    prog = str(prog)
-                elif isinstance(prog, file):
+            if not isinstance(prog, basestring):
+                if isinstance(prog, file):
                     filename = prog.name
                     prog = prog.read()
                 else:


More information about the pypy-commit mailing list