From 9b0ccea50a1d6960156438c7ea8812619b4ed8c5 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Tue, 22 May 2018 06:45:15 -0400 Subject: [PATCH] PY2 div / int compat --- pandas/tests/extension/integer/test_integer.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pandas/tests/extension/integer/test_integer.py b/pandas/tests/extension/integer/test_integer.py index 39526f6e18b5a5..31b1a98b14d2e0 100644 --- a/pandas/tests/extension/integer/test_integer.py +++ b/pandas/tests/extension/integer/test_integer.py @@ -4,6 +4,7 @@ import pytest from pandas.tests.extension import base +from pandas.api.types import is_integer from pandas.core.arrays import ( to_integer_array, @@ -144,7 +145,7 @@ def compare(self, s, op, other): expected = getattr(rs, op)(other) # truediv can make infs - if 'truediv' in op: + if op in ['__truediv__', '__rtruediv__', '__rdiv__', '__div__']: fill_value = np.nan else: fill_value = 0 @@ -359,6 +360,10 @@ def test_conversions(data_missing): for r, e in zip(result, expected): if pd.isnull(r): assert pd.isnull(e) + elif is_integer(r): + # PY2 can be int or long + assert r == e + assert is_integer(e) else: assert r == e assert type(r) == type(e)