Fix compilation in Python 2.x

mdboom · ddale · commit 192f67edcb50 · 2011-02-22T10:21:26.000-05:00
svn path=/branches/py3k/; revision=8556
diff --git a/setupext.py b/setupext.py
@@ -134,8 +134,10 @@
 
 defines = [
         ('PY_ARRAY_UNIQUE_SYMBOL', 'MPL_ARRAY_API'),
-        ('PYCXX_ISO_CPP_LIB', '1'),
-        ('PYCXX_PYTHON_2TO3', '1')]
+        ('PYCXX_ISO_CPP_LIB', '1')]
+
+if sys.hexversion >= 0x03000000:
+    defines.append(('PYCXX_PYTHON_2TO3', '1'))
 
 setup_cfg = os.environ.get('MPLSETUPCFG', 'setup.cfg')
 # Based on the contents of setup.cfg, determine the build options
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -212,7 +212,7 @@ void
 GCAgg::_set_antialiased(const Py::Object& gc)
 {
     _VERBOSE("GCAgg::antialiased");
-    isaa = gc.getAttr("_antialiased").as_bool();
+    isaa = Py::Boolean(gc.getAttr("_antialiased"));
 }
 
 
@@ -1521,7 +1521,7 @@ RendererAgg::_draw_path_collection_generic
 
         if (check_snap)
         {
-            gc.isaa = antialiaseds[i % Naa].as_bool();
+            gc.isaa = Py::Boolean(antialiaseds[i % Naa]);
 
             transformed_path_t tpath(path, trans);
             nan_removed_t      nan_removed(tpath, true, has_curves);
@@ -1540,7 +1540,7 @@ RendererAgg::_draw_path_collection_generic
         }
         else
         {
-            gc.isaa = antialiaseds[i % Naa].as_bool();
+            gc.isaa = Py::Boolean(antialiaseds[i % Naa]);
 
             transformed_path_t tpath(path, trans);
             nan_removed_t      nan_removed(tpath, true, has_curves);
@@ -1753,8 +1753,8 @@ RendererAgg::draw_quad_mesh(const Py::Tuple& args)
     Py::Object              offsets_obj      = args[5];
     agg::trans_affine       offset_trans     = py_to_agg_transformation_matrix(args[6].ptr());
     Py::Object              facecolors_obj   = args[7];
-    bool                    antialiased      = args[8].as_bool();
-    bool                    showedges        = args[9].as_bool();
+    bool                    antialiased      = Py::Boolean(args[8]);
+    bool                    showedges        = Py::Boolean(args[9]);
     bool                    free_edgecolors  = false;
 
     QuadMeshGenerator path_generator(mesh_width, mesh_height, coordinates.ptr());
diff --git a/src/_path.cpp b/src/_path.cpp
@@ -385,7 +385,7 @@ _path_module::update_path_extents(const Py::Tuple& args)
             "Must pass Bbox object as arg 3 of update_path_extents");
     }
     Py::Object minpos_obj = args[3];
-    bool ignore = args[4].as_bool();
+    bool ignore = Py::Boolean(args[4]);
 
     double xm, ym;
     PyArrayObject* input_minpos = NULL;
@@ -605,7 +605,7 @@ _path_module::point_in_path_collection(const Py::Tuple& args)
     Py::SeqBase<Py::Object> transforms_obj   = args[5];
     Py::SeqBase<Py::Object> offsets_obj      = args[6];
     agg::trans_affine       offset_trans     = py_to_agg_transformation_matrix(args[7].ptr());
-    bool                    filled           = args[8].as_bool();
+    bool                    filled           = Py::Boolean(args[8]);
 
     PyArrayObject* offsets = (PyArrayObject*)PyArray_FromObject(
         offsets_obj.ptr(), PyArray_DOUBLE, 0, 2);
@@ -934,7 +934,7 @@ _path_module::clip_path_to_rect(const Py::Tuple &args)
 
     PathIterator path(args[0]);
     Py::Object bbox_obj = args[1];
-    bool inside = args[2].as_bool();
+    bool inside = Py::Boolean(args[2]);
 
     double x0, y0, x1, y1;
     if (!py_convert_bbox(bbox_obj.ptr(), x0, y0, x1, y1))

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ void`
`212`	`212`	`GCAgg::_set_antialiased(const Py::Object& gc)`
`213`	`213`	`{`
`214`	`214`	`_VERBOSE("GCAgg::antialiased");`
`215`		`- isaa = gc.getAttr("_antialiased").as_bool();`
	`215`	`+ isaa = Py::Boolean(gc.getAttr("_antialiased"));`
`216`	`216`	`}`
`217`	`217`
`218`	`218`
`@@ -1521,7 +1521,7 @@ RendererAgg::_draw_path_collection_generic`
`1521`	`1521`
`1522`	`1522`	`if (check_snap)`
`1523`	`1523`	`{`
`1524`		`- gc.isaa = antialiaseds[i % Naa].as_bool();`
	`1524`	`+ gc.isaa = Py::Boolean(antialiaseds[i % Naa]);`
`1525`	`1525`
`1526`	`1526`	`transformed_path_t tpath(path, trans);`
`1527`	`1527`	`nan_removed_t nan_removed(tpath, true, has_curves);`
`@@ -1540,7 +1540,7 @@ RendererAgg::_draw_path_collection_generic`
`1540`	`1540`	`}`
`1541`	`1541`	`else`
`1542`	`1542`	`{`
`1543`		`- gc.isaa = antialiaseds[i % Naa].as_bool();`
	`1543`	`+ gc.isaa = Py::Boolean(antialiaseds[i % Naa]);`
`1544`	`1544`
`1545`	`1545`	`transformed_path_t tpath(path, trans);`
`1546`	`1546`	`nan_removed_t nan_removed(tpath, true, has_curves);`
`@@ -1753,8 +1753,8 @@ RendererAgg::draw_quad_mesh(const Py::Tuple& args)`
`1753`	`1753`	`Py::Object offsets_obj = args[5];`
`1754`	`1754`	`agg::trans_affine offset_trans = py_to_agg_transformation_matrix(args[6].ptr());`
`1755`	`1755`	`Py::Object facecolors_obj = args[7];`
`1756`		`- bool antialiased = args[8].as_bool();`
`1757`		`- bool showedges = args[9].as_bool();`
	`1756`	`+ bool antialiased = Py::Boolean(args[8]);`
	`1757`	`+ bool showedges = Py::Boolean(args[9]);`
`1758`	`1758`	`bool free_edgecolors = false;`
`1759`	`1759`
`1760`	`1760`	`QuadMeshGenerator path_generator(mesh_width, mesh_height, coordinates.ptr());`