merge conflicts

Author: GiacomoPope

src/sage/rings/finite_rings/element_base.pyx

@@ -144,10 +144,16 @@ cdef class FiniteRingElement(CommutativeRingElement):
 
     def to_bytes(self, byteorder="big"):
         """
+<<<<<<< HEAD
         Return an array of bytes representing an integer.
 
         Internally relies on the python ``int.to_bytes()`` method.
         Length of byte array is determined from the field's order.
+=======
+        Return an array of bytes representing an integer. Internally relies
+        on the Python ``int.to_bytes()`` method. The length of the byte array
+        is fixed by the parent field's order.
+>>>>>>> 6d8b1dfaf02cbd4b09f692e7d2201379553b03c4
 
         INPUT:
 
@@ -1112,10 +1118,16 @@ cdef class FinitePolyExtElement(FiniteRingElement):
 
     def to_bytes(self, byteorder="big"):
         """
+<<<<<<< HEAD
         Return an array of bytes representing an integer.
 
         Internally relies on the python ``int.to_bytes()`` method.
         Length of byte array is determined from the field's order.
+=======
+        Return an array of bytes representing an integer. Internally relies
+        on the Python ``int.to_bytes()`` method. The length of the byte array
+        is fixed by the parent field's order.
+>>>>>>> 6d8b1dfaf02cbd4b09f692e7d2201379553b03c4
 
         INPUT:
 

src/sage/rings/finite_rings/finite_field_base.pyx

@@ -2119,9 +2119,14 @@ cdef class FiniteField(Field):
 
     def from_bytes(self, input_bytes, byteorder="big"):
         """
+<<<<<<< HEAD
         Return the integer represented by the given array of bytes.
 
         Internally relies on the python ``int.from_bytes()`` method.
+=======
+        Return the integer represented by the given array of bytes. Internally relies
+        on the Python ``int.from_bytes()`` method.
+>>>>>>> 6d8b1dfaf02cbd4b09f692e7d2201379553b03c4
 
         INPUT:
 
@@ -2160,7 +2165,9 @@ cdef class FiniteField(Field):
             sage: for F in fields:
             ....:     for _ in range(1000):
             ....:         a = F.random_element()
-            ....:         assert F.from_bytes(a.to_bytes()) == a
+            ....:         order = choice(["little", "big"])
+            ....:         a_bytes = a.to_bytes(byteorder=order)
+            ....:         assert F.from_bytes(a_bytes, byteorder=order) == a
         """
         python_int = int.from_bytes(input_bytes, byteorder=byteorder)
         return self.from_integer(python_int)

src/sage/rings/integer.pyx

@@ -7165,9 +7165,14 @@ cdef class Integer(sage.structure.element.EuclideanDomainElement):
 
     def to_bytes(self, length=1, byteorder="big", is_signed=False):
         """
+<<<<<<< HEAD
         Return an array of bytes representing an integer.
 
         Internally relies on the python ``int.to_bytes()`` method.
+=======
+        Return an array of bytes representing an integer. Internally relies
+        on the Python ``int.to_bytes()`` method.
+>>>>>>> 6d8b1dfaf02cbd4b09f692e7d2201379553b03c4
 
         INPUT: