Revert some perf updates to fix pytests

Author: mbaak

histogrammar/defs.py

@@ -20,6 +20,7 @@
 import math
 import random
 import re
+
 try:
     from collections import OrderedDict
 except ImportError:
@@ -54,12 +55,6 @@ def __len__(self):
 from histogrammar.pycparser import c_ast
 import histogrammar.version
 
-try:
-    import histogrammar.specialized
-    spec = True
-except (ImportError, AttributeError):
-    spec = False
-
 
 class ContainerException(Exception):
     """Exception type for improperly configured containers."""
@@ -122,10 +117,13 @@ def specialize(self):
         since they are created before the histogrammar.specialized module can be defined.
         These objects wouldn't satisfy any of ``addImplicitMethod``'s checks anyway.
         """
-        if spec:
+        try:
             # MB 20220517: warning, this is a slow function.
             # Adding functions to each object, ideally avoid this.
+            import histogrammar.specialized
             histogrammar.specialized.addImplicitMethods(self)
+        except (ImportError, AttributeError):
+            pass
 
         self.fill = FillMethod(self, self.fill)
         self.plot = PlotMethod(self, self.plot)
@@ -237,6 +235,7 @@ def plot(self, httpServer=None, **parameters):
         raise NotImplementedError
 
     def __getstate__(self):
+        # used by pickling
         state = dict(self.__dict__)
         for s in ['fill', 'plot']:
             # these states are set dynamically by FillMethod and PlotMethod, in factory.specialize().
@@ -247,6 +246,7 @@ def __getstate__(self):
         return state
 
     def __setstate__(self, dict):
+        # used by unpickling
         self.__dict__ = dict
         self.fill = FillMethod(self, self.fill)
         self.plot = PlotMethod(self, self.plot)

histogrammar/util.py

@@ -55,12 +55,19 @@ class PlotMethod(object):
     def __init__(self, container, plot):
         self.container = container
         self.plot = plot
-        if hasattr(container, 'plotroot'):
+
+        try:
             self.root = container.plotroot
-        if hasattr(container, 'plotbokeh'):
+        except (AttributeError, KeyError):
+            pass
+        try:
             self.bokeh = container.plotbokeh
-        if hasattr(container, 'plotmatplotlib'):
+        except (AttributeError, KeyError):
+            pass
+        try:
             self.matplotlib = container.plotmatplotlib
+        except (AttributeError, KeyError):
+            pass
 
     def __call__(self, *args, **kwds):
         return self.plot(*args, **kwds)