Wombat fix

ovs.py

@@ -3,6 +3,13 @@ from subprocess import CalledProcessError
 import logging
 import logging
 
 
 from utils import NETNS, sudo, ns_exec, HA
 from utils import NETNS, sudo, ns_exec, HA
+from functools import reduce
+
+try:
+    # Python 2: "unicode" is built-in
+    unicode
+except NameError:
+    unicode = str
 
 
 logger = logging.getLogger(__name__)
 logger = logging.getLogger(__name__)
 
 

requirements/base.txt

@@ -2,6 +2,7 @@ amqp==1.4.9
 anyjson==0.3.3
 anyjson==0.3.3
 billiard==3.3.0.23
 billiard==3.3.0.23
 celery==3.1.18
 celery==3.1.18
+Django==3.2.3
 kombu==3.0.30
 kombu==3.0.30
 netaddr==0.8.0
 netaddr==0.8.0
 python-dateutil==2.8.2
 python-dateutil==2.8.2

utils.py

@@ -49,15 +49,15 @@ def sudo(args, stdin=None):
     args = ('/usr/bin/sudo', ) + args
     args = ('/usr/bin/sudo', ) + args
     logger.debug('EXEC {}'.format(' '.join(args)))
     logger.debug('EXEC {}'.format(' '.join(args)))
 
 
-    p = sp.Popen(args, stdin=sp.PIPE, stderr=sp.PIPE, stdout=sp.PIPE)
+    p = sp.Popen(args, stdin=sp.PIPE, stderr=sp.PIPE, stdout=sp.PIPE, encoding='utf-8')
     if isinstance(stdin, basestring):
     if isinstance(stdin, basestring):
-        stdout, stderr = p.communicate(bytes(stdin, 'utf-8'))
+        stdout, stderr = p.communicate(stdin)
     else:
     else:
         stdout, stderr = p.communicate()
         stdout, stderr = p.communicate()
     if p.returncode != 0:
     if p.returncode != 0:
         raise sp.CalledProcessError(
         raise sp.CalledProcessError(
             p.returncode, sp.list2cmdline(args), stderr)
             p.returncode, sp.list2cmdline(args), stderr)
-    return str(stdout)
+    return stdout
 
 
 
 
 def ns_exec(args, stdin=None):
 def ns_exec(args, stdin=None):