Merge remote-tracking branch 'origin/v1.1.x'

mdboom · mdboom · commit b9f4e2d701da · 2012-05-17T10:20:50.000-04:00
diff --git a/lib/matplotlib/_cm.py b/lib/matplotlib/_cm.py
@@ -13,11 +13,6 @@
     'blue' :  ((0., 1., 1.), (1., 0., 0.))
     }
 
-_bone_data = {'red':   ((0., 0., 0.),(1.0, 1.0, 1.0)),
-              'green': ((0., 0., 0.),(1.0, 1.0, 1.0)),
-              'blue':  ((0., 0., 0.),(1.0, 1.0, 1.0))}
-
-
 _autumn_data = {'red':   ((0., 1.0, 1.0),(1.0, 1.0, 1.0)),
                 'green': ((0., 0., 0.),(1.0, 1.0, 1.0)),
                 'blue':  ((0., 0., 0.),(1.0, 0., 0.))}
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -1626,12 +1626,12 @@ def colors():
 
     You can also use any legal html name for a color, for example::
 
-      color = 'red',
+      color = 'red'
       color = 'burlywood'
       color = 'chartreuse'
 
     The example below creates a subplot with a dark
-    slate gray background
+    slate gray background::
 
        subplot(111, axisbg=(0.1843, 0.3098, 0.3098))
 
diff --git a/src/path_converters.h b/src/path_converters.h
@@ -382,7 +382,7 @@ class PathClipper
                         return code;
                     }
                 }
-                else if (code == agg::path_cmd_end_poly | agg::path_flags_close
+                else if (code == (agg::path_cmd_end_poly | agg::path_flags_close)
                          && m_broke_path && m_has_init)
                 {
                     *x = m_initX;

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ class PathClipper`
`382`	`382`	`return code;`
`383`	`383`	`}`
`384`	`384`	`}`
`385`		`- else if (code == agg::path_cmd_end_poly \| agg::path_flags_close`
	`385`	`+ else if (code == (agg::path_cmd_end_poly \| agg::path_flags_close)`
`386`	`386`	`&& m_broke_path && m_has_init)`
`387`	`387`	`{`
`388`	`388`	`*x = m_initX;`