|
424 | 424 |
|
425 | 425 | from sage.matrix.constructor import matrix |
426 | 426 | from sage.matrix.constructor import column_matrix |
427 | | -from sage.structure.element import Matrix |
| 427 | +from sage.structure.element import Element, Matrix |
| 428 | +from sage.rings.finite_rings.finite_field_base import FiniteField as FiniteField_base |
428 | 429 | from sage.rings.finite_rings.finite_field_constructor import FiniteField |
429 | 430 | from sage.structure.sage_object import SageObject |
430 | 431 | from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing |
@@ -757,10 +758,9 @@ def _GF_to_hex(self, GF): |
757 | 758 | sage: rgf._GF_to_hex(output) |
758 | 759 | 'e142cd5fcd9d6d94a3340793034391b5' |
759 | 760 | """ |
760 | | - from sage.rings.finite_rings.element_base import is_FiniteFieldElement |
761 | 761 | if not isinstance(GF, Matrix) and \ |
762 | 762 | not isinstance(GF, list) and \ |
763 | | - not is_FiniteFieldElement(GF): |
| 763 | + not (isinstance(GF, Element) and isinstance(GF.parent(), FiniteField_base)): |
764 | 764 | msg = ("keyword 'GF' must be a matrix over {0}, a list of " |
765 | 765 | "elements from {0}, or a single element from {0}") |
766 | 766 | raise TypeError(msg.format(self._F)) |
@@ -883,10 +883,9 @@ def _GF_to_bin(self, GF): |
883 | 883 | sage: rgf._GF_to_bin(output) |
884 | 884 | '11011000000111111111100000011011110110000001111111111000000110111101100000011111111110000001101111011000000111111111100000011011' |
885 | 885 | """ |
886 | | - from sage.rings.finite_rings.element_base import is_FiniteFieldElement |
887 | 886 | if not isinstance(GF, Matrix) and \ |
888 | 887 | not isinstance(GF, list) and \ |
889 | | - not is_FiniteFieldElement(GF): |
| 888 | + not (isinstance(GF, Element) and isinstance(GF.parent(), FiniteField_base)): |
890 | 889 | msg = ("keyword 'GF' must be a matrix over {0}, a list of " |
891 | 890 | "elements from {0}, or a single element from {0}") |
892 | 891 | raise TypeError(msg.format(self)) |
|
0 commit comments