summaryrefslogtreecommitdiffstats
path: root/Demo
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2006-09-06 06:51:57 (GMT)
committerGeorg Brandl <georg@python.org>2006-09-06 06:51:57 (GMT)
commit7cae87ca7b0a3a7ce497cbd335c8ec82fe680476 (patch)
tree612cc46e728bef49b19f3d4bc26fa4951b2c1c83 /Demo
parent4e472e05bdddde72d91d6f25d6e048371cf3c9be (diff)
downloadcpython-7cae87ca7b0a3a7ce497cbd335c8ec82fe680476.zip
cpython-7cae87ca7b0a3a7ce497cbd335c8ec82fe680476.tar.gz
cpython-7cae87ca7b0a3a7ce497cbd335c8ec82fe680476.tar.bz2
Patch #1550800: make exec a function.
Diffstat (limited to 'Demo')
-rw-r--r--Demo/parser/unparse.py10
-rwxr-xr-xDemo/pysvr/pysvr.py2
-rwxr-xr-xDemo/sockets/rpythond.py2
3 files changed, 2 insertions, 12 deletions
diff --git a/Demo/parser/unparse.py b/Demo/parser/unparse.py
index 510cdb0..f3a5ffe 100644
--- a/Demo/parser/unparse.py
+++ b/Demo/parser/unparse.py
@@ -123,16 +123,6 @@ class Unparser:
self.write(", ")
self.dispatch(t.msg)
- def _Exec(self, t):
- self.fill("exec ")
- self.dispatch(t.body)
- if t.globals:
- self.write(" in ")
- self.dispatch(t.globals)
- if t.locals:
- self.write(", ")
- self.dispatch(t.locals)
-
def _Print(self, t):
self.fill("print ")
do_comma = False
diff --git a/Demo/pysvr/pysvr.py b/Demo/pysvr/pysvr.py
index dd0abdc..3b692b3 100755
--- a/Demo/pysvr/pysvr.py
+++ b/Demo/pysvr/pysvr.py
@@ -108,7 +108,7 @@ def run_command(code, stdin, stdout, globals):
sys.stdout = sys.stderr = stdout
sys.stdin = stdin
try:
- exec code in globals
+ exec(code, globals)
except SystemExit, how:
raise SystemExit, how, sys.exc_info()[2]
except:
diff --git a/Demo/sockets/rpythond.py b/Demo/sockets/rpythond.py
index 81397d6..34de982 100755
--- a/Demo/sockets/rpythond.py
+++ b/Demo/sockets/rpythond.py
@@ -40,7 +40,7 @@ def execute(request):
sys.stdout = sys.stderr = fakefile = StringIO.StringIO()
try:
try:
- exec request in {}, {}
+ exec(request, {}, {})
except:
print
traceback.print_exc(100)