Ticket #4305: trac_4305_review.patch

File trac_4305_review.patch, 3.0 KB (added by mabshoff, 13 years ago)
  • sage/libs/ntl/ntl_GF2X.pyx

    diff -r 26768e76cd3a sage/libs/ntl/ntl_GF2X.pyx
    a b  
    119119            [1 0 1 0 0 1]
    120120        """
    121121
    122         from sage.rings.finite_field_element import FiniteField_ext_pariElement
    123         from sage.rings.finite_field_givaro import FiniteField_givaroElement
    124         from sage.rings.finite_field_ntl_gf2e import FiniteField_ntl_gf2eElement
     122        from sage.rings.finite_field.finite_field_element import FiniteField_ext_pariElement
     123        from sage.rings.finite_field.finite_field_givaro import FiniteField_givaroElement
     124        from sage.rings.finite_field.finite_field_ntl_gf2e import FiniteField_ntl_gf2eElement
    125125        from sage.rings.ring import FiniteField
    126126        from sage.rings.polynomial.polynomial_modn_dense_ntl import Polynomial_dense_mod_p
    127127
  • sage/libs/singular/singular.pxd

    diff -r 26768e76cd3a sage/libs/singular/singular.pxd
    a b  
    33from sage.rings.rational cimport Rational
    44from sage.structure.element cimport Element
    55from sage.rings.integer cimport Integer
    6 from sage.rings.finite_field.finite_field_givaro cimport FiniteField_givaro,FiniteField_givaroElement
    7 from sage.rings.finite_field.finite_field_ntl_gf2e cimport FiniteField_ntl_gf2e,FiniteField_ntl_gf2eElement
     6from sage.rings.finite_field.finite_field_ntl_gf2e cimport FiniteField_ntl_gf2e, FiniteField_ntl_gf2eElement
     7from sage.rings.finite_field.finite_field_givaro cimport FiniteField_givaro, FiniteField_givaroElement
    88from sage.rings.polynomial.multi_polynomial_libsingular cimport MPolynomial_libsingular
    99from sage.rings.polynomial.multi_polynomial_libsingular cimport MPolynomialRing_libsingular
    1010
  • sage/misc/flatten.py

    diff -r 26768e76cd3a sage/misc/flatten.py
    a b  
    4040       [0, 1, 2, 3, 4]
    4141       sage: flatten([GF(5)])
    4242       [Finite Field of size 5]
    43        sage: flatten([GF(5)], ltypes = (list, tuple, sage.rings.finite_field_prime_modn.FiniteField_prime_modn))
     43       sage: flatten([GF(5)], ltypes = (list, tuple, sage.rings.finite_field.finite_field_prime_modn.FiniteField_prime_modn))
    4444       [0, 1, 2, 3, 4]
    4545
    4646   Degenerate cases:
  • sage/rings/finite_field/finite_field.py

    diff -r 26768e76cd3a sage/rings/finite_field/finite_field.py
    a b  
    2020internally to represent the field
    2121(\code{sage.rings.finite_field.finite_field_ntl_gf2e.FiniteField_ntl_gf2e}). In all
    2222other case the PARI C library is used
    23 (\code{sage.rings.finite_field_ext_pari.FiniteField_ext_pari}).
     23(\code{sage.rings.finite_field.finite_field_ext_pari.FiniteField_ext_pari}).
    2424
    2525However, this distinction is internal only and the user usually does
    2626not have to worry about it because consistency across all