Fixing ftplib test failures.

tests/stdlib/all.py

@@ -9,9 +9,11 @@ debug.hub_prevent_multiple_readers(False)
 def restart_hub():
     from eventlet import hubs
     hub = hubs.get_hub()
-    hub.abort()
     hub_shortname = hub.__module__.split('.')[-1]
-    hubs.use_hub(hub_shortname)
+    # don't restart the pyevent hub; it's not necessary
+    if hub_shortname != 'pyevent':
+        hub.abort()
+        hubs.use_hub(hub_shortname)
 
 def assimilate_patched(name):
     try:

tests/stdlib/test_ftplib.py

@@ -4,8 +4,7 @@ from eventlet.green import ftplib
 from eventlet.green import threading
 from eventlet.green import socket
 
-patcher.inject('test.test_ftplib',
-               globals())
+patcher.inject('test.test_ftplib', globals())
     
 if __name__ == "__main__":
     test_main()