virtinst: Combine util.py and _util.py

Was originally split to not pollute the public API, but we aren't public
anymore

tests/__init__.py

@@ -22,8 +22,8 @@ from tests import utils
 
 
 # Force certain helpers to return consistent values
-virtinst._util.is_blktap_capable = lambda: False
-virtinst._util.default_bridge2 = lambda ignore1: ["bridge", "eth0"]
+virtinst.util.is_blktap_capable = lambda: False
+virtinst.util.default_bridge2 = lambda ignore1: ["bridge", "eth0"]
 virtinst.Guest._open_uri = lambda ignore1, ignore2: None
 
 # Setup logging

tests/clitest.py

@@ -1381,7 +1381,7 @@ def build_cmd_list():
 
 newidx = 0
 curtest = 0
-old_bridge = virtinst._util.default_bridge2
+old_bridge = virtinst.util.default_bridge2
 
 def setup():
     """
@@ -1396,7 +1396,7 @@ def setup():
     os.system("chmod 444 %s" % ro_img)
     os.system("chmod 555 %s" % ro_dir)
 
-    virtinst._util.default_bridge2 = lambda ignore: None
+    virtinst.util.default_bridge2 = lambda ignore: None
 
 
 def cleanup():
@@ -1407,7 +1407,7 @@ def cleanup():
         os.system("chmod 777 %s > /dev/null 2>&1" % i)
         os.system("rm -rf %s > /dev/null 2>&1" % i)
 
-    virtinst._util.default_bridge2 = old_bridge
+    virtinst.util.default_bridge2 = old_bridge
 
 class CLITests(unittest.TestCase):
     def __init__(self, *args, **kwargs):

tests/xmlconfig.py

@@ -151,14 +151,14 @@ class TestXMLConfig(unittest.TestCase):
         self.assertEquals(g.post_install_check(), True)
 
     def testBootParavirtDiskFileBlktapCapable(self):
-        oldblktap = virtinst._util.is_blktap_capable
+        oldblktap = virtinst.util.is_blktap_capable
         try:
-            virtinst._util.is_blktap_capable = lambda: True
+            virtinst.util.is_blktap_capable = lambda: True
             g = utils.get_basic_paravirt_guest()
             g.disks.append(utils.get_filedisk())
             self._compare(g, "boot-paravirt-disk-drv-tap", False)
         finally:
-            virtinst._util.is_blktap_capable = oldblktap
+            virtinst.util.is_blktap_capable = oldblktap
 
     def testBootParavirtDiskBlock(self):
         g = utils.get_basic_paravirt_guest()
@@ -927,7 +927,7 @@ class TestXMLConfig(unittest.TestCase):
         try:
             i = utils.make_pxe_installer()
             g = utils.get_basic_fullyvirt_guest(installer=i)
-            util = getattr(virtinst, "_util")
+            util = getattr(virtinst, "util")
             origfunc = util.default_bridge2
 
             def newbridge(ignore_conn):