Skip to content

Commit c3da4d8

Browse files
committed
34185 / 35668: fixes according to review
1 parent b695c04 commit c3da4d8

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

src/bin/sage-runtests

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ if __name__ == "__main__":
5454
'Note that "!" needs to be quoted or escaped in the shell.')
5555
parser.add_argument("--hide", metavar="FEATURES", default="",
5656
help='run tests pretending that the software listed in FEATURES (separated by commas) is not installed; '
57-
'if "all" is listed, will also hide features corresponding to all non standard packages; '
57+
'if "all" is listed, will also hide features corresponding to all optional or experimental packages; '
5858
'if "optional" is listed, will also hide features corresponding to optional packages.')
5959
parser.add_argument("--randorder", type=int, metavar="SEED", help="randomize order of tests")
6060
parser.add_argument("--random-seed", dest="random_seed", type=int, metavar="SEED", help="random seed (integer) for fuzzing doctests",

src/sage/features/__init__.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ def resolution(self):
295295

296296
def joined_features(self):
297297
r"""
298-
Return a list of features joined with ``self``.
298+
Return a list of features that ``self`` is the join of.
299299
300300
OUTPUT:
301301
@@ -306,14 +306,22 @@ def joined_features(self):
306306
sage: from sage.features.graphviz import Graphviz
307307
sage: Graphviz().joined_features()
308308
[Feature('dot'), Feature('neato'), Feature('twopi')]
309+
sage: from sage.features.sagemath import sage__rings__function_field
310+
sage: sage__rings__function_field().joined_features()
311+
[Feature('sage.rings.function_field.function_field_polymod'),
312+
Feature('sage.libs.singular'),
313+
Feature('sage.libs.singular.singular'),
314+
Feature('sage.interfaces.singular')]
309315
sage: from sage.features.interfaces import Mathematica
310316
sage: Mathematica().joined_features()
311317
[]
312318
"""
313319
from sage.features.join_feature import JoinFeature
320+
res = []
314321
if isinstance(self, JoinFeature):
315-
return self._features
316-
return []
322+
for f in self._features:
323+
res += [f] + f.joined_features()
324+
return res
317325

318326
def is_standard(self):
319327
r"""

0 commit comments

Comments
 (0)