Make the setup.py file work in python3 and refactor find_modesec

- Add parentheses where needed for python3
- Refactor the find_modsec function to reduce its runtime complexity
- Make the code more pythonic
- The script now tell is the headers _or_ the lib was found

Author: Julien Voisin

setup.py

@@ -29,7 +29,8 @@
 
 libraries_dir = [
     "lib/",
-    "lib64/"
+    "lib64/",
+    "./"
     ]
 
 headers_dir = [
@@ -38,37 +39,42 @@
     "./"
     ]
 
-def find_modsec():
-    for i in possible_modsecurity_dirs:
-        lib = None
-        inc = None
-
-        for j in libraries_dir:
-            p = os.path.join(i, j, "libmodsecurity.so")
-            if os.path.isfile(p) or os.path.islink(p):
-                lib = os.path.join(i, j)
 
-        for x in headers_dir:
-            p = os.path.join(i, x, os.path.join("modsecurity", "modsecurity.h"))
-            if os.path.isfile(p) or os.path.islink(p):
-                inc = os.path.join(i, x)
-
-        if inc != None and lib != None:
-            return (inc, lib)
-
-    return (None, None)
+def find_modsec():
+    def find_library(modsec_dir):
+        for i in libraries_dir:
+            path = os.path.join(modsec_dir, i, "libmodsecurity.so")
+            if os.path.isfile(path):
+                return os.path.join(modsec_dir, i)
+        return None
+
+    def find_header(modsec_dir):
+        for i in headers_dir:
+            path = os.path.join(modsec_dir, i, "modsecurity", "modsecurity.h")
+            if os.path.isfile(path):
+                return os.path.join(modsec_dir, i)
+        return None
+
+    inc = lib = None
+    for modsec_dir in possible_modsecurity_dirs:
+        if not inc:
+            inc = find_header(modsec_dir)
+        if not lib:
+            lib = find_library(modsec_dir)
+
+    return (inc, lib)
 
 inc_dir, lib_dir = find_modsec()
 
 
-print "*** found modsecurity at:"
-print "    headers: " + str(inc_dir)
-print "    library: " + str(lib_dir)
+print("*** found modsecurity at:")
+print("    headers: " + str(inc_dir))
+print("    library: " + str(lib_dir))
 
 
 if inc_dir == None or lib_dir == None:
-    print "libModSecurity was not found in your system."
-    print "Make sure you have libModSecurity correctly installed in your system."
+    print("libModSecurity was not found in your system.")
+    print("Make sure you have libModSecurity correctly installed in your system.")
     sys.exit(1)