Merge remote-tracking branch 'upstream/develop' into is_Fan_deprecation

src/sage/geometry/cone.py

@@ -212,10 +212,10 @@
 from sage.arith.functions import lcm
 from sage.geometry.point_collection import PointCollection
 from sage.geometry.polyhedron.constructor import Polyhedron
-from sage.geometry.hasse_diagram import lattice_from_incidences
+lazy_import('sage.geometry.hasse_diagram', 'lattice_from_incidences')
 from sage.geometry.toric_lattice import (ToricLattice, ToricLattice_generic,
                                          ToricLattice_quotient)
-from sage.geometry.toric_plotter import ToricPlotter, label_list
+lazy_import('sage.geometry.toric_plotter', ['ToricPlotter', 'label_list'])
 from sage.geometry.relative_interior import RelativeInterior
 from sage.matrix.constructor import matrix
 from sage.matrix.matrix_space import MatrixSpace

src/sage/geometry/fan.py

@@ -252,8 +252,7 @@
 lazy_import('sage.geometry.hasse_diagram', 'lattice_from_incidences')
 from sage.geometry.point_collection import PointCollection
 from sage.geometry.toric_lattice import ToricLattice, ToricLattice_generic
-from sage.geometry.toric_plotter import ToricPlotter
-from sage.graphs.digraph import DiGraph
+lazy_import('sage.geometry.toric_plotter', 'ToricPlotter')
 from sage.matrix.constructor import matrix
 from sage.misc.cachefunc import cached_method
 from sage.misc.timing import walltime

src/sage/geometry/lattice_polytope.py

@@ -130,7 +130,7 @@
 from sage.geometry.point_collection import (PointCollection,
                                             read_palp_point_collection)
 from sage.geometry.toric_lattice import ToricLattice, ToricLattice_generic
-from sage.groups.perm_gps.permgroup_named import SymmetricGroup
+lazy_import('sage.groups.perm_gps.permgroup_named', 'SymmetricGroup')
 
 from sage.features import PythonModule
 from sage.features.palp import PalpExecutable

src/sage/geometry/toric_lattice.py

@@ -146,7 +146,8 @@
 # ****************************************************************************
 
 from sage.geometry.toric_lattice_element import ToricLatticeElement
-from sage.geometry.toric_plotter import ToricPlotter
+from sage.misc.lazy_import import lazy_import
+lazy_import('sage.geometry.toric_plotter', 'ToricPlotter')
 from sage.misc.latex import latex
 from sage.structure.all import parent
 from sage.structure.richcmp import (richcmp_method, richcmp, rich_to_bool,