Ticket #5994: trac_5994.patch

sage/interfaces/singular.py

@@ -1016 +1016 @@
     def version(self):
         """
         EXAMPLES:
+
+            sage: singular.version()
+            ((3, ..., ...), 'Singular for ...')
         """
         return singular_version()
 
@@ -1891 +1894 @@
 def singular_version():
     """
     Returns the version of Singular being used.
+
+    OUTPUT:
+
+       - 3-tuple
+       - Version string
     
     EXAMPLES:
+
+    
+        sage: singular_version()
+        ((3, ..., ...), 'Singular for ...')
     """
-    return singular.eval('system("--version");')
+    # We have a try/except here, since the interface may rase an error
+    # the first time we call system, if the help.cnf file isn't
+    # available.  We just call again in that case.
+    try:
+        s = singular.eval('system("--version");')
+    except RuntimeError:
+        s = singular.eval('system("--version");')
+    s = s.splitlines()[0]
+    # Get the actual version string.
+    i = s.find('version')
+    Z = sage.rings.integer.Integer
+    VERSION = tuple([Z(a) for a in s[i:].split()[1].split('-')])
+    return (VERSION, s)