Import md5 from hashlib/md5, dep. on Py version

[nagixsc.git] / nagixsc_http2nagios.py

diff --git a/nagixsc_http2nagios.py b/nagixsc_http2nagios.py
index 034213885c9e48bcbab4436aa7552b65bf0e7e8c..e0a639b3218cd6595624b13cbe46fb358ddf4052 100755 (executable)
--- a/nagixsc_http2nagios.py
+++ b/nagixsc_http2nagios.py
@@ -3,11 +3,15 @@
 import BaseHTTPServer
 import base64
 import cgi
-import md5
 import os
 import re
 import subprocess
 
+try:
+       from hashlib import md5
+except ImportError:
+       from md5 import md5
+
 config = {     'ip':                   '',
                        'port':                 15667,
                }
@@ -20,7 +24,7 @@ X2N='./nagixsc_xml2nagios.py -O passive -vvv -f -'
 
 class HTTP2NagiosHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
-       def http_error(code, output):
+       def http_error(self, code, output):
                self.send_response(code)
                self.send_header('Content-Type', 'text/plain')
                self.end_headers()
@@ -48,7 +52,7 @@ class HTTP2NagiosHandler(BaseHTTPServer.BaseHTTPRequestHandler):
                # Check Basic Auth
                try:
                        authdata = base64.b64decode(self.headers['Authorization'].split(' ')[1]).split(':')
-                       if not users[authdata[0]] == md5.md5(authdata[1]).hexdigest():
+                       if not users[authdata[0]] == md5(authdata[1]).hexdigest():
                                raise Exception
                except:
                        self.send_response(401)