Fixing url join problems.

IPython/frontend/html/notebook/handlers/notebooks.py

@@ -1,75 +1,75 b''
 """Tornado handlers for the live notebook view.
 
 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
 from tornado import web
 HTTPError = web.HTTPError
 
 from .base import IPythonHandler, authenticate_unless_readonly
 from ..utils import url_path_join
 
 #-----------------------------------------------------------------------------
 # Handlers
 #-----------------------------------------------------------------------------
 
 
 class NewHandler(IPythonHandler):
 
     @web.authenticated
     def get(self):
         notebook_id = self.notebook_manager.new_notebook()
-        self.redirect('/' + url_path_join(self.base_project_url, notebook_id))
+        self.redirect(url_path_join(self.base_project_url, notebook_id))
 
 
 class NamedNotebookHandler(IPythonHandler):
 
     @authenticate_unless_readonly
     def get(self, notebook_id):
         nbm = self.notebook_manager
         if not nbm.notebook_exists(notebook_id):
             raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)       
         self.write(self.render_template('notebook.html',
             project=self.project,
             notebook_id=notebook_id,
             kill_kernel=False,
             mathjax_url=self.mathjax_url,
             )
         )
 
 
 class NotebookRedirectHandler(IPythonHandler):
     
     @authenticate_unless_readonly
     def get(self, notebook_name):
         # strip trailing .ipynb:
         notebook_name = os.path.splitext(notebook_name)[0]
         notebook_id = self.notebook_manager.rev_mapping.get(notebook_name, '')
         if notebook_id:
-            url = self.settings.get('base_project_url', '/') + notebook_id
+            url = url_path_join(self.settings.get('base_project_url', '/'), notebook_id)
             return self.redirect(url)
         else:
             raise HTTPError(404)
 
 
 class NotebookCopyHandler(IPythonHandler):
 
     @web.authenticated
     def get(self, notebook_id):
         notebook_id = self.notebook_manager.copy_notebook(notebook_id)
-        self.redirect('/'+url_path_join(self.base_project_url, notebook_id))
+        self.redirect(url_path_join(self.base_project_url, notebook_id))
 

IPython/frontend/html/notebook/utils.py

@@ -1,31 +1,32 b''
 """Notebook related utilities
 
 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
 #-----------------------------------------------------------------------------
 
 def url_path_join(*pieces):
     """Join components of url into a relative url
 
     Use to prevent double slash when joining subpath. This will leave the
     initial and final / in place
     """
     initial = pieces[0].startswith('/')
     final = pieces[-1].endswith('/')
     striped = [s.strip('/') for s in pieces]
     result = '/'.join(s for s in striped if s)
     if initial: result = '/' + result
     if final: result = result + '/'
+    if result == '//': result = '/'
     return result