Merge pull request #5361 from edwintorok/private/edvint/ma

Revert "update mail-alarm and usb_scan to python3"

scripts/mail-alarm

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 #
 # mail-alarm: uses ssmtp to send a mail message, to pool:other_config:mail-destination
 #
@@ -11,18 +11,18 @@
 # the only thing that needs be set is pool:other-config:ssmtp-mailhub
 
 from __future__ import print_function
-
-import json
-import os
-import re
+import XenAPI
 import sys
-import syslog
+import os
 import tempfile
 import traceback
-from socket import getfqdn
+import syslog
+import json
+import re
 from xml.dom import minidom
-
-import XenAPI
+from xml.sax.saxutils import unescape
+from xml.parsers.expat import ExpatError
+from socket import getfqdn
 from xcp import branding
 
 # Go read man ssmtp.conf

scripts/usb_scan.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 #
 # Copyright (C) Citrix Systems Inc.
 #
@@ -21,17 +21,16 @@
 # 2. check if device can be passed through based on policy file
 # 3. return the device info to XAPI in json format
 
-
+from __future__ import print_function
 import abc
 import argparse
 import json
+import xcp.logger as log
 import logging
+import pyudev
 import re
 import sys
 
-import pyudev
-import xcp.logger as log
-
 
 def log_list(l):
     for s in l: