Portable repr

Author: arahlin

core/python/modconstruct.py

@@ -278,5 +278,5 @@ def PipelineAddCallable(self, callable, name=None, subprocess=False, **kwargs):
 
 # Add this as G3Pipeline's Add method so it takes any Python callable
 G3Pipeline.Add = PipelineAddCallable
-G3Pipeline.__repr__ = lambda self: repr(self._pipelineinfo.pipelineinfo) if hasattr(self, '_pipelineinfo') else 'pipe = spt3g.core.G3Pipeline()'
+G3Pipeline.__repr__ = lambda self: repr(self._pipelineinfo.pipelineinfo) if hasattr(self, '_pipelineinfo') else 'pipe = {}.G3Pipeline()'.format(G3Pipeline.__module__)
 

core/src/G3PipelineInfo.cxx

@@ -229,18 +229,20 @@ G3PipelineInfo::Description() const
 }
 
 static std::string
-G3PipelineInfo_repr(const G3PipelineInfo &pi)
+G3PipelineInfo_repr(const py::object &pi)
 {
-	std::string rv;
-	rv = "pipe = spt3g.core.G3Pipeline()";
+	std::ostringstream rv;
+	rv << "pipe = ";
+	rv << py::extract<std::string>(pi.attr("__class__").attr("__module__"))();
+	rv << ".G3Pipeline()";
 
-	for (auto i : pi.modules)
-		rv += "\n" + G3ModuleConfig_repr(i);
-	return rv;
+	for (auto i : py::extract<const G3PipelineInfo &>(pi)().modules)
+		rv << "\n" << G3ModuleConfig_repr(i);
+	return rv.str();
 }
 
 static void
-G3PipelineInfo_run(const G3PipelineInfo &pi)
+G3PipelineInfo_run(const py::object &pi)
 {
 	py::object main = py::module_::import("__main__");
 	py::dict global = py::dict(main.attr("__dict__"));

core/src/G3Quat.cxx

@@ -800,10 +800,12 @@ quat_str(const Quat &q)
 }
 
 static std::string
-quat_repr(const Quat &q)
+quat_repr(const py::object &q)
 {
 	std::ostringstream oss;
-	oss << "spt3g.core.Quat" << q;
+	oss << py::extract<std::string>(q.attr("__class__").attr("__module__"))() << ".";
+	oss << py::extract<std::string>(q.attr("__class__").attr("__name__"))();
+	oss << py::extract<const Quat &>(q)();
 	return oss.str();
 }
 }