review fixes on tests, add extra kernel api test

IPython/html/base/handlers.py

@@ -1,423 +1,419 b''
 """Base Tornado handlers for the notebook.
 
 Authors:
 
 * Brian Granger
 """
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2011  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
 
 import datetime
 import email.utils
 import hashlib
 import logging
 import mimetypes
 import os
 import stat
 import threading
 
 from tornado import web
 from tornado import websocket
 
 try:
     from tornado.log import app_log
 except ImportError:
     app_log = logging.getLogger()
 
 from IPython.config import Application
 from IPython.external.decorator import decorator
 from IPython.utils.path import filefind
 
 #-----------------------------------------------------------------------------
 # Monkeypatch for Tornado <= 2.1.1 - Remove when no longer necessary!
 #-----------------------------------------------------------------------------
 
 # Google Chrome, as of release 16, changed its websocket protocol number.  The
 # parts tornado cares about haven't really changed, so it's OK to continue
 # accepting Chrome connections, but as of Tornado 2.1.1 (the currently released
 # version as of Oct 30/2011) the version check fails, see the issue report:
 
 # https://github.com/facebook/tornado/issues/385
 
 # This issue has been fixed in Tornado post 2.1.1:
 
 # https://github.com/facebook/tornado/commit/84d7b458f956727c3b0d6710
 
 # Here we manually apply the same patch as above so that users of IPython can
 # continue to work with an officially released Tornado.  We make the
 # monkeypatch version check as narrow as possible to limit its effects; once
 # Tornado 2.1.1 is no longer found in the wild we'll delete this code.
 
 import tornado
 
 if tornado.version_info <= (2,1,1):
 
     def _execute(self, transforms, *args, **kwargs):
         from tornado.websocket import WebSocketProtocol8, WebSocketProtocol76
         
         self.open_args = args
         self.open_kwargs = kwargs
 
         # The difference between version 8 and 13 is that in 8 the
         # client sends a "Sec-Websocket-Origin" header and in 13 it's
         # simply "Origin".
         if self.request.headers.get("Sec-WebSocket-Version") in ("7", "8", "13"):
             self.ws_connection = WebSocketProtocol8(self)
             self.ws_connection.accept_connection()
             
         elif self.request.headers.get("Sec-WebSocket-Version"):
             self.stream.write(tornado.escape.utf8(
                 "HTTP/1.1 426 Upgrade Required\r\n"
                 "Sec-WebSocket-Version: 8\r\n\r\n"))
             self.stream.close()
             
         else:
             self.ws_connection = WebSocketProtocol76(self)
             self.ws_connection.accept_connection()
 
     websocket.WebSocketHandler._execute = _execute
     del _execute
 
 
 #-----------------------------------------------------------------------------
 # Top-level handlers
 #-----------------------------------------------------------------------------
 
 class RequestHandler(web.RequestHandler):
     """RequestHandler with default variable setting."""
 
     def render(*args, **kwargs):
         kwargs.setdefault('message', '')
         return web.RequestHandler.render(*args, **kwargs)
 
 class AuthenticatedHandler(RequestHandler):
     """A RequestHandler with an authenticated user."""
 
     def clear_login_cookie(self):
         self.clear_cookie(self.cookie_name)
     
     def get_current_user(self):
         user_id = self.get_secure_cookie(self.cookie_name)
         # For now the user_id should not return empty, but it could eventually
         if user_id == '':
             user_id = 'anonymous'
         if user_id is None:
             # prevent extra Invalid cookie sig warnings:
             self.clear_login_cookie()
             if not self.login_available:
                 user_id = 'anonymous'
         return user_id
 
     @property
     def cookie_name(self):
         default_cookie_name = 'username-{host}'.format(
             host=self.request.host,
         ).replace(':', '-')
         return self.settings.get('cookie_name', default_cookie_name)
     
     @property
     def password(self):
         """our password"""
         return self.settings.get('password', '')
     
     @property
     def logged_in(self):
         """Is a user currently logged in?
 
         """
         user = self.get_current_user()
         return (user and not user == 'anonymous')
 
     @property
     def login_available(self):
         """May a user proceed to log in?
 
         This returns True if login capability is available, irrespective of
         whether the user is already logged in or not.
 
         """
         return bool(self.settings.get('password', ''))
 
 
 class IPythonHandler(AuthenticatedHandler):
     """IPython-specific extensions to authenticated handling
     
     Mostly property shortcuts to IPython-specific settings.
     """
     
     @property
     def config(self):
         return self.settings.get('config', None)
     
     @property
     def log(self):
         """use the IPython log by default, falling back on tornado's logger"""
         if Application.initialized():
             return Application.instance().log
         else:
             return app_log
     
     @property
     def use_less(self):
         """Use less instead of css in templates"""
         return self.settings.get('use_less', False)
     
     #---------------------------------------------------------------
     # URLs
     #---------------------------------------------------------------
     
     @property
     def ws_url(self):
         """websocket url matching the current request
 
         By default, this is just `''`, indicating that it should match
         the same host, protocol, port, etc.
         """
         return self.settings.get('websocket_url', '')
     
     @property
     def mathjax_url(self):
         return self.settings.get('mathjax_url', '')
     
     @property
     def base_project_url(self):
         return self.settings.get('base_project_url', '/')
     
     @property
     def base_kernel_url(self):
         return self.settings.get('base_kernel_url', '/')
     
     #---------------------------------------------------------------
     # Manager objects
     #---------------------------------------------------------------
     
     @property
     def kernel_manager(self):
         return self.settings['kernel_manager']
 
     @property
     def notebook_manager(self):
         return self.settings['notebook_manager']
     
     @property
     def cluster_manager(self):
         return self.settings['cluster_manager']
     
     @property
     def session_manager(self):
         return self.settings['session_manager']
     
     @property
