# HG changeset patch
# User Nathann Cohen <nathann.cohen@gmail.com>
# Date 1359465468 3600
# Node ID 222c2d8ef79cded2548e535d5eef9997d027d108
# Parent e3d66ffe7e46871675c18f49f13c4120cc160319
Default parameters for Graph.plot() and Graph.show()  typos and useless graphplot method
diff git a/sage/graphs/generic_graph.py b/sage/graphs/generic_graph.py
a

b


309  309  from sage.rings.rational import Rational 
310  310  from generic_graph_pyx import GenericGraph_pyx, spring_layout_fast 
311  311  from sage.graphs.dot2tex_utils import assert_have_dot2tex 
 312  from sage.misc.superseded import deprecated_function_alias 
312  313  
313  314  class GenericGraph(GenericGraph_pyx): 
314  315  """ 
… 
… 

14515  14516  # time. 
14516  14517  plot_kwds = {k:kwds.pop(k) for k in graphplot_options if k in kwds} 
14517  14518  
14518   return GraphPlot(graph=self, options=plot_kwds).show(**kwds) 
14519   
14520  14519  def plot3d(self, bgcolor=(1,1,1), vertex_colors=None, vertex_size=0.06, 
14521  14520  edge_colors=None, edge_size=0.02, edge_size2=0.0325, 
14522  14521  pos3d=None, color_by_label=False, 
diff git a/sage/graphs/graph_plot.py b/sage/graphs/graph_plot.py
a

b


26  26  
27  27  **Plot options** 
28  28  
29   Here is the list of options accepted by :meth:`GraphPlot.plot` and the 
 29  Here is the list of options accepted by :meth:`GenericGraph.plot` and the 
30  30  constructor of :class:`GraphPlot`. 
31  31  
32  32  .. csvtable:: 
… 
… 

77  77  **Default options** 
78  78  
79  79  This module defines two dictionaries containing default options for the 
80   :meth:`~GraphPlot.plot` and :meth:`~GraphPlot.show` methods. These two 
 80  :meth:`GenericGraph.plot` and :meth:`GenericGraph.show` methods. These two 
81  81  dictionaries are ``sage.graphs.graph_plot.DEFAULT_SHOW_OPTIONS`` and 
82  82  ``sage.graphs.graph_plot.DEFAULT_PLOT_OPTIONS``. 
83  83  
… 
… 

476  476  ... vn = vector(((x(vx[v0]+vx[v1])/2.),y(vy[v0]+vy[v1])/2.)).norm() 
477  477  ... assert vn < tol 
478  478  
479   
480  479  """ 
481  480  for arg in edge_options: 
482  481  self._options[arg] = edge_options[arg] 