diff --git a/src/sage/combinat/words/finite_word.py b/src/sage/combinat/words/finite_word.py index 460665cbadb..75ff1efba83 100644 --- a/src/sage/combinat/words/finite_word.py +++ b/src/sage/combinat/words/finite_word.py @@ -6899,7 +6899,9 @@ def colored_vector(self, x=0, y=0, width='default', height=1, cmap='hsv', thickn raise RuntimeError("Color map %s not known"%cmap) #Drawing the colored vector... - from sage.plot.plot import polygon,line,text + from sage.plot.line import line + from sage.plot.polygon import polygon + from sage.plot.text import text #The default width of the vector if width == 'default': diff --git a/src/sage/matrix/matrix2.pyx b/src/sage/matrix/matrix2.pyx index 44fdab2648b..974ca2e0f14 100644 --- a/src/sage/matrix/matrix2.pyx +++ b/src/sage/matrix/matrix2.pyx @@ -13221,7 +13221,7 @@ cdef class Matrix(Matrix1): sage: A.plot(cmap='Oranges') Graphics object consisting of 1 graphics primitive """ - from sage.plot.plot import matrix_plot + from sage.plot.matrix_plot import matrix_plot return matrix_plot(self, *args, **kwds) def derivative(self, *args): diff --git a/src/sage/plot/plot.py b/src/sage/plot/plot.py index c6f1385923f..0b3603c0fbf 100644 --- a/src/sage/plot/plot.py +++ b/src/sage/plot/plot.py @@ -579,6 +579,12 @@ def f(x): return (x-3)*(x-5)*(x-7)+40 from sage.misc.decorators import options from .graphics import Graphics, GraphicsArray +from sage.plot.polygon import polygon + +# line below is only for redirection of imports +from sage.plot.line import line, line2d + + #Currently not used - see comment immediately above about #figure.canvas.mpl_connect('draw_event', pad_for_tick_labels) @@ -2064,7 +2070,6 @@ def _plot(funcs, xrange, parametric=False, """ from sage.plot.colors import Color - from sage.plot.polygon import polygon from sage.plot.misc import setup_for_eval_on_grid if funcs == []: return Graphics() diff --git a/src/sage/plot/step.py b/src/sage/plot/step.py index aa1680fb0ff..de37cf982a4 100644 --- a/src/sage/plot/step.py +++ b/src/sage/plot/step.py @@ -17,6 +17,8 @@ # # http://www.gnu.org/licenses/ #***************************************************************************** +from sage.plot.line import line + def plot_step_function(v, vertical_lines=True, **kwds): r""" @@ -51,9 +53,8 @@ def plot_step_function(v, vertical_lines=True, **kwds): sage: plot_step_function(v, vertical_lines=False, thickness=30, rgbcolor='purple', axes=False) Graphics object consisting of 14 graphics primitives """ - from .plot import line # make sorted copy of v (don't change in place, since that would be rude). - v = list(sorted(v)) + v = sorted(v) if len(v) <= 1: return line([]) # empty line if vertical_lines: