Derive directly rather than using _injector - fixes pickling but I'm not entirely sure is a way to go.

artemp · artemp · commit 5aa7fb85b6fb · 2016-07-22T16:10:15.000+02:00
diff --git a/mapnik/__init__.py b/mapnik/__init__.py
@@ -103,12 +103,12 @@ def Filter(*args, **kwargs):
     return Expression(*args, **kwargs)
 
 
-class Envelope(Box2d):
+class Envelope(Box2d_Base):
 
     def __init__(self, *args, **kwargs):
         warnings.warn("'Envelope' is deprecated and will be removed in Mapnik 3.x, use 'Box2d' instead",
                       DeprecationWarning, 2)
-        Box2d.__init__(self, *args, **kwargs)
+        Box2d_Base.__init__(self, *args, **kwargs)
 
 
 class _Coord(Coord, _injector()):
@@ -186,7 +186,7 @@ def inverse(self, projection):
         return inverse_(self, projection)
 
 
-class _Box2d(Box2d, _injector()):
+class Box2d(Box2d_Base):#, _injector()):
     """
     Represents a spatial envelope (i.e. bounding box).
 
@@ -294,7 +294,7 @@ def all_features(self, fields=None, variables={}):
         return self.__iter__(fields, variables)
 
 
-class _Color(Color, _injector()):
+class Color(Color_Base):#, _injector()):
 
     def __repr__(self):
         return "Color(R=%d,G=%d,B=%d,A=%d)" % (self.r, self.g, self.b, self.a)
diff --git a/mapnik/printing.py b/mapnik/printing.py
@@ -21,7 +21,7 @@
 import os
 import tempfile
 
-from . import (Box2d, Coord, Feature, Geometry, Layer, Map, Projection, Style,
+from . import (Box2d_Base, Coord, Feature, Geometry, Layer, Map, Projection, Style,
                render)
 
 try:
diff --git a/src/mapnik_color.cpp b/src/mapnik_color.cpp
@@ -47,7 +47,7 @@ struct color_pickle_suite : boost::python::pickle_suite
 void export_color ()
 {
     using namespace boost::python;
-    class_<color>("Color", init<int,int,int,int>(
+    class_<color>("Color_Base", init<int,int,int,int>(
                       ( arg("r"), arg("g"), arg("b"), arg("a") ),
                       "Creates a new color from its RGB components\n"
                       "and an alpha value.\n"
diff --git a/src/mapnik_envelope.cpp b/src/mapnik_envelope.cpp
@@ -106,7 +106,7 @@ box2d<double> box2d_deepcopy(box2d<double> & obj, boost::python::dict const&)
 void export_envelope()
 {
     using namespace boost::python;
-    class_<box2d<double> >("Box2d",
+    class_<box2d<double> >("Box2d_Base",
                            // class docstring is in mapnik/__init__.py, class _Coord
                            init<double,double,double,double>(
                                (arg("minx"),arg("miny"),arg("maxx"),arg("maxy")),

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ struct color_pickle_suite : boost::python::pickle_suite`
`47`	`47`	`void export_color ()`
`48`	`48`	`{`
`49`	`49`	`using namespace boost::python;`
`50`		`- class_<color>("Color", init<int,int,int,int>(`
	`50`	`+ class_<color>("Color_Base", init<int,int,int,int>(`
`51`	`51`	`( arg("r"), arg("g"), arg("b"), arg("a") ),`
`52`	`52`	`"Creates a new color from its RGB components\n"`
`53`	`53`	`"and an alpha value.\n"`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ box2d<double> box2d_deepcopy(box2d<double> & obj, boost::python::dict const&)`
`106`	`106`	`void export_envelope()`
`107`	`107`	`{`
`108`	`108`	`using namespace boost::python;`
`109`		`- class_<box2d<double> >("Box2d",`
	`109`	`+ class_<box2d<double> >("Box2d_Base",`
`110`	`110`	`// class docstring is in mapnik/__init__.py, class _Coord`
`111`	`111`	`init<double,double,double,double>(`
`112`	`112`	`(arg("minx"),arg("miny"),arg("maxx"),arg("maxy")),`