remove redundant code

diff --git a/tornado/autoreload.py b/tornado/autoreload.py
index 38b3f8470f1b3c1e890f3e5f768f1b52f1ff27ee..345a1bda0bdeb04ec00e259d917840212d107735 100644 (file)
--- a/tornado/autoreload.py
+++ b/tornado/autoreload.py
@@ -348,6 +348,5 @@ if __name__ == "__main__":
     # sys.path before our imports
     # Ensure that any global variables accessed by main() are in the module namespace
     # instead of the __main__ namespace
-    import tornado.autoreload
-    tornado.autoreload.main()
+    main()
 

diff --git a/tornado/test/autoreload_test.py b/tornado/test/autoreload_test.py
index 44cb31397e020e2e701557669d07abc4976f8aa2..82d360c4399f0e173ec57ecbde65cde633d5bf41 100644 (file)
--- a/tornado/test/autoreload_test.py
+++ b/tornado/test/autoreload_test.py
@@ -62,9 +62,8 @@ sys.stdout.flush()
 if 'TESTAPP_STARTED' not in os.environ:
     os.environ['TESTAPP_STARTED'] = '1'
 else:
-    # Force the autoreload to exit
-    autoreload.add_reload_hook(lambda: os._exit(0))
-    autoreload._reload()
+    # Avoid the autoreload to be caught by SystemExit
+    os._exit(0)
 """
 
         touch = """\