sagemath/sagemath-gap-hap.patch
2015-12-22 12:50:40 -02:00

53 lines
2.4 KiB
Diff

diff -up src/sage/groups/perm_gps/permgroup.py.orig src/sage/groups/perm_gps/permgroup.py
--- src/sage/groups/perm_gps/permgroup.py.orig 2015-10-11 17:56:24.028811706 -0300
+++ src/sage/groups/perm_gps/permgroup.py 2015-10-11 17:58:26.629816401 -0300
@@ -136,7 +136,6 @@ from sage.groups.perm_gps.permgroup_elem
from sage.groups.abelian_gps.abelian_group import AbelianGroup
from sage.misc.cachefunc import cached_method
from sage.groups.class_function import ClassFunction
-from sage.misc.package import is_package_installed
from sage.sets.finite_enumerated_set import FiniteEnumeratedSet
from sage.categories.all import FiniteEnumeratedSets
from sage.groups.conjugacy_classes import ConjugacyClassGAP
@@ -181,8 +180,7 @@ def hap_decorator(f):
"""
@wraps(f)
def wrapped(self, n, p=0):
- if not is_package_installed('gap_packages'):
- raise RuntimeError("You must install the optional gap_packages package.")
+ raise RuntimeError("gap-hap package not available.")
load_hap()
from sage.rings.arith import is_prime
if not (p == 0 or is_prime(p)):
@@ -1617,9 +1615,7 @@ class PermutationGroup_generic(group.Fin
try:
return [Integer(n) for n in self._gap_().IdGroup()]
except RuntimeError:
- if not is_package_installed('database_gap'):
- raise RuntimeError("You must install the optional database_gap package first.")
- raise
+ raise RuntimeError("gap-hap package not available.")
def id(self):
"""
@@ -1670,9 +1666,7 @@ class PermutationGroup_generic(group.Fin
try:
return Integer(self._gap_().PrimitiveIdentification())
except RuntimeError:
- if not is_package_installed('database_gap'):
- raise RuntimeError("You must install the optional database_gap package first.")
- raise
+ raise RuntimeError("gap-hap package not available.")
def center(self):
"""
@@ -3959,8 +3953,7 @@ class PermutationGroup_generic(group.Fin
- David Joyner and Graham Ellis
"""
- if not is_package_installed('gap_packages'):
- raise RuntimeError("You must install the optional gap_packages package.")
+ raise RuntimeError("gap-hap package not available.")
load_hap()
from sage.rings.arith import is_prime
if not (p == 0 or is_prime(p)):