rebase master- eliminate read-only

IPython/html/services/contents/handlers.py

@@ -22,7 +22,7 b' from zmq.utils import jsonapi'
 
 from IPython.utils.jsonutil import date_default
 
-from ...base.handlers import IPythonHandler, authenticate_unless_readonly
+from ...base.handlers import IPythonHandler
 
 #-----------------------------------------------------------------------------
 # Contents web service handlers
@@ -31,7 +31,7 b' from ...base.handlers import IPythonHandler, authenticate_unless_readonly'
 
 class ContentRootHandler(IPythonHandler):
 
-    @authenticate_unless_readonly
+    @web.authenticated
     def get(self):
         cm = self.content_manager
         contents = cm.list_contents("")

IPython/html/services/notebooks/handlers.py

@@ -49,7 +49,7 b' class NotebookRootHandler(IPythonHandler):'
 
 class NotebookRootRedirect(IPythonHandler):
 
-    @authenticate_unless_readonly
+    @web.authenticated
     def get(self):
         self.redirect("/api/notebooks")
 

IPython/html/services/sessions/handlers.py

@@ -21,7 +21,7 b' from tornado import web'
 from zmq.utils import jsonapi
 
 from IPython.utils.jsonutil import date_default
-from ...base.handlers import IPythonHandler, authenticate_unless_readonly
+from ...base.handlers import IPythonHandler
 
 #-----------------------------------------------------------------------------
 # Session web service handlers
@@ -31,7 +31,7 b' from ...base.handlers import IPythonHandler, authenticate_unless_readonly'
 
 class SessionRootHandler(IPythonHandler):
 
-    @authenticate_unless_readonly
+    @web.authenticated
     def get(self):
         sm = self.session_manager
         nbm = self.notebook_manager
@@ -57,7 +57,7 b' class SessionHandler(IPythonHandler):'
 
     SUPPORTED_METHODS = ('GET', 'PATCH', 'DELETE')
 
-    @authenticate_unless_readonly
+    @web.authenticated
     def get(self, session_id):
         sm = self.session_manager
         model = sm.get_session_from_id(session_id)

IPython/html/tree/handlers.py

@@ -38,7 +38,7 b' class ProjectDashboardHandler(IPythonHandler):'
 
 class ProjectPathDashboardHandler(IPythonHandler):
 
-    @authenticate_unless_readonly
+    @web.authenticated
     def get(self, notebook_path):
         nbm = self.notebook_manager
         name, path = nbm.named_notebook_path(notebook_path)
@@ -56,28 +56,28 b' class ProjectPathDashboardHandler(IPythonHandler):'
 
 class TreeRedirectHandler(IPythonHandler):
     
-    @authenticate_unless_readonly
+    @web.authenticated
     def get(self):
         url = self.base_project_url + 'tree'
         self.redirect(url)
 
 class TreePathRedirectHandler(IPythonHandler):
 
-    @authenticate_unless_readonly
+    @web.authenticated
     def get(self, notebook_path):
         url = self.base_project_url + 'tree/'+ notebook_path
         self.redirect(url)
 
 class ProjectRedirectHandler(IPythonHandler):
     
-    @authenticate_unless_readonly
+    @web.authenticated
     def get(self):
         url = self.base_project_url + 'tree'
         self.redirect(url)
 
 class NewFolderHandler(IPythonHandler):
     
-    @authenticate_unless_readonly
+    @web.authenticated
     def get(self, notebook_path):
         nbm = self.notebook_manager
         name, path = nbm.named_notebook_path(notebook_path)