Code restructure

Author: KalyanGokhale

pandas/core/algorithms.py

@@ -415,41 +415,50 @@ def isin(comps, values):
         return comps._values.isin(values)
 
     comps = com._values_from_object(comps)
-    comps, dtype_comps, _ = _ensure_data(comps)
+
+    comps, dtype, _ = _ensure_data(comps)
 
     is_time_like = lambda x: (is_datetime_or_timedelta_dtype(x)
                               or isinstance(x, Timestamp))
+    if is_time_like(dtype):
+        values, _, _ = _ensure_data(values, dtype=dtype)
+    else:
+        values, _, _ = _ensure_data(values)
 
-    is_int = lambda x: ((x == np.int64) or (x == int))
+    # faster for larger cases to use np.in1d
+    f = lambda x, y: htable.ismember_object(x.astype(object), y.astype(object))
+
+    # This block checks if comps and values
+    # are all int or all float
+    int_flg = False
+    float_flg = False
 
+    is_int = lambda x: ((x == np.int64) or (x == int))
     is_float = lambda x: ((x == np.float64) or (x == float))
 
-    f = lambda x, y: htable.ismember_object(x.astype(object), y.astype(object))
+    comps_types = set(type(v) for v in comps)
+    values_types = set(type(v) for v in values)
+
+    if len(comps_types) == len(values_types) == 1:
+        if (is_int(comps_types) and is_int(values_types)):
+            int_flg = True
+        elif (is_float(comps_types) and is_float(values_types)):
+            float_flg = True
 
     # GH16012
     # Ensure np.in1d doesn't get object types or it *may* throw an exception
-    # faster for larger cases to use np.in1d
     if len(comps) > 1000000 and not is_object_dtype(comps):
         f = lambda x, y: np.in1d(x, y)
-
-    if is_time_like(dtype_comps):
-        values, _, _ = _ensure_data(values, dtype=dtype_comps)
-    else:
-        values, dtype_values, _ = _ensure_data(values)
-        comps_types = set(type(v) for v in comps)
-        values_types = set(type(v) for v in values)
-        if len(comps_types) == len(values_types) == 1:
-            comps_types = comps_types.pop()
-            values_types = values_types.pop()
-            if (is_int(comps_types) and is_int(values_types)):
-                values = values.astype('int64', copy=False)
-                comps = comps.astype('int64', copy=False)
-                f = lambda x, y: htable.ismember_int64(x, y)
-            elif (is_float(comps_types) and is_float(values_types)):
-                values = values.astype('float64', copy=False)
-                comps = comps.astype('float64', copy=False)
-                checknull = isna(values).any()
-                f = lambda x, y: htable.ismember_float64(x, y, checknull)
+    elif int_flg:
+        values = values.astype('int64', copy=False)
+        comps = comps.astype('int64', copy=False)
+        f = lambda x, y: htable.ismember_int64(x, y)
+
+    elif float_flg:
+        values = values.astype('float64', copy=False)
+        comps = comps.astype('float64', copy=False)
+        checknull = isna(values).any()
+        f = lambda x, y: htable.ismember_float64(x, y, checknull)
 
     return f(comps, values)