Merge branch 'fix-cartesian-product' of https://github.com/shoyer/pandas into shoyer-fix-cartesian-product

Author: jreback

doc/source/release.rst

@@ -170,6 +170,7 @@ Bug Fixes
   depending on the order of dictionary keys and values (:issue:`5338`).
 - Perf issue in concatting with empty objects (:issue:`3259`)
 - Clarify sorting of ``sym_diff`` on ``Index``es with ``NaN``s (:isssue:`6444`)
+- Regression in ``MultiIndex.from_product`` with a ``DatetimeIndex`` as input (:issue:`6439`)
 
 pandas 0.13.1
 -------------

pandas/tools/tests/test_util.py

@@ -6,6 +6,7 @@
 import numpy as np
 from numpy.testing import assert_equal
 
+from pandas import date_range, Index
 import pandas.util.testing as tm
 from pandas.tools.util import cartesian_product
 
@@ -23,6 +24,14 @@ def test_simple(self):
                     np.array([ 1, 22,  1, 22,  1, 22])]
         assert_equal(result, expected)
 
+    def test_datetimeindex(self):
+        # regression test for GitHub issue #6439
+        # make sure that the ordering on datetimeindex is consistent
+        x = date_range('2000-01-01', periods=2)
+        result = [Index(y).day for y in cartesian_product([x, x])]
+        expected = [np.array([1, 1, 2, 2]), np.array([1, 2, 1, 2])]
+        assert_equal(result, expected)
+
 
 class TestLocaleUtils(tm.TestCase):
 

pandas/tools/util.py

@@ -29,7 +29,7 @@ def cartesian_product(X):
 
     b = cumprodX[-1] / cumprodX
 
-    return [np.tile(np.repeat(x, b[i]),
+    return [np.tile(np.repeat(np.asarray(x), b[i]),
                     np.product(a[i]))
                for i, x in enumerate(X)]