-    def content_manager(self):
-        return self.settings['content_manager']
-    
-    @property
     def project(self):
         return self.notebook_manager.notebook_dir
     
     #---------------------------------------------------------------
     # template rendering
     #---------------------------------------------------------------
     
     def get_template(self, name):
         """Return the jinja template object for a given name"""
         return self.settings['jinja2_env'].get_template(name)
     
     def render_template(self, name, **ns):
         ns.update(self.template_namespace)
         template = self.get_template(name)
         return template.render(**ns)
     
     @property
     def template_namespace(self):
         return dict(
             base_project_url=self.base_project_url,
             base_kernel_url=self.base_kernel_url,
             logged_in=self.logged_in,
             login_available=self.login_available,
             use_less=self.use_less,
         )
 
 class AuthenticatedFileHandler(IPythonHandler, web.StaticFileHandler):
     """static files should only be accessible when logged in"""
 
     @web.authenticated
     def get(self, path):
         return web.StaticFileHandler.get(self, path)
 
 
 #-----------------------------------------------------------------------------
 # File handler
 #-----------------------------------------------------------------------------
 
 # to minimize subclass changes:
 HTTPError = web.HTTPError
 
 class FileFindHandler(web.StaticFileHandler):
     """subclass of StaticFileHandler for serving files from a search path"""
     
     _static_paths = {}
     # _lock is needed for tornado < 2.2.0 compat
     _lock = threading.Lock()  # protects _static_hashes
     
     def initialize(self, path, default_filename=None):
         if isinstance(path, basestring):
             path = [path]
         self.roots = tuple(
             os.path.abspath(os.path.expanduser(p)) + os.path.sep for p in path
         )
         self.default_filename = default_filename
     
     @classmethod
     def locate_file(cls, path, roots):
         """locate a file to serve on our static file search path"""
         with cls._lock:
             if path in cls._static_paths:
                 return cls._static_paths[path]
             try:
                 abspath = os.path.abspath(filefind(path, roots))
             except IOError:
                 # empty string should always give exists=False
                 return ''
         
             # os.path.abspath strips a trailing /
             # it needs to be temporarily added back for requests to root/
             if not (abspath + os.path.sep).startswith(roots):
                 raise HTTPError(403, "%s is not in root static directory", path)
         
             cls._static_paths[path] = abspath
             return abspath
     
     def get(self, path, include_body=True):
         path = self.parse_url_path(path)
         
         # begin subclass override
         abspath = self.locate_file(path, self.roots)
         # end subclass override
         
         if os.path.isdir(abspath) and self.default_filename is not None:
             # need to look at the request.path here for when path is empty
             # but there is some prefix to the path that was already
             # trimmed by the routing
             if not self.request.path.endswith("/"):
                 self.redirect(self.request.path + "/")
                 return
             abspath = os.path.join(abspath, self.default_filename)
         if not os.path.exists(abspath):
             raise HTTPError(404)
         if not os.path.isfile(abspath):
             raise HTTPError(403, "%s is not a file", path)
 
         stat_result = os.stat(abspath)
         modified = datetime.datetime.utcfromtimestamp(stat_result[stat.ST_MTIME])
 
         self.set_header("Last-Modified", modified)
 
         mime_type, encoding = mimetypes.guess_type(abspath)
         if mime_type:
             self.set_header("Content-Type", mime_type)
 
         cache_time = self.get_cache_time(path, modified, mime_type)
 
         if cache_time > 0:
             self.set_header("Expires", datetime.datetime.utcnow() + \
                                        datetime.timedelta(seconds=cache_time))
             self.set_header("Cache-Control", "max-age=" + str(cache_time))
         else:
             self.set_header("Cache-Control", "public")
 
         self.set_extra_headers(path)
 
         # Check the If-Modified-Since, and don't send the result if the
         # content has not been modified
         ims_value = self.request.headers.get("If-Modified-Since")
         if ims_value is not None:
             date_tuple = email.utils.parsedate(ims_value)
             if_since = datetime.datetime(*date_tuple[:6])
             if if_since >= modified:
                 self.set_status(304)
                 return
 
         with open(abspath, "rb") as file:
             data = file.read()
             hasher = hashlib.sha1()
             hasher.update(data)
             self.set_header("Etag", '"%s"' % hasher.hexdigest())
             if include_body:
                 self.write(data)
             else:
                 assert self.request.method == "HEAD"
                 self.set_header("Content-Length", len(data))
 
     @classmethod
     def get_version(cls, settings, path):
         """Generate the version string to be used in static URLs.
 
         This method may be overridden in subclasses (but note that it
         is a class method rather than a static method).  The default
         implementation uses a hash of the file's contents.
 
         ``settings`` is the `Application.settings` dictionary and ``path``
         is the relative location of the requested asset on the filesystem.
         The returned value should be a string, or ``None`` if no version
         could be determined.
         """
         # begin subclass override:
         static_paths = settings['static_path']
         if isinstance(static_paths, basestring):
             static_paths = [static_paths]
         roots = tuple(
             os.path.abspath(os.path.expanduser(p)) + os.path.sep for p in static_paths
         )
 
         try:
             abs_path = filefind(path, roots)
         except IOError:
             app_log.error("Could not find static file %r", path)
             return None
         
         # end subclass override
         
         with cls._lock:
             hashes = cls._static_hashes
             if abs_path not in hashes:
                 try:
                     f = open(abs_path, "rb")
                     hashes[abs_path] = hashlib.md5(f.read()).hexdigest()
                     f.close()
                 except Exception:
                     app_log.error("Could not open static file %r", path)
                     hashes[abs_path] = None
             hsh = hashes.get(abs_path)
             if hsh:
                 return hsh[:5]
         return None
 
 
     def parse_url_path(self, url_path):
         """Converts a static URL path into a filesystem path.
 
         ``url_path`` is the path component of the URL with
         ``static_url_prefix`` removed.  The return value should be
         filesystem path relative to ``static_path``.
         """
         if os.path.sep != "/":
             url_path = url_path.replace("/", os.path.sep)
         return url_path
 
 #-----------------------------------------------------------------------------
 # URL to handler mappings
 #-----------------------------------------------------------------------------
 
 
 default_handlers = []

IPython/html/services/kernels/tests/test_kernels_api.py

@@ -1,36 +1,53 b''
 """Test the kernels service API."""
 
 
 import os
 import sys
 import json
 
 import requests
 
 from IPython.html.tests.launchnotebook import NotebookTestBase
 
 
 class KernelAPITest(NotebookTestBase):
     """Test the kernels web service API"""
 
     def base_url(self):
         return super(KernelAPITest,self).base_url() + 'api/kernels'
 
+    def mkkernel(self):
+        r = requests.post(self.base_url())
+        return r.json()
+
     def test_no_kernels(self):
         """Make sure there are no kernels running at the start"""
         url = self.base_url()
         r = requests.get(url)
-        assert r.json() == []
+        self.assertEqual(r.json(), [])
 
     def test_main_kernel_handler(self):
         # POST request
         r = requests.post(self.base_url())
         data = r.json()
         assert isinstance(data, dict)
 
         # GET request
         r = requests.get(self.base_url())
         assert isinstance(r.json(), list)
         self.assertEqual(r.json()[0], data['id'])
 
-        
  No newline at end of file
+    def test_kernel_handler(self):
+        # GET kernel with id
+        data = self.mkkernel()
+        url = self.base_url() +'/' + data['id']
+        r = requests.get(url)
+        assert isinstance(r.json(), dict)
+        self.assertIn('id', r.json())
+        self.assertEqual(r.json()['id'], data['id'])
+        
+        # DELETE kernel with id
+        r = requests.delete(url)
+        self.assertEqual(r.status_code, 204)
+        r = requests.get(self.base_url())
+        self.assertEqual(r.json(), [])
  No newline at end of file

IPython/html/services/notebooks/filenbmanager.py

