Ticket #10335: trac_10335-permgroup_domain-import_loop_fix-nt.patch

File trac_10335-permgroup_domain-import_loop_fix-nt.patch, 1.4 KB (added by nthiery, 10 years ago)

Merge only if needed

  • sage/groups/perm_gps/permgroup.py

    # HG changeset patch
    # User Nicolas M. Thiery <nthiery@users.sf.net>
    # Date 1308268049 0
    # Node ID f8787708c123cb2a11658c30344a95fd88dd3a42
    # Parent  4117d022146f22e2629f304bb5a29e6a91ae6f88
    #10335: Add domains for permutation groups
    
    diff --git a/sage/groups/perm_gps/permgroup.py b/sage/groups/perm_gps/permgroup.py
    a b from sage.groups.abelian_gps.abelian_gro 
    130130from sage.misc.cachefunc import cached_method
    131131from sage.groups.class_function import ClassFunction
    132132from sage.misc.package import is_package_installed
    133 from sage.sets.all import FiniteEnumeratedSet
     133from sage.sets.finite_enumerated_set import FiniteEnumeratedSet
    134134from sage.categories.all import FiniteEnumeratedSets
    135135
    136136def load_hap():
  • sage/groups/perm_gps/permgroup_element.pyx

    diff --git a/sage/groups/perm_gps/permgroup_element.pyx b/sage/groups/perm_gps/permgroup_element.pyx
    a b include "../../ext/python_list.pxi" 
    6565from sage.rings.all      import ZZ, Integer, is_MPolynomial, is_Polynomial
    6666from sage.matrix.all     import MatrixSpace
    6767from sage.interfaces.all import gap, is_GapElement, is_ExpectElement
    68 from sage.sets.all import FiniteEnumeratedSet
     68from sage.sets.finite_enumerated_set import FiniteEnumeratedSet
    6969import sage.structure.coerce as coerce
    7070
    7171import operator