Merge pull request #1430 from matthew-brett/old-tornado-check

Fix for tornado check for tornado < 1.1.0.

IPython/frontend/html/notebook/__init__.py

@@ -1,12 +1,15 b''
 """The IPython HTML Notebook"""
 
 # check for tornado 2.1.0
 msg = "The IPython Notebook requires tornado >= 2.1.0"
 try:
     import tornado
 except ImportError:
     raise ImportError(msg)
-else:
-    if tornado.version_info < (2,1,0):
+try:
+    version_info = tornado.version_info
+except AttributeError:
+    raise ImportError(msg + ", but you have < 1.1.0")
+if version_info < (2,1,0):
         raise ImportError(msg+", but you have %s"%tornado.version)
 del msg