858260
authorNeuroDebian Team <team@neuro.debian.net>
Sun, 2 Apr 2017 05:06:36 +0000 (05:06 +0000)
committerAndreas Tille <tille@debian.org>
Sun, 2 Apr 2017 05:06:36 +0000 (05:06 +0000)
Gbp-Pq: Name 858260.patch

pandas/tests/test_multilevel.py

index 4e7ace4173227c2378ea7a888e7f795c68047192..5beba6dd2da4d2dc0688be4b2521348d969bb16d 100755 (executable)
@@ -84,9 +84,9 @@ class TestMultiLevel(tm.TestCase):
         # GH 7112
         import pytz
         tz = pytz.timezone('Asia/Tokyo')
-        expected_tuples = [(1.1, datetime.datetime(2011, 1, 1, tzinfo=tz)),
-                           (1.2, datetime.datetime(2011, 1, 2, tzinfo=tz)),
-                           (1.3, datetime.datetime(2011, 1, 3, tzinfo=tz))]
+        expected_tuples = [(1.1, tz.localize(datetime.datetime(2011, 1, 1))),
+                           (1.2, tz.localize(datetime.datetime(2011, 1, 2))),
+                           (1.3, tz.localize(datetime.datetime(2011, 1, 3)))]
         expected = Index([1.1, 1.2, 1.3] + expected_tuples)
         self.assert_index_equal(result, expected)
 
@@ -104,9 +104,9 @@ class TestMultiLevel(tm.TestCase):
 
         result = midx_lv3.append(midx_lv2)
         expected = Index._simple_new(
-            np.array([(1.1, datetime.datetime(2011, 1, 1, tzinfo=tz), 'A'),
-                      (1.2, datetime.datetime(2011, 1, 2, tzinfo=tz), 'B'),
-                      (1.3, datetime.datetime(2011, 1, 3, tzinfo=tz), 'C')] +
+            np.array([(1.1, tz.localize(datetime.datetime(2011, 1, 1)), 'A'),
+                      (1.2, tz.localize(datetime.datetime(2011, 1, 2)), 'B'),
+                      (1.3, tz.localize(datetime.datetime(2011, 1, 3)), 'C')] +
                      expected_tuples), None)
         self.assert_index_equal(result, expected)