@@ -1,347 +1,347 b''
 """A notebook manager that uses the local file system for storage.
 
 Authors:
 
 * Brian Granger
 """
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2011  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
 import datetime
 import io
 import os
 import glob
 import shutil
 
 from unicodedata import normalize
 
 from tornado import web
 
 from .nbmanager import NotebookManager
 from IPython.nbformat import current
 from IPython.utils.traitlets import Unicode, Dict, Bool, TraitError
 from IPython.utils import tz
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
 class FileNotebookManager(NotebookManager):
     
     save_script = Bool(False, config=True,
         help="""Automatically create a Python script when saving the notebook.
         
         For easier use of import, %run and %load across notebooks, a
         <notebook-name>.py script will be created next to any
         <notebook-name>.ipynb on each save.  This can also be set with the
         short `--script` flag.
         """
     )
     
     checkpoint_dir = Unicode(config=True,
         help="""The location in which to keep notebook checkpoints
         
         By default, it is notebook-dir/.ipynb_checkpoints
         """
     )
     def _checkpoint_dir_default(self):
         return os.path.join(self.notebook_dir, '.ipynb_checkpoints')
     
     def _checkpoint_dir_changed(self, name, old, new):
         """do a bit of validation of the checkpoint dir"""
         if not os.path.isabs(new):
             # If we receive a non-absolute path, make it absolute.
             abs_new = os.path.abspath(new)
             self.checkpoint_dir = abs_new
             return
         if os.path.exists(new) and not os.path.isdir(new):
             raise TraitError("checkpoint dir %r is not a directory" % new)
         if not os.path.exists(new):
             self.log.info("Creating checkpoint dir %s", new)
             try:
                 os.mkdir(new)
             except:
                 raise TraitError("Couldn't create checkpoint dir %r" % new)
     
     filename_ext = Unicode(u'.ipynb')
 
     
     def get_notebook_names(self, path):
         """List all notebook names in the notebook dir."""
         names = glob.glob(self.get_os_path('*'+self.filename_ext, path))
         names = [os.path.basename(name)
                  for name in names]
         return names
         
     def list_notebooks(self, path):
         """List all notebooks in the notebook dir."""
         notebook_names = self.get_notebook_names(path)
         notebooks = []
         for name in notebook_names:
             model = self.notebook_model(name, path, content=False)
             notebooks.append(model)
         return notebooks
 
-    def change_notebook(self, data, notebook_name, notebook_path='/'):
+    def update_notebook(self, data, notebook_name, notebook_path='/'):
         """Changes notebook"""
         changes = data.keys()
         for change in changes:
             full_path = self.get_os_path(notebook_name, notebook_path)
             if change == "name":
                 new_path = self.get_os_path(data['name'], notebook_path)
                 if not os.path.isfile(new_path):
                     os.rename(full_path,
                         self.get_os_path(data['name'], notebook_path))
                     notebook_name = data['name']
                 else:
                     raise web.HTTPError(409, u'Notebook name already exists.')
             if change == "path":
                 new_path = self.get_os_path(data['name'], data['path'])
                 stutil.move(full_path, new_path)
                 notebook_path = data['path']
             if change == "content":
                 self.save_notebook(data, notebook_name, notebook_path)
         model = self.notebook_model(notebook_name, notebook_path)
         return model
 
     def notebook_exists(self, name, path):
         """Returns a True if the notebook exists. Else, returns False.
         
         Parameters
         ----------
         name : string
             The name of the notebook you are checking.
         path : string
             The relative path to the notebook (with '/' as separator)
         
         Returns
         -------
         bool
         """
         path = self.get_os_path(name, path)
         return os.path.isfile(path)
 
     def read_notebook_object_from_path(self, path):
         """read a notebook object from a path"""
         info = os.stat(path)
         last_modified = tz.utcfromtimestamp(info.st_mtime)
         with open(path,'r') as f:
             s = f.read()
             try:
                 # v1 and v2 and json in the .ipynb files.
                 nb = current.reads(s, u'json')
             except ValueError as e:
                 msg = u"Unreadable Notebook: %s" % e
                 raise web.HTTPError(400, msg, reason=msg)
         return last_modified, nb
     
     def read_notebook_object(self, notebook_name, notebook_path='/'):
         """Get the Notebook representation of a notebook by notebook_name."""
         path = self.get_os_path(notebook_name, notebook_path)
         if not os.path.isfile(path):
             raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_name)
         last_modified, nb = self.read_notebook_object_from_path(path)
         # Always use the filename as the notebook name.
         # Eventually we will get rid of the notebook name in the metadata
         # but for now, that name is just an empty string. Until the notebooks
         # web service knows about names in URLs we still pass the name
         # back to the web app using the metadata though.
         nb.metadata.name = os.path.splitext(os.path.basename(path))[0]
         return last_modified, nb
     
     def write_notebook_object(self, nb, notebook_name=None, notebook_path='/', new_name= None):
         """Save an existing notebook object by notebook_name."""
         if new_name == None:
             try:
                 new_name = normalize('NFC', nb.metadata.name)
             except AttributeError:
                 raise web.HTTPError(400, u'Missing notebook name')
 
         new_path = notebook_path
         old_name = notebook_name
         old_checkpoints = self.list_checkpoints(old_name)
         
         path = self.get_os_path(new_name, new_path)
         
         # Right before we save the notebook, we write an empty string as the
         # notebook name in the metadata. This is to prepare for removing
         # this attribute entirely post 1.0. The web app still uses the metadata
         # name for now.
         nb.metadata.name = u''
 
         try:
             self.log.debug("Autosaving notebook %s", path)
             with open(path,'w') as f:
                 current.write(nb, f, u'json')
         except Exception as e:
             raise web.HTTPError(400, u'Unexpected error while autosaving notebook: %s' % e)
 
         # save .py script as well
         if self.save_script:
             pypath = os.path.splitext(path)[0] + '.py'
             self.log.debug("Writing script %s", pypath)
             try:
                 with io.open(pypath,'w', encoding='utf-8') as f:
                     current.write(nb, f, u'py')
             except Exception as e:
                 raise web.HTTPError(400, u'Unexpected error while saving notebook as script: %s' % e)
         
         if old_name != None:
             # remove old files if the name changed
             if old_name != new_name:            
                 # remove renamed original, if it exists
                 old_path = self.get_os_path(old_name, notebook_path)
                 if os.path.isfile(old_path):
                     self.log.debug("unlinking notebook %s", old_path)
                     os.unlink(old_path)
             
                 # cleanup old script, if it exists
                 if self.save_script:
                     old_pypath = os.path.splitext(old_path)[0] + '.py'
                     if os.path.isfile(old_pypath):
                         self.log.debug("unlinking script %s", old_pypath)
                         os.unlink(old_pypath)
                 
                 # rename checkpoints to follow file
                 for cp in old_checkpoints:
                     checkpoint_id = cp['checkpoint_id']
                     old_cp_path = self.get_checkpoint_path_by_name(old_name, checkpoint_id)
                     new_cp_path = self.get_checkpoint_path_by_name(new_name, checkpoint_id)
                     if os.path.isfile(old_cp_path):
                         self.log.debug("renaming checkpoint %s -> %s", old_cp_path, new_cp_path)
                         os.rename(old_cp_path, new_cp_path)
             
         return new_name
             
     def delete_notebook(self, notebook_name, notebook_path):
         """Delete notebook by notebook_name."""
         nb_path = self.get_os_path(notebook_name, notebook_path)
         if not os.path.isfile(nb_path):
             raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_name)
         
         # clear checkpoints
         for checkpoint in self.list_checkpoints(notebook_name):
             checkpoint_id = checkpoint['checkpoint_id']
             path = self.get_checkpoint_path(notebook_name, checkpoint_id)
             self.log.debug(path)
             if os.path.isfile(path):
                 self.log.debug("unlinking checkpoint %s", path)
                 os.unlink(path)
         
         self.log.debug("unlinking notebook %s", nb_path)
         os.unlink(nb_path)
 
     def increment_filename(self, basename, notebook_path='/'):
         """Return a non-used filename of the form basename<int>.
         
         This searches through the filenames (basename0, basename1, ...)
         until is find one that is not already being used. It is used to
         create Untitled and Copy names that are unique.
         """
         i = 0
         while True:
             name = u'%s%i.ipynb' % (basename,i)
             path = self.get_os_path(name, notebook_path)
             if not os.path.isfile(path):
                 break
             else:
                 i = i+1
         return name
     
     # Checkpoint-related utilities
     
     def get_checkpoint_path_by_name(self, name, checkpoint_id, notebook_path='/'):
         """Return a full path to a notebook checkpoint, given its name and checkpoint id."""
         filename = u"{name}-{checkpoint_id}{ext}".format(
             name=name,
             checkpoint_id=checkpoint_id,
             ext=self.filename_ext,
         )
         if notebook_path ==None:
             path = os.path.join(self.checkpoint_dir, filename)
         else:
             path = os.path.join(notebook_path, self.checkpoint_dir, filename)
         return path
     
     def get_checkpoint_path(self, notebook_name, checkpoint_id, notebook_path='/'):
         """find the path to a checkpoint"""
         name = notebook_name
         return self.get_checkpoint_path_by_name(name, checkpoint_id, notebook_path)
     
     def get_checkpoint_info(self, notebook_name, checkpoint_id, notebook_path='/'):
         """construct the info dict for a given checkpoint"""
         path = self.get_checkpoint_path(notebook_name, checkpoint_id, notebook_path)
         stats = os.stat(path)
         last_modified = tz.utcfromtimestamp(stats.st_mtime)
         info = dict(
             checkpoint_id = checkpoint_id,
             last_modified = last_modified,
         )
         
         return info
         
     # public checkpoint API
     
     def create_checkpoint(self, notebook_name, notebook_path='/'):
         """Create a checkpoint from the current state of a notebook"""
         nb_path = self.get_os_path(notebook_name, notebook_path)
         # only the one checkpoint ID:
         checkpoint_id = u"checkpoint"
         cp_path = self.get_checkpoint_path(notebook_name, checkpoint_id, notebook_path)
         self.log.debug("creating checkpoint for notebook %s", notebook_name)
         if not os.path.exists(self.checkpoint_dir):
             os.mkdir(self.checkpoint_dir)
         shutil.copy2(nb_path, cp_path)
         
         # return the checkpoint info
         return self.get_checkpoint_info(notebook_name, checkpoint_id, notebook_path)
     
     def list_checkpoints(self, notebook_name, notebook_path='/'):
         """list the checkpoints for a given notebook
         
         This notebook manager currently only supports one checkpoint per notebook.
         """
         checkpoint_id = "checkpoint"
         path = self.get_checkpoint_path(notebook_name, checkpoint_id, notebook_path)
         if not os.path.exists(path):
             return []
         else:
             return [self.get_checkpoint_info(notebook_name, checkpoint_id, notebook_path)]
         
     
     def restore_checkpoint(self, notebook_name, checkpoint_id, notebook_path='/'):
         """restore a notebook to a checkpointed state"""
         self.log.info("restoring Notebook %s from checkpoint %s", notebook_name, checkpoint_id)
         nb_path = self.get_os_path(notebook_name, notebook_path)
         cp_path = self.get_checkpoint_path(notebook_name, checkpoint_id, notebook_path)
         if not os.path.isfile(cp_path):
             self.log.debug("checkpoint file does not exist: %s", cp_path)
             raise web.HTTPError(404,
                 u'Notebook checkpoint does not exist: %s-%s' % (notebook_name, checkpoint_id)
             )
         # ensure notebook is readable (never restore from an unreadable notebook)
         last_modified, nb = self.read_notebook_object_from_path(cp_path)
         shutil.copy2(cp_path, nb_path)
         self.log.debug("copying %s -> %s", cp_path, nb_path)
     
     def delete_checkpoint(self, notebook_name, checkpoint_id, notebook_path='/'):
         """delete a notebook's checkpoint"""
         path = self.get_checkpoint_path(notebook_name, checkpoint_id, notebook_path)
         if not os.path.isfile(path):
             raise web.HTTPError(404,
                 u'Notebook checkpoint does not exist: %s-%s' % (notebook_name, checkpoint_id)
             )
         self.log.debug("unlinking %s", path)
         os.unlink(path)
     
     def info_string(self):
         return "Serving notebooks from local directory: %s" % self.notebook_dir

