more direct import in pbori

Author: fchapoton

src/sage/rings/polynomial/pbori/cnf.py

@@ -1,5 +1,6 @@
 from random import Random
-from .PyPolyBoRi import Polynomial, if_then_else as ite
+from sage.rings.polynomial.pbori.pbori import if_then_else as ite
+from .PyPolyBoRi import Polynomial
 from .statistics import used_vars_set
 
 

src/sage/rings/polynomial/pbori/ll.py

@@ -1,4 +1,4 @@
-
+from sage.rings.polynomial.pbori.pbori import top_index, if_then_else
 from .PyPolyBoRi import *
 from .statistics import used_vars_set
 from .rank import rank

src/sage/rings/polynomial/pbori/nf.py

@@ -1,3 +1,4 @@
+from sage.rings.polynomial.pbori.pbori import mod_mon_set
 from .PyPolyBoRi import *
 from .easy_polynomials import (easy_linear_polynomials as
                                easy_linear_polynomials_func)

src/sage/rings/polynomial/pbori/parallel.py

@@ -6,10 +6,9 @@
 Created by Michael Brickenstein on 2008-10-31.
 Copyright 2008 The PolyBoRi Team
 """
-
-from .PyPolyBoRi import if_then_else, CCuddNavigator, BooleSet
-from .PyPolyBoRi import (Polynomial, Ring, WeakRingRef, Monomial,
-    Variable)
+from sage.rings.polynomial.pbori.pbori import if_then_else
+from .PyPolyBoRi import CCuddNavigator, BooleSet
+from .PyPolyBoRi import (Polynomial, Ring, WeakRingRef, Monomial, Variable)
 from .gbcore import groebner_basis
 from zlib import compress, decompress
 try:
@@ -20,7 +19,7 @@
 
 def to_fast_pickable(l):
     r"""
-    Converts a list of polynomials into a builtin Python value, which is fast pickable and compact.
+    Convert a list of polynomials into a builtin Python value, which is fast pickable and compact.
 
     INPUT:
     

src/sage/rings/polynomial/pbori/specialsets.py

@@ -1,12 +1,15 @@
-from .PyPolyBoRi import (BooleSet, Polynomial, mod_mon_set,
-    if_then_else, Monomial, top_index, BooleConstant)
-
+from sage.rings.polynomial.pbori.pbori import (top_index, if_then_else,
+                                               mod_mon_set)
+from .PyPolyBoRi import (BooleSet, Polynomial,
+                         Monomial, BooleConstant)
 
 #def all_monomials_of_degree_d(d,variables):
 #    res=all_monomials_of_degree_d_new(d, variables)
 #    ref=all_monomials_of_degree_d_old(d, variables)
 #    assert res==ref, (d, variables)
 #    return res
+
+
 def all_monomials_of_degree_d_old(d, variables):
 
     if d == 0:

src/sage/rings/polynomial/pbori/statistics.py

@@ -1,4 +1,5 @@
-from .PyPolyBoRi import Monomial, Polynomial, top_index, BooleConstant
+from sage.rings.polynomial.pbori.pbori import top_index
+from .PyPolyBoRi import Monomial, Polynomial, BooleConstant
 
 
 def used_vars(l, bound=None):