kvm: new software release targeting Python 3

software/kvm/software-py3.cfg

+[buildout]
+extends =
+  ../../component/python3/buildout.cfg
+  software.cfg
+
+python = python3
+
+# Ignore these for now
+common-parts -=
+  rdiff-backup

software/kvm/test/setup.py

@@ -47,6 +47,7 @@ setup(name=name,
           'erp5.util',
           'supervisor',
           'psutil',
+          'six',
       ],
       zip_safe=True,
       test_suite='test',

software/kvm/test/test.py

@@ -29,6 +29,7 @@ import httplib
 import json
 import os
 import requests
+import six
 import slapos.util
 import sqlite3
 import urlparse
@@ -43,7 +44,8 @@ skipUnlessKvm = unittest.skipUnless(has_kvm, 'kvm not loaded or not allowed')
 if has_kvm:
   setUpModule, InstanceTestCase = makeModuleSetUpAndTestCaseClass(
     os.path.abspath(
-        os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
+      os.path.join(os.path.dirname(__file__), '..',
+                   'software%s.cfg' % ("-py3" if six.PY3 else ""))))
 else:
   setUpModule, InstanceTestCase = None, unittest.TestCase