IPython/html/services/notebooks/handlers.py

@@ -1,217 +1,206 b''
 """Tornado handlers for the notebooks web service.
 
 Authors:
 
 * Brian Granger
 """
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2008-2011  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
-from tornado import web
+import json
 
-from zmq.utils import jsonapi
+from tornado import web
 
+from ...utils import url_path_join
 from IPython.utils.jsonutil import date_default
 
-from ...base.handlers import IPythonHandler
+from ...base.handlers import IPythonHandler, json_errors
 
 #-----------------------------------------------------------------------------
 # Notebook web service handlers
 #-----------------------------------------------------------------------------
 
 
-class NotebookRootHandler(IPythonHandler):
-
-    @web.authenticated
-    def get(self):
-        """get returns a list of notebooks from the location
-        where the server was started."""
-        nbm = self.notebook_manager
-        notebooks = nbm.list_notebooks("/")
-        self.finish(jsonapi.dumps(notebooks))
-
-    @web.authenticated
-    def post(self):
-        """post creates a notebooks in the directory where the
-        server was started"""
-        nbm = self.notebook_manager
-        self.log.info(nbm.notebook_dir)
-        body = self.request.body.strip()
-        format = self.get_argument('format', default='json')
-        name = self.get_argument('name', default=None)
-        if body:
-            fname = nbm.save_new_notebook(body, notebook_path='/', name=name, format=format)
-        else:
-            fname = nbm.new_notebook(notebook_path='/')
-        self.set_header('Location', nbm.notebook_dir + fname)
-        model = nbm.notebook_model(fname)
-        self.set_header('Location', '{0}api/notebooks/{1}'.format(self.base_project_url, fname))
-        self.finish(jsonapi.dumps(model))
-
 class NotebookHandler(IPythonHandler):
 
-    SUPPORTED_METHODS = ('GET', 'PUT', 'PATCH', 'POST','DELETE')
+    SUPPORTED_METHODS = (u'GET', u'PUT', u'PATCH', u'POST', u'DELETE')
+
+    def notebook_location(self, name, path):
+        """Return the full URL location of a notebook based.
+        
+        Parameters
+        ----------
+        name : unicode
+            The name of the notebook like "foo.ipynb".
+        path : unicode
+            The URL path of the notebook.
+        """
+        return url_path_join(self.base_project_url, u'/api/notebooks', path, name)
 
     @web.authenticated
+    @json_errors
     def get(self, notebook_path):
         """get checks if a notebook is not named, an returns a list of notebooks
         in the notebook path given. If a name is given, return 
         the notebook representation"""
         nbm = self.notebook_manager
+        # path will have leading and trailing slashes, such as '/foo/bar/'
         name, path = nbm.named_notebook_path(notebook_path)
         
         # Check to see if a notebook name was given
         if name is None:
             # List notebooks in 'notebook_path'
             notebooks = nbm.list_notebooks(path)
-            self.finish(jsonapi.dumps(notebooks))
+            self.finish(json.dumps(notebooks, default=date_default))
         else:
             # get and return notebook representation
