Always import Python tweaks to extension classes.

This ensures that unpickled instances of extension classes have
all Python-level tweaks loaded and behave consistently

This closes #6.

Author: pavoljuhas

diffpy/srreal/overlapcalculator.py

@@ -75,7 +75,4 @@ def _call_kwargs(self, structure=None, **kwargs):
 OverlapCalculator.__init__ = _init_kwargs
 OverlapCalculator.__call__ = _call_kwargs
 
-# this registers CovalentRadiiTable as 'covalent' type
-import diffpy.srreal.atomradiitable
-
 # End of file

diffpy/srreal/pdfcalculator.py

@@ -43,10 +43,6 @@
 from diffpy.srreal.peakwidthmodel import (PeakWidthModel,
         ConstantPeakWidth, DebyeWallerPeakWidth, JeongPeakWidth)
 
-# activate pickling in PDFCalculator-owned classes
-
-import diffpy.srreal.scatteringfactortable
-
 # ----------------------------------------------------------------------------
 
 def _defineCommonInterface(cls):

srrealmodule/srreal_ext.cpp

@@ -78,8 +78,20 @@ BOOST_PYTHON_MODULE(srreal_ext)
     wrap_BondCalculator();
     wrap_AtomRadiiTable();
     wrap_OverlapCalculator();
-    // load structure converters
+    // load Python modules that tweak the wrapped classes
     using boost::python::import;
+    import("diffpy.srreal.attributes");
+    import("diffpy.srreal.atomradiitable");
+    import("diffpy.srreal.bondcalculator");
+    import("diffpy.srreal.bvscalculator");
+    import("diffpy.srreal.overlapcalculator");
+    import("diffpy.srreal.pdfbaseline");
+    import("diffpy.srreal.pdfcalculator");
+    import("diffpy.srreal.pdfenvelope");
+    import("diffpy.srreal.peakprofile");
+    import("diffpy.srreal.peakwidthmodel");
+    import("diffpy.srreal.scatteringfactortable");
+    // load structure converters
     import("diffpy.srreal.structureconverters");
 }
 

srrealmodule/wrap_Attributes.cpp

@@ -196,8 +196,6 @@ void wrap_Attributes()
                 (python::arg("getter")=None, python::arg("setter")=None),
                 doc_Attributes__registerDoubleAttribute)
         ;
-    // inject the __getattr__ and __setattr__ methods
-    import("diffpy.srreal.attributes");
 }
 
 }   // namespace srrealmodule