[sagenb] 125/179: Set default timeout to 0 as documented and make it configurable

[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 b9c27d38231f6a97fd30f63907b0d9bbebb11302
Author: Andrey Novoseltsev <novoselt at gmail.com>
Date:   Tue Jun 18 19:51:29 2013 -0700

    Set default timeout to 0 as documented and make it configurable
---
 sagenb/notebook/run_notebook.py | 5 +++--
 sagenb/notebook/server_conf.py  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sagenb/notebook/run_notebook.py b/sagenb/notebook/run_notebook.py
index d288b1d..bdafb85 100644
--- a/sagenb/notebook/run_notebook.py
+++ b/sagenb/notebook/run_notebook.py
@@ -449,7 +449,7 @@ def notebook_run(self,
              server_pool   = None,
              ulimit        = '',
 
-             timeout       = 0,   # timeout for normal worksheets. This is the
+             timeout       = None,   # timeout for normal worksheets. This is the
                                   # same as idle_timeout in server_conf.py
              doc_timeout   = None, # timeout for documentation worksheets
 
@@ -533,7 +533,8 @@ def notebook_run(self,
     if not quiet:
         print "The notebook files are stored in:", nb._dir
 
-    nb.conf()['idle_timeout'] = int(timeout)
+    if timeout is not None:
+        nb.conf()['idle_timeout'] = int(timeout)
     if doc_timeout is not None:
         nb.conf()['doc_timeout'] = int(doc_timeout)
 
diff --git a/sagenb/notebook/server_conf.py b/sagenb/notebook/server_conf.py
index 0751e22..d347e2d 100644
--- a/sagenb/notebook/server_conf.py
+++ b/sagenb/notebook/server_conf.py
@@ -14,7 +14,7 @@ _ = lazy_gettext
 defaults = {'word_wrap_cols':72,
             'max_history_length':250,
 
-            'idle_timeout': 120,        # timeout in seconds for worksheets
+            'idle_timeout': 0,        # timeout in seconds for worksheets
             'doc_timeout': 600,         # timeout in seconds for live docs
             'idle_check_interval':360,
 

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