Merge pull request #353 from fantix/fix_exec

Fixed exec, refs #38.

gevent/fileobject.py

@@ -261,12 +261,12 @@ class FileObjectThread(object):
 
     for method in ['read', 'readinto', 'readline', 'readlines', 'write', 'writelines', 'xreadlines']:
 
-        exec '''def %s(self, *args, **kwargs):
+        exec('''def %s(self, *args, **kwargs):
     fobj = self._fobj
     if fobj is None:
         raise FileObjectClosed
     return self._apply(fobj.%s, args, kwargs)
-''' % (method, method)
+''' % (method, method))
 
     def __iter__(self):
         return self

greentest/monkey_test.py

@@ -30,4 +30,4 @@ test_name = os.path.splitext(test_filename)[0]
 module_source = open(test_filename).read()
 module_source = disable_tests_in_source(module_source, test_name)
 module_code = compile(module_source, test_filename, 'exec')
-exec module_code in globals()
+exec(module_code, globals())

greentest/test__all__.py

 """Check __all__, __implements__, __extensions__, __imports__ of the modules"""
 from __future__ import print_function
+import six
 import sys
 import unittest
 import types
@@ -43,7 +44,7 @@ class Test(unittest.TestCase):
             assert self.modname in NO_ALL
             return
         names = {}
-        exec("from %s import *" % self.modname) in names
+        six.exec_("from %s import *" % self.modname, names)
         names.pop('__builtins__', None)
         self.assertEqual(sorted(names), sorted(self.module.__all__))
 
@@ -140,7 +141,7 @@ are missing from %r:
 
     def _test(self, modname):
         self.modname = modname
-        exec "import %s" % modname in {}
+        six.exec_("import %s" % modname, {})
         self.module = sys.modules[modname]
 
         self.check_all()

greentest/test_threading_2.py

@@ -24,7 +24,7 @@ if not hasattr(threading._Condition, 'notify_all'):
     threading._Condition.notify_all = threading._Condition.notifyAll
 '''
 
-exec setup_
+exec(setup_)
 
 setup_3 = '\n'.join('            %s' % line for line in setup_.split('\n'))
 setup_4 = '\n'.join('                %s' % line for line in setup_.split('\n'))