BUG: don't hash dtype because of endianness confusion re: #748 and #747

Author: wesm

pandas/core/frame.py

@@ -1082,11 +1082,12 @@ def convert_objects(self):
     def get_dtype_counts(self):
         counts = {}
         for _, series in self.iterkv():
-            if series.dtype in counts:
-                counts[series.dtype] += 1
+            # endianness can cause dtypes to look different
+            dtype_str = str(series.dtype)
+            if dtype_str in counts:
+                counts[dtype_str] += 1
             else:
-                counts[series.dtype] = 1
-
+                counts[dtype_str] = 1
         return Series(counts)
 
     #----------------------------------------------------------------------

pandas/core/internals.py

@@ -382,7 +382,7 @@ def is_consolidated(self):
         """
         Return True if more than one block with the same dtype
         """
-        dtypes = [blk.dtype for blk in self.blocks]
+        dtypes = [blk.dtype.type for blk in self.blocks]
         return len(dtypes) == len(set(dtypes))
 
     def get_slice(self, slobj, axis=0):

pandas/tools/tests/test_merge.py

@@ -345,7 +345,7 @@ def test_join_unconsolidated(self):
         a = DataFrame(randn(30,2), columns=['a','b'])
         c = Series(randn(30))
         a['c'] = c
-        d = DataFrame(randn(30,1), columns=['d'])
+        d = DataFrame(randn(30,1), columns=['q'])
 
         # it works!
         a.join(d)
@@ -505,6 +505,7 @@ def test_merge_nocopy(self):
         merged['d'] = 'peekaboo'
         self.assert_((right['d'] == 'peekaboo').all())
 
+
 class TestMergeMulti(unittest.TestCase):
 
     def setUp(self):