Changeset 2:a572d77184a3 for sage/interfaces/maxima.py

Timestamp:

02/11/06 13:36:43 (7 years ago)

Author:

tornaria@…

Branch:

default

Message:

[project @ patch to sage-1.0.0]

File:

• sage/interfaces/maxima.py (modified) (5 diffs)

sage/interfaces/maxima.py

@@ -365 +365 @@
         # TODO: Input and output prompts in maxima can be changed by
         # setting inchar and outchar..
-        eval_using_file_cutoff = 100
+        eval_using_file_cutoff = 200
         self.__eval_using_file_cutoff = eval_using_file_cutoff
         Expect.__init__(self,
@@ -371 +371 @@
                         prompt = '\(\%i[0-9]+\)',
                         command = "maxima",
-                        maxread = 1,        # CRUCIAL to use less buffering for maxima (or get all kinds of hangs on OS X and 64-bit machines, etc!
+                        maxread = 1,    # CRUCIAL to use less buffering for maxima (or get all kinds of hangs on OS X and 64-bit machines, etc!
                         script_subdirectory = script_subdirectory,
                         restart_on_ctrlc = False,
@@ -379 +379 @@
                                      ],
                         logfile = logfile,
-                        eval_using_file_cutoff=200)
+                        eval_using_file_cutoff=eval_using_file_cutoff )
         self._display2d = False
+
+    def _start(self):
+        # For some reason sending a single input line at startup avoids
+        # lots of weird timing issues when doing doctests.
+        Expect._start(self)
+        self(1)    
 
     # this doesn't work.
@@ -406 +412 @@
 
     def _eval_line(self, line, reformat=True, allow_use_file=False):
-        line = '%s; %s; %s;'%(SAGE_START, line.rstrip().rstrip(';'), SAGE_END)
+        line = line.rstrip().rstrip(';')
+        if line == '':
+            return ''
+        line = '%s; %s; %s;'%(SAGE_START, line, SAGE_END)
         if self._expect is None:
             self._start()
@@ -822 +831 @@
         if n < 1:
             raise ValueError, "n (=%s) must be >= 1"%n
-        s = self.eval('qunit(%s)'%n).lower()
+        s = str(self('qunit(%s)'%n)).lower()
         r = re.compile('sqrt\(.*\)')
         s = r.sub('a', s)
-
         a = QuadraticField(n, 'a').gen()
         return eval(s)