cimport directly from ginac.pynac

Author: Matthias Koeppe

src/sage/libs/pynac/constant.pxd

@@ -1,4 +1,4 @@
-from .pynac cimport GConstant
+from ginac.pynac cimport GConstant
 
 cdef class PynacConstant:
     cdef GConstant* pointer

src/sage/libs/pynac/constant.pyx

@@ -14,7 +14,7 @@ Wrapper around Pynac's constants
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from .pynac cimport *
+from ginac.pynac cimport *
 from sage.symbolic.expression cimport new_Expression_from_GEx
 from sage.symbolic.ring import SR
 from sage.cpython.string cimport str_to_bytes

src/sage/libs/pynac/pynac.pxd

@@ -1 +0,0 @@
-from ginac.pynac cimport *

src/sage/libs/pynac/pynac.pyx

@@ -18,6 +18,7 @@ from cpython cimport *
 from libc cimport math
 
 import ginac.pynac
+from ginac.pynac cimport *
 
 from sage.ext.stdsage cimport PY_NEW
 from sage.libs.gmp.all cimport *

src/sage/symbolic/comparison.pyx

@@ -21,7 +21,7 @@ There is also a mixed version:
 
 from cpython cimport *
 
-from sage.libs.pynac.pynac cimport *
+from ginac.pynac cimport *
 from sage.symbolic.ring import SR
 from sage.symbolic.expression cimport is_Expression
 

src/sage/symbolic/expression.pxd

@@ -1,4 +1,4 @@
-from sage.libs.pynac.pynac cimport GEx
+from ginac.pynac cimport GEx
 from sage.structure.element cimport CommutativeRingElement
 
 cdef class Expression(CommutativeRingElement):

src/sage/symbolic/expression.pyx

@@ -328,7 +328,7 @@ from sage.misc.decorators import rename_keyword
 from sage.structure.dynamic_class import dynamic_class
 from sage.symbolic.operators import FDerivativeOperator, add_vararg, mul_vararg
 from sage.arith.numerical_approx cimport digits_to_bits
-from sage.libs.pynac.pynac cimport *
+from ginac.pynac cimport *
 
 
 cpdef bint is_Expression(x):

src/sage/symbolic/function.pyx

@@ -125,7 +125,7 @@ is attempted, and after that ``sin()`` which succeeds::
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.libs.pynac.pynac cimport *
+from ginac.pynac cimport *
 from sage.rings.integer cimport smallInteger
 from sage.structure.sage_object cimport SageObject
 from sage.structure.element cimport Element, parent

src/sage/symbolic/getitem.pyx

@@ -10,7 +10,7 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.libs.pynac.pynac cimport GEx
+from ginac.pynac cimport GEx
 from sage.symbolic.expression cimport new_Expression_from_GEx
 
 cdef inline int normalize_index(object arg, int nops, object err_msg) except -1:

src/sage/symbolic/ring.pyx

@@ -16,7 +16,7 @@ The symbolic ring
 
 from sage.ext.cplusplus cimport ccrepr
 
-from sage.libs.pynac.pynac cimport *
+from ginac.pynac cimport *
 
 from sage.rings.integer cimport Integer
 from sage.rings.real_mpfr cimport RealNumber

src/sage/symbolic/series.pyx

@@ -125,7 +125,7 @@ Check that :trac:`22733` is fixed::
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
 
-from sage.libs.pynac.pynac cimport *
+from ginac.pynac cimport *
 from sage.symbolic.expression cimport Expression, new_Expression_from_GEx
 
 cdef class SymbolicSeries(Expression):

src/sage/symbolic/substitution_map.pxd

@@ -1,4 +1,4 @@
-from sage.libs.pynac.pynac cimport GExMap
+from ginac.pynac cimport GExMap
 from sage.symbolic.expression cimport Expression
 from sage.structure.sage_object cimport SageObject
 

src/sage/symbolic/substitution_map.pyx

@@ -18,7 +18,7 @@ back to Python.
 #*****************************************************************************
 
 
-from sage.libs.pynac.pynac cimport *
+from ginac.pynac cimport *
 from sage.symbolic.expression cimport Expression, new_Expression_from_GEx