Merge branch 'master' of github.com:bbasseri/matplotlib

Aleks · Aleks · commit d4bf9fab4f65 · 2012-04-05T00:33:42.000-05:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -476,12 +476,9 @@ def __call__(self, s):
     'polaraxes.grid'        : [True, validate_bool],   # display polar grid or not
   
     # axes3d props
-    'axes3d.grid'           : [True, validate_bool],   # display 3d grid
     'axes3d.axisbelow'        : [False, validate_bool],
     'axes3d.hold'             : [True, validate_bool],
     'axes3d.facecolor'        : ['w', validate_color],    # background color; white
-    'axes3d.edgecolor'        : ['k', validate_color],    # edge color; black
-    'axes3d.linewidth'        : [1.0, validate_float],    # edge linewidth
     'axes3d.titlesize'        : ['large', validate_fontsize], # fontsize of the axes title
     'axes3d.grid'             : [False, validate_bool],   # display grid or not
     'axes3d.labelsize'        : ['medium', validate_fontsize], # fontsize of the x any y labels
