Changeset 6832:823b2e337c8d

Timestamp:

09/28/07 18:23:02 (6 years ago)

Author:

Craig Citro <craigcitro@…>

Branch:

default

Parents:

6831:96d9c2bc4a97 (diff), 6541:9872bcdb9faf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge tip

Files:

• sage/interfaces/maxima.py (modified) (1 diff)
• sage/interfaces/maxima.py (modified) (1 diff)

sage/interfaces/maxima.py

@@ -352 +352 @@
 from random import randrange
 
-import sage.rings.all
+##import sage.rings.all
 import sage.rings.complex_number
 

sage/interfaces/maxima.py

@@ -1068 +1068 @@
 ##         # (The original version of this function would yield wrong answers if
 ##         # n is not squarefree.)
-##         n = Integer(n).square_free_part()  
+##         n = Integer(n).squarefree_part()  
 ##         if n < 1:
 ##             raise ValueError, "n (=%s) must be >= 1"%n