Sophie

Sophie

distrib > Mandriva > 2010.1 > i586 > media > contrib-updates-src > by-pkgid > f9766b2784ead2e70f39891aff92024b > files > 10

sagemath-4.4-5mdv2010.2.src.rpm

diff -p -up sage-4.4/spkg/build/networkx-0.99.p1-fake_really-0.36.p1/src/networkx/drawing/nx_pylab.py.orig sage-4.4/spkg/build/networkx-0.99.p1-fake_really-0.36.p1/src/networkx/drawing/nx_pylab.py
--- sage-4.4/spkg/build/networkx-0.99.p1-fake_really-0.36.p1/src/networkx/drawing/nx_pylab.py.orig	2010-02-10 20:32:48.983020773 -0200
+++ sage-4.4/spkg/build/networkx-0.99.p1-fake_really-0.36.p1/src/networkx/drawing/nx_pylab.py	2010-02-10 20:33:00.746018363 -0200
@@ -39,8 +39,8 @@ try:
     import matplotlib.cbook as cb
     from matplotlib.colors import colorConverter,normalize,Colormap
     from matplotlib.collections import LineCollection
-    from matplotlib.numerix import sin, cos, pi, sqrt, arctan2, asarray
-    from matplotlib.numerix.mlab import amin, amax, ravel
+    from numpy import sin, cos, pi, sqrt, arctan2, asarray
+    from numpy import amin, amax, ravel
     import matplotlib.pylab
 except ImportError:
     raise ImportError, "Import Error: not able to import matplotlib."
diff -p -up sage-4.4/spkg/build/networkx-0.99.p1-fake_really-0.36.p1/src/networkx/convert.py.orig sage-4.4/spkg/build/networkx-0.99.p1-fake_really-0.36.p1/src/networkx/convert.py
--- sage-4.4/spkg/build/networkx-0.99.p1-fake_really-0.36.p1/src/networkx/convert.py.orig	2010-03-03 21:18:58.511482635 -0300
+++ sage-4.4/spkg/build/networkx-0.99.p1-fake_really-0.36.p1/src/networkx/convert.py	2010-03-03 21:19:11.787481092 -0300
@@ -89,7 +89,7 @@ def from_whatever(thing,create_using=Non
 
     try:
         import numpy
-        if isinstance(thing,numpy.core.defmatrix.matrix) or \
+        if isinstance(thing,numpy.matrixlib.defmatrix.matrix) or \
                isinstance(thing,numpy.ndarray):
             try:
                 return from_numpy_matrix(thing,create_using=create_using)