fixing a few imports

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':

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):

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()

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: