Merge pull request #8400 from benjschiller/master

add support for numpy 1.8+ data types for conversion to r dataframe

Author: jreback

doc/source/v0.15.0.txt

@@ -271,7 +271,7 @@ API changes
 - ``DataFrame.info()`` now ends its output with a newline character (:issue:`8114`)
 - add ``copy=True`` argument to ``pd.concat`` to enable pass thru of complete blocks (:issue:`8252`)
 
-
+- Added support for numpy 1.8+ data types (bool_, int_, float_, string_) for conversion to R dataframe  (:issue:`8400`)
 
 .. _whatsnew_0150.dt:
 

pandas/rpy/common.py

@@ -4,6 +4,7 @@
 """
 from __future__ import print_function
 
+from distutils.version import LooseVersion
 from pandas.compat import zip, range
 import numpy as np
 
@@ -72,7 +73,7 @@ def _list(item):
             return list(item)
         except TypeError:
             return []
-        
+
     # For iris3, HairEyeColor, UCBAdmissions, Titanic
     dim = list(obj.dim)
     values = np.array(list(obj))
@@ -101,9 +102,9 @@ def _convert_vector(obj):
     except AttributeError:
         return list(obj)
     if 'names' in attributes:
-        return pd.Series(list(obj), index=r['names'](obj)) 
+        return pd.Series(list(obj), index=r['names'](obj))
     elif 'tsp' in attributes:
-        return pd.Series(list(obj), index=r['time'](obj)) 
+        return pd.Series(list(obj), index=r['time'](obj))
     elif 'labels' in attributes:
         return pd.Series(list(obj), index=r['labels'](obj))
     if _rclass(obj) == 'dist':
@@ -268,6 +269,7 @@ def convert_to_r_posixct(obj):
                 np.str: robj.StrVector,
                 np.bool: robj.BoolVector}
 
+
 NA_TYPES = {np.float64: robj.NA_Real,
             np.float32: robj.NA_Real,
             np.float: robj.NA_Real,
@@ -279,6 +281,16 @@ def convert_to_r_posixct(obj):
             np.bool: robj.NA_Logical}
 
 
+if LooseVersion(np.__version__) >= LooseVersion('1.8'):
+    for dict_ in (VECTOR_TYPES, NA_TYPES):
+        dict_.update({
+            np.bool_: dict_[np.bool],
+            np.int_: dict_[np.int],
+            np.float_: dict_[np.float],
+            np.string_: dict_[np.str]
+        })
+
+
 def convert_to_r_dataframe(df, strings_as_factors=False):
     """
     Convert a pandas DataFrame to a R data.frame.