-            format = self.get_argument('format', default='json')
-            download = self.get_argument('download', default='False')
-            model = nbm.notebook_model(name, path)
-            last_mod, representation, name = nbm.get_notebook(name, path, format)
-            self.set_header('Last-Modified', last_mod)
-            
-            if download == 'True':
-                if format == u'json':
-                    self.set_header('Content-Type', 'application/json')
-                    self.set_header('Content-Disposition','attachment; filename="%s.ipynb"' % name)
-                    self.finish(representation)
-                elif format == u'py':
-                    self.set_header('Content-Type', 'application/x-python')
-                    self.set_header('Content-Disposition','attachment; filename="%s.py"' % name)
-                    self.finish(representation)
-            else:
-                self.finish(jsonapi.dumps(model))
+            model = nbm.get_notebook_model(name, path)
+            self.set_header(u'Last-Modified', model[u'last_modified'])
+            self.finish(json.dumps(model, default=date_default))
 
     @web.authenticated
+   # @json_errors
     def patch(self, notebook_path):
         """patch is currently used strictly for notebook renaming.
         Changes the notebook name to the name given in data."""
         nbm = self.notebook_manager
+        # path will have leading and trailing slashes, such as '/foo/bar/'
         name, path = nbm.named_notebook_path(notebook_path)
-        data = jsonapi.loads(self.request.body)
-        model = nbm.change_notebook(data, name, path)
-        self.finish(jsonapi.dumps(model))
+        if name is None:
+            raise web.HTTPError(400, u'Notebook name missing')
+        model = self.get_json_body()
+        if model is None:
+            raise web.HTTPError(400, u'JSON body missing')
+        model = nbm.update_notebook_model(model, name, path)
+        if model[u'name'] != name or model[u'path'] != path:
+            self.set_status(301)
+            location = self.notebook_location(model[u'name'], model[u'path'])
+            self.set_header(u'Location', location)
+        self.set_header(u'Last-Modified', model[u'last_modified'])
+        self.finish(json.dumps(model, default=date_default))
 
     @web.authenticated
-    def post(self,notebook_path):
+    @json_errors
+    def post(self, notebook_path):
         """Create a new notebook in the location given by 'notebook_path'."""
         nbm = self.notebook_manager
-        fname, path = nbm.named_notebook_path(notebook_path)
-        body = self.request.body.strip()
-        format = self.get_argument('format', default='json')
-        name = self.get_argument('name', default=None)
-        if body:
-            fname = nbm.save_new_notebook(body, notebook_path=path, name=name, format=format)
-        else:
-            fname = nbm.new_notebook(notebook_path=path)
-        self.set_header('Location', nbm.notebook_dir + path + fname)
-        model = nbm.notebook_model(fname, path)
-        self.finish(jsonapi.dumps(model))
+        # path will have leading and trailing slashes, such as '/foo/bar/'
+        name, path = nbm.named_notebook_path(notebook_path)
+        model = self.get_json_body()
+        if name is not None:
+            raise web.HTTPError(400, 'No name can be provided when POSTing a new notebook.')
+        model = nbm.create_notebook_model(model, path)
+        location = nbm.notebook_dir + model[u'path'] + model[u'name']
+        location = self.notebook_location(model[u'name'], model[u'path'])
+        self.set_header(u'Location', location)
+        self.set_header(u'Last-Modified', model[u'last_modified'])
+        self.set_status(201)
+        self.finish(json.dumps(model, default=date_default))
 
     @web.authenticated
+    @json_errors
     def put(self, notebook_path):
         """saves the notebook in the location given by 'notebook_path'."""
         nbm = self.notebook_manager
+        # path will have leading and trailing slashes, such as '/foo/bar/'
         name, path = nbm.named_notebook_path(notebook_path)
-        format = self.get_argument('format', default='json')
-        nbm.save_notebook(self.request.body, notebook_path=path, name=name, format=format)
-        model = nbm.notebook_model(name, path)
-        self.set_status(204)
-        self.finish(jsonapi.dumps(model))
+        model = self.get_json_body()
+        if model is None:
+            raise web.HTTPError(400, u'JSON body missing')
+        nbm.save_notebook_model(model, name, path)
+        self.finish(json.dumps(model, default=date_default))
 
     @web.authenticated
+    @json_errors
     def delete(self, notebook_path):
-        """delete rmoves the notebook in the given notebook path"""
+        """delete the notebook in the given notebook path"""
         nbm = self.notebook_manager
+        # path will have leading and trailing slashes, such as '/foo/bar/'
         name, path = nbm.named_notebook_path(notebook_path)
-        nbm.delete_notebook(name, path)
+        nbm.delete_notebook_model(name, path)
         self.set_status(204)
         self.finish()
 
 
 class NotebookCheckpointsHandler(IPythonHandler):
     
     SUPPORTED_METHODS = ('GET', 'POST')
     
     @web.authenticated
+    @json_errors
     def get(self, notebook_path):
         """get lists checkpoints for a notebook"""
         nbm = self.notebook_manager
+        # path will have leading and trailing slashes, such as '/foo/bar/'
         name, path = nbm.named_notebook_path(notebook_path)
         checkpoints = nbm.list_checkpoints(name, path)
-        data = jsonapi.dumps(checkpoints, default=date_default)
+        data = json.dumps(checkpoints, default=date_default)
         self.finish(data)
     
     @web.authenticated
+    @json_errors
     def post(self, notebook_path):
         """post creates a new checkpoint"""
         nbm = self.notebook_manager
         name, path = nbm.named_notebook_path(notebook_path)
+        # path will have leading and trailing slashes, such as '/foo/bar/'
         checkpoint = nbm.create_checkpoint(name, path)
-        data = jsonapi.dumps(checkpoint, default=date_default)
-        if path == None:
-            self.set_header('Location', '{0}notebooks/{1}/checkpoints/{2}'.format(
-                self.base_project_url, name, checkpoint['checkpoint_id']
-                ))
-        else:
-            self.set_header('Location', '{0}notebooks/{1}/{2}/checkpoints/{3}'.format(
-                self.base_project_url, path, name, checkpoint['checkpoint_id']
-                ))
+        data = json.dumps(checkpoint, default=date_default)
+        location = url_path_join(self.base_project_url, u'/api/notebooks',
+            path, name, '/checkpoints', checkpoint[u'checkpoint_id'])
+        self.set_header(u'Location', location)
         self.finish(data)
 
 
 class ModifyNotebookCheckpointsHandler(IPythonHandler):
     
     SUPPORTED_METHODS = ('POST', 'DELETE')
     
     @web.authenticated
+    @json_errors
     def post(self, notebook_path, checkpoint_id):
         """post restores a notebook from a checkpoint"""
         nbm = self.notebook_manager
+        # path will have leading and trailing slashes, such as '/foo/bar/'
         name, path = nbm.named_notebook_path(notebook_path)
-        nbm.restore_checkpoint(name, checkpoint_id, path)
+        nbm.restore_checkpoint(checkpoint_id, name, path)
         self.set_status(204)
         self.finish()
     
     @web.authenticated
+    @json_errors
     def delete(self, notebook_path, checkpoint_id):
         """delete clears a checkpoint for a given notebook"""
         nbm = self.notebook_manager
+        # path will have leading and trailing slashes, such as '/foo/bar/'
         name, path = nbm.named_notebook_path(notebook_path)
