Make python3 version of Nginx extend the default (#284)

* Rename nginx to nginx-python2, as python2 is EOL

Rename Nginx to Nginx-python2, as python2 is EOL. Shall make python3 version the default version now. Keeping python2 version for legacy.

* Rename nginx-python3.py to nginx

snmp/nginx

@@ -1,28 +1,28 @@
-#!/usr/bin/env python2
-import urllib2
+#!/usr/bin/env python3
+from urllib.request import urlopen
 import re
 
-data = urllib2.urlopen('http://localhost/nginx-status').read()
+data = urlopen('http://localhost/nginx-status').read()
 
 params = {}
 
-for line in data.split("\n"):
-  smallstat = re.match(r"\s?Reading:\s(.*)\sWriting:\s(.*)\sWaiting:\s(.*)$", line)
-  req = re.match(r"\s+(\d+)\s+(\d+)\s+(\d+)", line)
-  if smallstat:
-    params["Reading"] = smallstat.group(1)
-    params["Writing"] = smallstat.group(2)
-    params["Waiting"] = smallstat.group(3)
-  elif req:
-    params["Requests"] = req.group(3)
-  else:
-    pass
+for line in data.decode().split("\n"):
+    smallstat = re.match(r"\s?Reading:\s(.*)\sWriting:\s(.*)\sWaiting:\s(.*)$", line)
+    req = re.match(r"\s+(\d+)\s+(\d+)\s+(\d+)", line)
+    if smallstat:
+        params["Reading"] = smallstat.group(1)
+        params["Writing"] = smallstat.group(2)
+        params["Waiting"] = smallstat.group(3)
+    elif req:
+        params["Requests"] = req.group(3)
+    else:
+        pass
 
 dataorder = ["Active", "Reading", "Writing", "Waiting", "Requests"]
 
 for param in dataorder:
-  if param == "Active":
-    Active = int(params["Reading"]) + int(params["Writing"]) + int(params["Waiting"])
-    print Active
-  else:
-    print params[param]
+    if param == "Active":
+        Active = int(params["Reading"]) + int(params["Writing"]) + int(params["Waiting"])
+        print(Active)
+    else:
+        print(params[param])

snmp/nginx-python2

@@ -0,0 +1,28 @@
+#!/usr/bin/env python2
+import urllib2
+import re
+
+data = urllib2.urlopen('http://localhost/nginx-status').read()
+
+params = {}
+
+for line in data.split("\n"):
+  smallstat = re.match(r"\s?Reading:\s(.*)\sWriting:\s(.*)\sWaiting:\s(.*)$", line)
+  req = re.match(r"\s+(\d+)\s+(\d+)\s+(\d+)", line)
+  if smallstat:
+    params["Reading"] = smallstat.group(1)
+    params["Writing"] = smallstat.group(2)
+    params["Waiting"] = smallstat.group(3)
+  elif req:
+    params["Requests"] = req.group(3)
+  else:
+    pass
+
+dataorder = ["Active", "Reading", "Writing", "Waiting", "Requests"]
+
+for param in dataorder:
+  if param == "Active":
+    Active = int(params["Reading"]) + int(params["Writing"]) + int(params["Waiting"])
+    print Active
+  else:
+    print params[param]

snmp/nginx-python3.py

@@ -1,28 +0,0 @@
-#!/usr/bin/env python3
-from urllib.request import urlopen
-import re
-
-data = urlopen('http://localhost/nginx-status').read()
-
-params = {}
-
-for line in data.decode().split("\n"):
-    smallstat = re.match(r"\s?Reading:\s(.*)\sWriting:\s(.*)\sWaiting:\s(.*)$", line)
-    req = re.match(r"\s+(\d+)\s+(\d+)\s+(\d+)", line)
-    if smallstat:
-        params["Reading"] = smallstat.group(1)
-        params["Writing"] = smallstat.group(2)
-        params["Waiting"] = smallstat.group(3)
-    elif req:
-        params["Requests"] = req.group(3)
-    else:
-        pass
-
-dataorder = ["Active", "Reading", "Writing", "Waiting", "Requests"]
-
-for param in dataorder:
-    if param == "Active":
-        Active = int(params["Reading"]) + int(params["Writing"]) + int(params["Waiting"])
-        print(Active)
-    else:
-        print(params[param])