little stuff

pandas-dev · TomAugspurger · Aug 22, 2019 · Jul 29, 2019 · Jul 29, 2019 · Jul 30, 2019
commit e5456ac95919cc6b9a3851cfd53c86ae56ca72d1
diff --git a/doc/source/whatsnew/v0.25.1.rst b/doc/source/whatsnew/v0.25.1.rst
@@ -42,7 +42,7 @@ Datetimelike
 
 Timedelta
 ^^^^^^^^^
-    
+
 -
 -
 -

diff --git a/pandas/core/reshape/merge.py b/pandas/core/reshape/merge.py
@@ -1636,7 +1636,7 @@ def _get_merge_keys(self):
                 )
             )
 
-            if(
+            if (
                 is_datetime64_dtype(lt)
                 or is_datetime64tz_dtype(lt)
                 or is_timedelta64_dtype(lt)

diff --git a/pandas/tests/reshape/merge/test_merge_asof.py b/pandas/tests/reshape/merge/test_merge_asof.py
@@ -1,5 +1,5 @@
-import numpy as np
 import datetime
+import numpy as np
 import pytest
 import pytz
 
@@ -1283,7 +1283,7 @@ def test_timedelta_tolerance_nearest(self):
         )
 
         result = pd.merge_asof(
-            left, right, on="time", tolerance=pd.Timedelta("1ms"), direction="nearest"
+            left, right, on="time", tolerance=Timedelta("1ms"), direction="nearest"
         )
 
         assert_frame_equal(result, expected)
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ Datetimelike @@
     Timedelta
     ^^^^^^^^^
     -
     -
     -
@@ Expand Down @@