Patch #1550800: make exec a function.
diff --git a/Lib/plat-mac/aetypes.py b/Lib/plat-mac/aetypes.py
index e5781efd..14e48d6 100644
--- a/Lib/plat-mac/aetypes.py
+++ b/Lib/plat-mac/aetypes.py
@@ -557,12 +557,12 @@
class %s(ComponentItem): want = '%s'
"""
-exec template % ("Text", 'text')
-exec template % ("Character", 'cha ')
-exec template % ("Word", 'cwor')
-exec template % ("Line", 'clin')
-exec template % ("paragraph", 'cpar')
-exec template % ("Window", 'cwin')
-exec template % ("Document", 'docu')
-exec template % ("File", 'file')
-exec template % ("InsertionPoint", 'cins')
+exec(template % ("Text", 'text'))
+exec(template % ("Character", 'cha '))
+exec(template % ("Word", 'cwor'))
+exec(template % ("Line", 'clin'))
+exec(template % ("paragraph", 'cpar'))
+exec(template % ("Window", 'cwin'))
+exec(template % ("Document", 'docu'))
+exec(template % ("File", 'file'))
+exec(template % ("InsertionPoint", 'cins'))
diff --git a/Lib/plat-mac/appletrawmain.py b/Lib/plat-mac/appletrawmain.py
index 1be9187..6f2eacb 100644
--- a/Lib/plat-mac/appletrawmain.py
+++ b/Lib/plat-mac/appletrawmain.py
@@ -57,7 +57,7 @@
# funny) and go.
#
del argvemulator, os, sys, marshal, _dir, _fp
- exec __code__
+ exec(__code__)
else:
sys.stderr.write("%s: neither __main__.py nor __main__.pyc found\n"%sys.argv[0])
sys.exit(1)
diff --git a/Lib/plat-mac/pimp.py b/Lib/plat-mac/pimp.py
index 454e4b1..ff696b1 100644
--- a/Lib/plat-mac/pimp.py
+++ b/Lib/plat-mac/pimp.py
@@ -588,7 +588,7 @@
}
installTest = self._dict['Install-test'].strip() + '\n'
try:
- exec installTest in namespace
+ exec(installTest, namespace)
except ImportError, arg:
return "no", str(arg)
except _scriptExc_NotInstalled, arg:
@@ -757,7 +757,7 @@
if line[0] == '#':
continue
if line[:6] == 'import':
- exec line
+ exec(line)
continue
if line[-1] == '\n':
line = line[:-1]