From: Steve <steve.liushihao@gmail.com>
Date: Mon, 22 Jan 2018 01:22:37 +0000 (-0700)
Subject: remove redundant code
X-Git-Tag: v5.1.0b1~11^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3edf7df1b2603cfa87d648c12e9cfede79dde19f;p=thirdparty%2Ftornado.git

remove redundant code
---

diff --git a/tornado/autoreload.py b/tornado/autoreload.py
index 38b3f8470..345a1bda0 100644
--- 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 44cb31397..82d360c43 100644
--- 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 = """\