replace "from sage.rings.polynomial.pbori" with "from sage.rings.polynomial.pbori.pbori"

Author: kiwifb

src/sage/crypto/boolean_function.pyx

@@ -37,7 +37,7 @@ from sage.structure.richcmp cimport rich_to_bool
 from sage.rings.integer_ring import ZZ
 from sage.rings.integer cimport Integer
 from sage.rings.finite_rings.finite_field_constructor import GF
-from sage.rings.polynomial.pbori import BooleanPolynomial
+from sage.rings.polynomial.pbori.pbori import BooleanPolynomial
 from sage.rings.finite_rings.finite_field_constructor import is_FiniteField
 from sage.rings.finite_rings.finite_field_givaro import FiniteField_givaro
 from sage.rings.polynomial.polynomial_element import is_Polynomial
@@ -505,7 +505,7 @@ cdef class BooleanFunction(SageObject):
         bitset_init(anf, (1<<self._nvariables))
         bitset_copy(anf, self._truth_table)
         reed_muller(anf.bits, ZZ(anf.limbs).exact_log(2))
-        from sage.rings.polynomial.pbori import BooleanPolynomialRing
+        from sage.rings.polynomial.pbori.pbori import BooleanPolynomialRing
         R = BooleanPolynomialRing(self._nvariables,"x")
         G = R.gens()
         P = R(0)

src/sage/crypto/mq/sr.py

@@ -1831,7 +1831,7 @@ def ring(self, order=None, reverse_variables=None):
         if reverse_variables:
             names +=  self.varstrs("k", 0, r*c, e)
 
-        #from sage.rings.polynomial.pbori import BooleanPolynomialRing
+        #from sage.rings.polynomial.pbori.pbori import BooleanPolynomialRing
 
         if self._gf2 and self._polybori:
             return BooleanPolynomialRing(2*n*r*c*e + (n+1)*r*c*e + n*r*e, names, order=self._order)

src/sage/libs/fes.pyx

@@ -83,7 +83,7 @@ from sage.structure.parent cimport Parent
 from sage.structure.sequence import Sequence
 from sage.rings.polynomial.multi_polynomial cimport MPolynomial
 from sage.rings.polynomial.term_order import TermOrder
-from sage.rings.polynomial.pbori import BooleanPolynomial, BooleanPolynomialRing
+from sage.rings.polynomial.pbori.pbori import BooleanPolynomial, BooleanPolynomialRing
 from sage.arith.all import binomial
 from sage.combinat.subset import Subsets
 

src/sage/misc/sageinspect.py

@@ -1428,7 +1428,7 @@ def sage_getargspec(obj):
         sage: from sage.rings.polynomial.real_roots import bernstein_polynomial_factory_ratlist
         sage: sage_getargspec(bernstein_polynomial_factory_ratlist.coeffs_bitsize)
         ArgSpec(args=['self'], varargs=None, keywords=None, defaults=None)
-        sage: from sage.rings.polynomial.pbori import BooleanMonomialMonoid
+        sage: from sage.rings.polynomial.pbori.pbori import BooleanMonomialMonoid
         sage: sage_getargspec(BooleanMonomialMonoid.gen)
         ArgSpec(args=['self', 'i'], varargs=None, keywords=None, defaults=(0,))
         sage: I = P*[x,y]

src/sage/rings/polynomial/multi_polynomial_libsingular.pyx

@@ -919,7 +919,7 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
                     raise
                 return new_MP(self, _p)
 
-        from sage.rings.polynomial.pbori import BooleanPolynomial
+        from sage.rings.polynomial.pbori.pbori import BooleanPolynomial
         if isinstance(element, BooleanPolynomial):
             if element.constant():
                 if element:

src/sage/rings/polynomial/multi_polynomial_sequence.py