-        nbm.delete_checkpoint(name, checkpoint_id, path)
+        nbm.delete_checkpoint(checkpoint_id, name, path)
         self.set_status(204)
         self.finish()
         
 #-----------------------------------------------------------------------------
 # URL to handler mappings
 #-----------------------------------------------------------------------------
 
 
-_notebook_path_regex = r"(?P<notebook_path>.+)"
+_notebook_path_regex = r"(?P<notebook_path>.*)"
 _checkpoint_id_regex = r"(?P<checkpoint_id>[\w-]+)"
 
 default_handlers = [
-    (r"api/notebooks/%s/checkpoints" % _notebook_path_regex, NotebookCheckpointsHandler),
-    (r"api/notebooks/%s/checkpoints/%s" % (_notebook_path_regex, _checkpoint_id_regex),
+    (r"/api/notebooks/%s/checkpoints" % _notebook_path_regex, NotebookCheckpointsHandler),
+    (r"/api/notebooks/%s/checkpoints/%s" % (_notebook_path_regex, _checkpoint_id_regex),
         ModifyNotebookCheckpointsHandler),
-    (r"api/notebooks/%s/" % _notebook_path_regex, NotebookHandler), 
-    (r"api/notebooks/%s" % _notebook_path_regex, NotebookHandler),
-    (r"api/notebooks/", NotebookRootHandler),
-    (r"api/notebooks", NotebookRootHandler),
+    (r"/api/notebooks%s" % _notebook_path_regex, NotebookHandler),
 ]
 
 
 
-

IPython/html/services/notebooks/nbmanager.py

@@ -1,289 +1,301 b''
 """A base class notebook manager.
 
 Authors:
 
 * Brian Granger
 """
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2011  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
 import os
 import uuid
 
 from tornado import web
 from urllib import quote, unquote
 
 from IPython.config.configurable import LoggingConfigurable
 from IPython.nbformat import current
 from IPython.utils.traitlets import List, Dict, Unicode, TraitError
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 
 class NotebookManager(LoggingConfigurable):
 
     # Todo:
     # The notebook_dir attribute is used to mean a couple of different things:
     # 1. Where the notebooks are stored if FileNotebookManager is used.
     # 2. The cwd of the kernel for a project.
     # Right now we use this attribute in a number of different places and
     # we are going to have to disentangle all of this.
     notebook_dir = Unicode(os.getcwdu(), config=True, help="""
             The directory to use for notebooks.
             """)
 
     def named_notebook_path(self, notebook_path):
         """Given a notebook_path name, returns a (name, path) tuple, where
         name is a .ipynb file, and path is the directory for the file, which
         *always* starts *and* ends with a '/' character.
 
         Parameters
         ----------
         notebook_path : string
             A path that may be a .ipynb name or a directory
 
         Returns
         -------
         name : string or None
             the filename of the notebook, or None if not a .ipynb extension
         path : string
             the path to the directory which contains the notebook
         """
         names = notebook_path.split('/')
         names = [n for n in names if n != ''] # remove duplicate splits
 
         names = [''] + names
 
         if names and names[-1].endswith(".ipynb"):
             name = names[-1]
             path = "/".join(names[:-1]) + '/'
         else:
             name = None
             path = "/".join(names) + '/'
         return name, path
         
     def get_os_path(self, fname=None, path='/'):
         """Given a notebook name and a server URL path, return its file system
         path.
 
         Parameters
         ----------
         fname : string
             The name of a notebook file with the .ipynb extension
         path : string
             The relative URL path (with '/' as separator) to the named
             notebook.
 
         Returns
         -------
         path : string
             A file system path that combines notebook_dir (location where
             server started), the relative path, and the filename with the
             current operating system's url.
         """
         parts = path.split('/')
         parts = [p for p in parts if p != ''] # remove duplicate splits
         if fname is not None:
             parts += [fname]
         path = os.path.join(self.notebook_dir, *parts)
         return path
 
     def url_encode(self, path):
         """Returns the path with all special characters URL encoded"""
         parts = os.path.split(path)
         return os.path.join(*[quote(p) for p in parts])
 
     def url_decode(self, path):
         """Returns the URL with special characters decoded"""
         parts = os.path.split(path)
         return os.path.join(*[unquote(p) for p in parts])
 
     def _notebook_dir_changed(self, new):
         """do a bit of validation of the notebook dir"""
         if not os.path.isabs(new):
             # If we receive a non-absolute path, make it absolute.
             abs_new = os.path.abspath(new)
             #self.notebook_dir = os.path.dirname(abs_new)
             return
         if os.path.exists(new) and not os.path.isdir(new):
             raise TraitError("notebook dir %r is not a directory" % new)
         if not os.path.exists(new):
             self.log.info("Creating notebook dir %s", new)
             try:
                 os.mkdir(new)
             except:
                 raise TraitError("Couldn't create notebook dir %r" % new)
                 
     allowed_formats = List([u'json',u'py'])
 
     def add_new_folder(self, path=None):
         new_path = os.path.join(self.notebook_dir, path)
         if not os.path.exists(new_path):
             os.makedirs(new_path) 
         else:
             raise web.HTTPError(409, u'Directory already exists or creation permission not allowed.')
 
     def load_notebook_names(self, path):
         """Load the notebook names into memory.
 
         This should be called once immediately after the notebook manager
         is created to load the existing notebooks into the mapping in
         memory.
         """
         self.list_notebooks(path)
 
     def list_notebooks(self):
         """List all notebooks.
 
         This returns a list of dicts, each of the form::
 
             dict(notebook_id=notebook,name=name)
 
         This list of dicts should be sorted by name::
 
             data = sorted(data, key=lambda item: item['name'])
         """
         raise NotImplementedError('must be implemented in a subclass')
 
-    def notebook_model(self, notebook_name, notebook_path='/', content=True):
+    def notebook_model(self, name, path='/', content=True):
         """ Creates the standard notebook model """
-        last_modified, contents = self.read_notebook_object(notebook_name, notebook_path)
-        model = {"name": notebook_name, 
-                    "path": notebook_path,
-                    "last_modified (UTC)": last_modified.ctime()}
+        last_modified, contents = self.read_notebook_model(name, path)
+        model = {"name": name, 
+                    "path": path,
+                    "last_modified": last_modified.ctime()}
         if content is True:
             model['content'] = contents
         return model
 
     def get_notebook(self, notebook_name, notebook_path='/', format=u'json'):
         """Get the representation of a notebook in format by notebook_name."""
         format = unicode(format)
         if format not in self.allowed_formats:
             raise web.HTTPError(415, u'Invalid notebook format: %s' % format)
         kwargs = {}
         last_mod, nb = self.read_notebook_object(notebook_name, notebook_path)
         if format == 'json':
             # don't split lines for sending over the wire, because it
             # should match the Python in-memory format.
             kwargs['split_lines'] = False
         representation = current.writes(nb, format, **kwargs)
         name = nb.metadata.get('name', 'notebook')
         return last_mod, representation, name
 
-    def read_notebook_object(self, notebook_name, notebook_path='/'):
+    def read_notebook_model(self, notebook_name, notebook_path='/'):
         """Get the object representation of a notebook by notebook_id."""
         raise NotImplementedError('must be implemented in a subclass')
 
+    def save_notebook(self, model, name=None, path='/'):
+        """Save the Notebook"""
+        if name is None:
+            name = self.increment_filename('Untitled', path)
+        if 'content' not in model:
+            metadata = current.new_metadata(name=name)
+            nb = current.new_notebook(metadata=metadata)
+        else:
+            nb = model['content']
+        self.write_notebook_object()
+            
+
     def save_new_notebook(self, data, notebook_path='/', name=None, format=u'json'):
         """Save a new notebook and return its name.
 
         If a name is passed in, it overrides any values in the notebook data
         and the value in the data is updated to use that value.
         """
         if format not in self.allowed_formats:
             raise web.HTTPError(415, u'Invalid notebook format: %s' % format)
 
         try:
             nb = current.reads(data.decode('utf-8'), format)
         except:
             raise web.HTTPError(400, u'Invalid JSON data')
 
         if name is None:
            try:
                name = nb.metadata.name
            except AttributeError:
                raise web.HTTPError(400, u'Missing notebook name')
         nb.metadata.name = name
 
         notebook_name = self.write_notebook_object(nb, notebook_path=notebook_path)
         return notebook_name
 
-    def save_notebook(self, data, notebook_path='/', name=None, new_name=None, format=u'json'):
+    def save_notebook(self, data, notebook_path='/', name=None, format=u'json'):
         """Save an existing notebook by notebook_name."""
         if format not in self.allowed_formats:
             raise web.HTTPError(415, u'Invalid notebook format: %s' % format)
 
         try:
             nb = current.reads(data.decode('utf-8'), format)
         except:
             raise web.HTTPError(400, u'Invalid JSON data')
 
         if name is not None:
             nb.metadata.name = name
         self.write_notebook_object(nb, name, notebook_path, new_name)
 
-    def write_notebook_object(self, nb, notebook_name='/', notebook_path='/', new_name=None):
+    def write_notebook_model(self, model):
         """Write a notebook object and return its notebook_name.
 
         If notebook_name is None, this method should create a new notebook_name.
         If notebook_name is not None, this method should check to make sure it
         exists and is valid.
         """
         raise NotImplementedError('must be implemented in a subclass')
 
     def delete_notebook(self, notebook_name, notebook_path):
         """Delete notebook by notebook_id."""
         raise NotImplementedError('must be implemented in a subclass')
 
     def increment_filename(self, name):
         """Increment a filename to make it unique.
 
         This exists for notebook stores that must have unique names. When a notebook
         is created or copied this method constructs a unique filename, typically
         by appending an integer to the name.
         """
         return name
 
     def new_notebook(self, notebook_path='/'):
         """Create a new notebook and return its notebook_name."""
         name = self.increment_filename('Untitled', notebook_path)
         metadata = current.new_metadata(name=name)
         nb = current.new_notebook(metadata=metadata)
         notebook_name = self.write_notebook_object(nb, notebook_path=notebook_path)
         return notebook_name
 
     def copy_notebook(self, name, path='/'):
         """Copy an existing notebook and return its new notebook_name."""
         last_mod, nb = self.read_notebook_object(name, path)
         name = nb.metadata.name + '-Copy'
         name = self.increment_filename(name, path)
         nb.metadata.name = name
         notebook_name = self.write_notebook_object(nb, notebook_path = path)
         return notebook_name  
     
     # Checkpoint-related
     
     def create_checkpoint(self, notebook_name, notebook_path='/'):
         """Create a checkpoint of the current state of a notebook
         
         Returns a checkpoint_id for the new checkpoint.
         """
         raise NotImplementedError("must be implemented in a subclass")
     
     def list_checkpoints(self, notebook_name, notebook_path='/'):
         """Return a list of checkpoints for a given notebook"""
         return []
     
     def restore_checkpoint(self, notebook_name, checkpoint_id, notebook_path='/'):
         """Restore a notebook from one of its checkpoints"""
         raise NotImplementedError("must be implemented in a subclass")
 
     def delete_checkpoint(self, notebook_name, checkpoint_id, notebook_path='/'):
         """delete a checkpoint for a notebook"""
         raise NotImplementedError("must be implemented in a subclass")
     
     def log_info(self):
         self.log.info(self.info_string())
     
     def info_string(self):
         return "Serving notebooks"

IPython/html/services/notebooks/tests/test_notebooks_api.py

@@ -1,116 +1,115 b''
 """Test the notebooks webservice API."""
 
 
 import os
 import sys
 import json
 from zmq.utils import jsonapi
 
 import requests
 
 from IPython.html.tests.launchnotebook import NotebookTestBase
 
 class APITest(NotebookTestBase):
     """Test the kernels web service API"""
 
     def notebook_url(self):
         return super(APITest,self).base_url() + 'api/notebooks'
 
     def mknb(self, name='', path='/'):
         url = self.notebook_url() + path
         return url, requests.post(url)
 
     def delnb(self, name, path='/'):
         url = self.notebook_url() + path + name
         r = requests.delete(url)
         return r.status_code
 
-    def test_notebook_root_handler(self):
+    def test_notebook_handler(self):
         # POST a notebook and test the dict thats returned.
         #url, nb = self.mknb()
         url = self.notebook_url()
         nb = requests.post(url)
         data = nb.json()
         assert isinstance(data, dict)
-        assert data.has_key("name")
-        assert data.has_key("path")
+        self.assertIn('name', data)
+        self.assertIn('path', data)
         self.assertEqual(data['name'], u'Untitled0.ipynb')
         self.assertEqual(data['path'], u'/')
 
         # GET list of notebooks in directory.
         r = requests.get(url)
         assert isinstance(r.json(), list)
         assert isinstance(r.json()[0], dict)
         
         self.delnb('Untitled0.ipynb')
-
-    def test_notebook_handler(self):
+        
         # GET with a notebook name.
         url, nb = self.mknb()
         data = nb.json()
         url = self.notebook_url() + '/Untitled0.ipynb'
         r = requests.get(url)
         assert isinstance(data, dict)
         self.assertEqual(r.json(), data)
 
         # PATCH (rename) request.
         new_name = {'name':'test.ipynb'}
         r = requests.patch(url, data=jsonapi.dumps(new_name))
         data = r.json()
         assert isinstance(data, dict)
 
         # make sure the patch worked.
         new_url = self.notebook_url() + '/test.ipynb'
         r = requests.get(new_url)
         assert isinstance(r.json(), dict)
         self.assertEqual(r.json(), data)
 
         # GET bad (old) notebook name.
         r = requests.get(url)
         self.assertEqual(r.status_code, 404)
 
         # POST notebooks to folders one and two levels down.
         os.makedirs(os.path.join(self.notebook_dir.name, 'foo'))
         os.makedirs(os.path.join(self.notebook_dir.name, 'foo','bar'))
         assert os.path.isdir(os.path.join(self.notebook_dir.name, 'foo'))
         url, nb = self.mknb(path='/foo/')
         url2, nb2 = self.mknb(path='/foo/bar/')
         data = nb.json()
         data2 = nb2.json()
         assert isinstance(data, dict)
         assert isinstance(data2, dict)
-        assert data.has_key("name")
-        assert data.has_key("path")
+        self.assertIn('name', data)
+        self.assertIn('path', data)
         self.assertEqual(data['name'], u'Untitled0.ipynb')
         self.assertEqual(data['path'], u'/foo/')
-        assert data2.has_key("name")
-        assert data2.has_key("path")
+        self.assertIn('name', data2)
+        self.assertIn('path', data2)
         self.assertEqual(data2['name'], u'Untitled0.ipynb')
         self.assertEqual(data2['path'], u'/foo/bar/')
 
         # GET request on notebooks one and two levels down.
-        r = requests.get(url+'Untitled0.ipynb')
-        r2 = requests.get(url2+'Untitled0.ipynb')
+        r = requests.get(url+'/Untitled0.ipynb')
+        r2 = requests.get(url2+'/Untitled0.ipynb')
         assert isinstance(r.json(), dict)
         self.assertEqual(r.json(), data)
         assert isinstance(r2.json(), dict)
         self.assertEqual(r2.json(), data2)
 
         # PATCH notebooks that are one and two levels down.
         new_name = {'name': 'testfoo.ipynb'}
-        r = requests.patch(url+'Untitled0.ipynb', data=jsonapi.dumps(new_name))
-        r = requests.get(url+'testfoo.ipynb')
+        r = requests.patch(url+'/Untitled0.ipynb', data=jsonapi.dumps(new_name))
+        r = requests.get(url+'/testfoo.ipynb')
         data = r.json()
         assert isinstance(data, dict)
-        assert data.has_key('name')
+        self.assertIn('name', data)
         self.assertEqual(data['name'], 'testfoo.ipynb')
-        r = requests.get(url+'Untitled0.ipynb')
+        r = requests.get(url+'/Untitled0.ipynb')
         self.assertEqual(r.status_code, 404)
         
         # DELETE notebooks
         r0 = self.delnb('test.ipynb')
         r1 = self.delnb('testfoo.ipynb', '/foo/')
         r2 = self.delnb('Untitled0.ipynb', '/foo/bar/')
         self.assertEqual(r0, 204)
         self.assertEqual(r1, 204)
         self.assertEqual(r2, 204)

IPython/html/services/sessions/tests/test_sessions_api.py

@@ -1,95 +1,95 b''
 """Test the sessions web service API."""
 
 
 import os
 import sys
 import json
 from zmq.utils import jsonapi
 
 import requests
 
 from IPython.html.tests.launchnotebook import NotebookTestBase
 
 
 class SessionAPITest(NotebookTestBase):
     """Test the sessions web service API"""
     
     def notebook_url(self):
         return super(SessionAPITest,self).base_url() + 'api/notebooks'
 
     def session_url(self):
         return super(SessionAPITest,self).base_url() + 'api/sessions'
 
     def mknb(self, name='', path='/'):
         url = self.notebook_url() + path
         return url, requests.post(url)
 
     def delnb(self, name, path='/'):
         url = self.notebook_url() + path + name
         r = requests.delete(url)
         return r.status_code
 
     def test_no_sessions(self):
         """Make sure there are no sessions running at the start"""
         url = self.session_url()
         r = requests.get(url)
         self.assertEqual(r.json(), [])
 
     def test_session_root_handler(self):
         # POST a session
         url, nb = self.mknb()
         notebook = nb.json()
         param = {'notebook_path': notebook['path'] + notebook['name']}
         r = requests.post(self.session_url(), params=param)
         data = r.json()
         assert isinstance(data, dict)
-        assert data.has_key('name')
+        self.assertIn('name', data)
         self.assertEqual(data['name'], notebook['name'])
 
         # GET sessions
         r = requests.get(self.session_url())
         assert isinstance(r.json(), list)
         assert isinstance(r.json()[0], dict)
         self.assertEqual(r.json()[0]['id'], data['id'])
 
         # Clean up
         self.delnb('Untitled0.ipynb')
         sess_url = self.session_url() +'/'+data['id']
         r = requests.delete(sess_url)
         self.assertEqual(r.status_code, 204)
 
     def test_session_handler(self):
         # Create a session
         url, nb = self.mknb()
         notebook = nb.json()
         param = {'notebook_path': notebook['path'] + notebook['name']}
         r = requests.post(self.session_url(), params=param)
         session = r.json()
 
         # GET a session
         sess_url = self.session_url() + '/' + session['id']
         r = requests.get(sess_url)
         assert isinstance(r.json(), dict)
         self.assertEqual(r.json(), session)
 
         # PATCH a session
         data = {'notebook_path': 'test.ipynb'}
         r = requests.patch(sess_url, data=jsonapi.dumps(data))
         # Patching the notebook webservice too (just for consistency)
         requests.patch(self.notebook_url() + '/Untitled0.ipynb', 
             data=jsonapi.dumps({'name':'test.ipynb'}))
         assert isinstance(r.json(), dict)
-        assert r.json().has_key('name')
-        assert r.json().has_key('id')
+        self.assertIn('name', r.json())
+        self.assertIn('id', r.json())
         self.assertEqual(r.json()['name'], 'test.ipynb')
         self.assertEqual(r.json()['id'], session['id'])
 
         # DELETE a session
         r = requests.delete(sess_url)
         self.assertEqual(r.status_code, 204)
         r = requests.get(self.session_url())
-        assert r.json() == []
+        self.assertEqual(r.json(), [])
         
         # Clean up
         r = self.delnb('test.ipynb')
-        assert r == 204
  No newline at end of file
+        self.assertEqual(r, 204)
  No newline at end of file

IPython/html/tests/launchnotebook.py

@@ -1,41 +1,63 b''
 """Base class for notebook tests."""
 
 import sys
 import time
+import requests
 from subprocess import Popen, PIPE
 from unittest import TestCase
 
 from IPython.utils.tempdir import TemporaryDirectory
 
 
 class NotebookTestBase(TestCase):
     """A base class for tests that need a running notebook.
     
     This creates an empty profile in a temp ipython_dir
     and then starts the notebook server with a separate temp notebook_dir.
     """
 
     port = 1234
 
+    def wait_till_alive(self):
+        url = 'http://localhost:%i/' % self.port
+        while True:
+            time.sleep(.1)
+            try:
+                r = requests.get(url + 'api/notebooks')
+                break
+            except requests.exceptions.ConnectionError:
+                pass
+        
+    def wait_till_dead(self):
+        url = 'http://localhost:%i/' % self.port
+        while True:
+            time.sleep(.1)
+            try:
+                r = requests.get(url + 'api/notebooks')
+                continue
+            except requests.exceptions.ConnectionError:
+                break
+
     def setUp(self):
         self.ipython_dir = TemporaryDirectory()
         self.notebook_dir = TemporaryDirectory()
         notebook_args = [
             sys.executable, '-c',
             'from IPython.html.notebookapp import launch_new_instance; launch_new_instance()',
             '--port=%d' % self.port,
             '--no-browser',
             '--ipython-dir=%s' % self.ipython_dir.name,
             '--notebook-dir=%s' % self.notebook_dir.name
-        ]        
+        ]  
         self.notebook = Popen(notebook_args, stdout=PIPE, stderr=PIPE)
-        time.sleep(3.0)
+        self.wait_till_alive()
+        #time.sleep(3.0)
 
     def tearDown(self):
         self.notebook.terminate()
         self.ipython_dir.cleanup()
         self.notebook_dir.cleanup()
-        time.sleep(3.0)
-
+        self.wait_till_dead()
+        
     def base_url(self):
         return 'http://localhost:%i/' % self.port