cylp/cy/CyClpSimplex.pyx, cylp/py/mip/GomoryCutGenerator.py: Remove use of Python 2 'long'

Author: mkoeppe

cylp/cy/CyClpSimplex.pyx

@@ -1022,7 +1022,7 @@ cdef class CyClpSimplex:
 
         '''
         status = CLP_variableStatusEnum[StatusToInt[status]]
-        if isinstance(arg, (int, long)):
+        if isinstance(arg, int):
             self.CppSelf.setStatus(arg, status)
         elif True:  # isinstance(arg, CyLPVar):
             if self.cyLPModel is None:
@@ -1047,7 +1047,7 @@ cdef class CyClpSimplex:
         '''
         Get the status of a variable.
         '''
-        if isinstance(arg, (int, long)):
+        if isinstance(arg, int):
             return IntToStatus[self.CppSelf.getStatus(arg)]
         elif True:  # isinstance(arg, CyLPVar):
             if self.cyLPModel is None:
@@ -1096,7 +1096,7 @@ cdef class CyClpSimplex:
         'atLowerBound'
         '''
         status = CLP_variableStatusEnum[StatusToInt[status]]
-        if isinstance(arg, (int, long)):
+        if isinstance(arg, int):
             arg += self.nVariables
             self.CppSelf.setStatus(arg, status)
         elif True:  # isinstance(arg, CyLPVar):
@@ -1118,7 +1118,7 @@ cdef class CyClpSimplex:
         '''
         Get the status of a constraint.
         '''
-        if isinstance(arg, (int, long)):
+        if isinstance(arg, int):
             arg += self.nVariables
             return IntToStatus[self.CppSelf.getStatus(arg)]
         elif True:  # isinstance(arg, CyLPVar):
@@ -1718,7 +1718,7 @@ cdef class CyClpSimplex:
 
         '''
 
-        if isinstance(arg, (int, long)):
+        if isinstance(arg, int):
             self.CppSelf.setInteger(arg)
         elif True:  # isinstance(arg, CyLPVar):
             if self.cyLPModel is None:
@@ -2088,7 +2088,7 @@ cdef class CyClpSimplex:
         arguments may be integers signifying indices, or CyLPVars.
         '''
 
-        if isinstance(var1, (int, long)) and isinstance(var2, (int, long)) :
+        if isinstance(var1, int) and isinstance(var2, int) :
            self.CppSelf.setComplement(var1, var2)
         elif True:  # isinstance(arg, CyLPVar):
             if self.cyLPModel is None:

cylp/py/mip/GomoryCutGenerator.py

@@ -12,7 +12,7 @@ def isInt(x):
     Return True if x is an integer, or if x is a numpy array
     with all integer elements, False otherwise
     '''
-    if isinstance(x, (int, long, float)):
+    if isinstance(x, (int, float)):
         return abs(math.floor(x) - x) < epsilon
     return (np.abs(np.floor(x) - x) < epsilon).all()