@@ -278,7 +278,7 @@ def PolynomialSequence(arg1, arg2=None, immutable=False, cr=False, cr_str=None):
         [x, y, z]
     """
     from sage.structure.element import is_Matrix
-    from sage.rings.polynomial.pbori import BooleanMonomialMonoid
+    from sage.rings.polynomial.pbori.pbori import BooleanMonomialMonoid
 
     is_ring = lambda r: is_MPolynomialRing(r) or isinstance(r, BooleanMonomialMonoid) or (is_QuotientRing(r) and is_MPolynomialRing(r.cover_ring()))
 
@@ -1248,7 +1248,7 @@ def eliminate_linear_variables(self, maxlength=Infinity, skip=None, return_reduc
 
             This is called "massaging" in [BCJ2007]_.
         """
-        from sage.rings.polynomial.pbori import BooleanPolynomialRing
+        from sage.rings.polynomial.pbori.pbori import BooleanPolynomialRing
         from brial import gauss_on_polys
         from brial.ll import eliminate,ll_encode,ll_red_nf_redsb
 
@@ -1332,14 +1332,14 @@ def _groebner_strategy(self):
             sage: F._groebner_strategy()
             <sage.rings.polynomial.pbori.GroebnerStrategy object at 0x...>
         """
-        from sage.rings.polynomial.pbori import BooleanPolynomialRing
+        from sage.rings.polynomial.pbori.pbori import BooleanPolynomialRing
         R = self.ring()
 
         if not isinstance(R, BooleanPolynomialRing):
             from sage.libs.singular.groebner_strategy import GroebnerStrategy
             return GroebnerStrategy(self.ideal())
         else:
-            from sage.rings.polynomial.pbori import GroebnerStrategy
+            from sage.rings.polynomial.pbori.pbori import GroebnerStrategy
             g = GroebnerStrategy(R)
             for p in self:
                 g.add_as_you_wish(p)
@@ -1444,7 +1444,7 @@ def solve(self, algorithm='polybori', n=1,  eliminate_linear_variables=True, ver
             []
 
         """
-        from sage.rings.polynomial.pbori import BooleanPolynomialRing
+        from sage.rings.polynomial.pbori.pbori import BooleanPolynomialRing
         from sage.modules.free_module import VectorSpace
 
         S = self
@@ -1530,7 +1530,7 @@ def reduced(self):
 
         """
 
-        from sage.rings.polynomial.pbori import BooleanPolynomialRing
+        from sage.rings.polynomial.pbori.pbori import BooleanPolynomialRing
         R = self.ring()
 
         if isinstance(R, BooleanPolynomialRing):

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

@@ -64,7 +64,7 @@
 """
 
 from sage import all
-from sage.rings.polynomial.pbori.pbori import *
+from sage.rings.polynomial.pbori.pbori.pbori import *
 
 import weakref
 

src/sage/rings/polynomial/polynomial_ring_constructor.py

@@ -948,7 +948,7 @@ def BooleanPolynomialRing_constructor(n=None, names=None, order="lex"):
     if not R is None:
         return R
 
-    from sage.rings.polynomial.pbori import BooleanPolynomialRing
+    from sage.rings.polynomial.pbori.pbori import BooleanPolynomialRing
     R = BooleanPolynomialRing(n, names, order)
 
     _save_in_cache(key, R)

src/sage/sat/converters/polybori.py

@@ -28,7 +28,7 @@
 ##############################################################################
 
 from random import Random
-from sage.rings.polynomial.pbori import if_then_else as ite
+from sage.rings.polynomial.pbori.pbori import if_then_else as ite
 from sage.rings.integer_ring import ZZ
 from sage.functions.other import ceil
 from sage.misc.cachefunc import cached_method, cached_function

src/sage/structure/sequence.py

@@ -252,7 +252,7 @@ def Sequence(x, universe=None, check=True, immutable=False, cr=False, cr_str=Non
                 universe = sage.structure.element.parent(x[len(x)-1])
 
     from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence
-    from sage.rings.polynomial.pbori import BooleanMonomialMonoid
+    from sage.rings.polynomial.pbori.pbori import BooleanMonomialMonoid
     from sage.rings.polynomial.multi_polynomial_ring import is_MPolynomialRing
     from sage.rings.quotient_ring import is_QuotientRing