From: Mark Guagenti Date: Mon, 16 Mar 2015 18:43:31 +0000 (-0500) Subject: APPENGINE_RUNTIME should be checked before nt X-Git-Tag: v4.2.0b1~59^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1382%2Fhead;p=thirdparty%2Ftornado.git APPENGINE_RUNTIME should be checked before nt --- diff --git a/tornado/platform/auto.py b/tornado/platform/auto.py index d3eeb56b2..fc40c9d97 100644 --- a/tornado/platform/auto.py +++ b/tornado/platform/auto.py @@ -27,14 +27,14 @@ from __future__ import absolute_import, division, print_function, with_statement import os -if os.name == 'nt': - from tornado.platform.common import Waker - from tornado.platform.windows import set_close_exec -elif 'APPENGINE_RUNTIME' in os.environ: +if 'APPENGINE_RUNTIME' in os.environ: from tornado.platform.common import Waker def set_close_exec(fd): pass +elif os.name == 'nt': + from tornado.platform.common import Waker + from tornado.platform.windows import set_close_exec else: from tornado.platform.posix import set_close_exec, Waker