[sagenb] 84/179: leave doc_timeout to the default value from server_conf.py

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository sagenb.

commit 6b57896e3f3d14958bb3030c3b522c90bb354242
Author: P Purkayastha <ppurka at gmail.com>
Date:   Tue Apr 2 10:50:25 2013 +0800

    leave doc_timeout to the default value from server_conf.py
---
 sagenb/notebook/run_notebook.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sagenb/notebook/run_notebook.py b/sagenb/notebook/run_notebook.py
index c2b78e9..8591981 100644
--- a/sagenb/notebook/run_notebook.py
+++ b/sagenb/notebook/run_notebook.py
@@ -454,7 +454,7 @@ def notebook_run(self,
 
              timeout       = 0,   # timeout for normal worksheets. This is the
                                   # same as idle_timeout in server_conf.py
-             doc_timeout   = 120, # timeout for documentation worksheets
+             doc_timeout   = None, # timeout for documentation worksheets
 
              upload        = None,
              automatic_login = True,
@@ -537,7 +537,8 @@ def notebook_run(self,
         print "The notebook files are stored in:", nb._dir
 
     nb.conf()['idle_timeout'] = int(timeout)
-    nb.conf()['doc_timeout'] = int(doc_timeout)
+    if doc_timeout is not None:
+        nb.conf()['doc_timeout'] = int(doc_timeout)
 
     if openid is not None:
         nb.conf()['openid'] = openid

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git