Merge pull request #1302 from tyarkoni/string-checking

fixes string checking for Python 2/3 compatibility; closes #1301

Author: Chris Fonnesbeck

pymc3/distributions/distribution.py

@@ -4,6 +4,7 @@
 
 from ..memoize import memoize
 from ..model import Model, get_named_nodes
+from ..vartypes import string_types
 
 
 __all__ = ['DensityDist', 'Distribution', 'Continuous', 'Discrete', 'NoDistribution', 'TensorType', 'draw_values']
@@ -19,7 +20,7 @@ def __new__(cls, name, *args, **kwargs):
                             "use the Normal('x', 0,1) syntax. "
                             "Add a 'with model:' block")
 
-        if isinstance(name, str):
+        if isinstance(name, string_types):
             data = kwargs.pop('observed', None)
             dist = cls.dist(*args, **kwargs)
             return model.Var(name, dist, data)
@@ -65,7 +66,7 @@ def get_test_val(self, val, defaults):
 
 
     def getattr_value(self, val):
-        if isinstance(val, str):
+        if isinstance(val, string_types):
             val = getattr(self, val)
 
         if isinstance(val, tt.TensorVariable):

pymc3/vartypes.py

@@ -1,3 +1,5 @@
+import sys
+
 __all__ = ['bool_types', 'int_types', 'float_types', 'complex_types', 'continuous_types',
         'discrete_types', 'default_type', 'typefilter']
 
@@ -21,6 +23,11 @@
 default_type = {'discrete': 'int64',
                 'continuous': 'float64'}
 
+if sys.version_info[0] == 3:
+    string_types = str
+else:
+    string_types = basestring
+
 
 def typefilter(vars, types):
     # Returns variables of type `types` from `vars`