Remove redundant #if directives

vmuriart · vmuriart · commit 935c6538003e · 2017-01-12T02:31:00.000-07:00
Not relevant after dropping Python 24, Python 25
diff --git a/src/runtime/exceptions.cs b/src/runtime/exceptions.cs
@@ -371,14 +371,10 @@ internal static IntPtr RaiseTypeError(string message)
            puplic static variables on the Exceptions class filled in from
            the python class using reflection in Initialize() looked up by
 		   name, not posistion. */
-#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35 || PYTHON36)
         public static IntPtr BaseException;
-#endif
         public static IntPtr Exception;
         public static IntPtr StopIteration;
-#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35 || PYTHON36)
         public static IntPtr GeneratorExit;
-#endif
 #if !(PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35 || PYTHON36)
         public static IntPtr StandardError;
 #endif
@@ -436,10 +432,8 @@ puplic static variables on the Exceptions class filled in from
         public static IntPtr SyntaxWarning;
         public static IntPtr RuntimeWarning;
         public static IntPtr FutureWarning;
-#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35 || PYTHON36)
         public static IntPtr ImportWarning;
         public static IntPtr UnicodeWarning;
         //PyAPI_DATA(PyObject *) PyExc_BytesWarning;
-#endif
     }
 }
diff --git a/src/runtime/interop.cs b/src/runtime/interop.cs
@@ -292,10 +292,7 @@ internal class TypeFlags
         /* XXX Reusing reserved constants */
         public static int Managed = (1 << 15); // PythonNet specific
         public static int Subclass = (1 << 16); // PythonNet specific
-#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35 || PYTHON36)
         public static int HaveIndex = (1 << 17);
-#endif
-#if (PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35 || PYTHON36)
         /* Objects support nb_index in PyNumberMethods */
         public static int HaveVersionTag = (1 << 18);
         public static int ValidVersionTag = (1 << 19);
@@ -311,7 +308,6 @@ internal class TypeFlags
         public static int DictSubclass = (1 << 29);
         public static int BaseExceptionSubclass = (1 << 30);
         public static int TypeSubclass = (1 << 31);
-#endif
 
 // Default flags for Python 2
 #if (PYTHON23 || PYTHON24 || PYTHON25 || PYTHON26 || PYTHON27)
@@ -433,9 +429,7 @@ static Interop()
             pmap["nb_true_divide"] = p["BinaryFunc"];
             pmap["nb_inplace_floor_divide"] = p["BinaryFunc"];
             pmap["nb_inplace_true_divide"] = p["BinaryFunc"];
-#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35 || PYTHON36)
             pmap["nb_index"] = p["UnaryFunc"];
-#endif
 
             pmap["sq_length"] = p["InquiryFunc"];
             pmap["sq_concat"] = p["BinaryFunc"];
@@ -536,4 +530,4 @@ public Thunk(Delegate d)
             fn = d;
         }
     }
-}
+}
