Skip to content
Browse files

Merge branch 'master' into ldap

  • Loading branch information...
2 parents 597e8cb + bacc6a5 commit 6ef6181baeaaccd6b722a859dee37e660057b502 @rmartinjak rmartinjak committed
Showing with 2 additions and 1 deletion.
  1. +1 −1 sagenb/misc/misc.py
  2. +1 −0 sagenb/notebook/notebook.py
View
2 sagenb/misc/misc.py
@@ -113,7 +113,7 @@ def find_next_available_port(interface, start, max_tries=100, verbose=False):
alarm_count = 0
for port in range(start, start+max_tries+1):
try:
- alarm(1)
+ alarm(5)
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.connect((interface, port))
except socket.error, msg:
View
1 sagenb/notebook/notebook.py
@@ -62,6 +62,7 @@
('sh', False),
('singular', False),
('axiom', True),
+ ('fricas', True),
('kash', True),
('macaulay2', True),
('magma', True),

0 comments on commit 6ef6181

Please sign in to comment.
Something went wrong with that request. Please try again.