rename gevent.run() -> gevent.wait()

examples/portforwarder.py

@@ -78,7 +78,7 @@ def main():
     gevent.signal(signal.SIGTERM, server.close)
     gevent.signal(signal.SIGINT, server.close)
     server.start()
-    gevent.run()
+    gevent.wait()
 
 
 def log(message, *args):

examples/psycopg2_pool.py

@@ -166,6 +166,6 @@ if __name__ == '__main__':
     start = time.time()
     for _ in xrange(4):
         gevent.spawn(pool.execute, 'select pg_sleep(1);')
-    gevent.run()
+    gevent.wait()
     delay = time.time() - start
     print 'Running "select pg_sleep(1);" 4 times with 3 connections. Should take about 2 seconds: %.2fs' % delay

examples/threadpool.py

@@ -7,6 +7,6 @@ pool = ThreadPool(3)
 start = time.time()
 for _ in xrange(4):
     pool.spawn(time.sleep, 1)
-gevent.run()
+gevent.wait()
 delay = time.time() - start
 print 'Running "time.sleep(1)" 4 times with 3 threads. Should take about 2 seconds: %.3fs' % delay

gevent/__init__.py

@@ -29,7 +29,7 @@ __all__ = ['get_hub',
            'signal',
            'fork',
            'reinit',
-           'run']
+           'wait']
 
 
 import sys
@@ -50,5 +50,8 @@ except ImportError:
     __all__.remove('fork')
 
 
-def run(timeout=None, event=None):
+def wait(timeout=None, event=None):
     return get_hub().join(timeout=timeout, event=event)
+
+
+run = wait  # XXX to be deleted (soon)

greentest/testrunner.py

@@ -67,7 +67,7 @@ def run_many(tests, expected=None):
             for name, cmd, options in tests:
                 total += 1
                 spawn(run_one, name, cmd, **options)
-            gevent.run()
+            gevent.wait()
         except KeyboardInterrupt:
             try:
                 if pool: