From 9f2265bce8fe16a79ad78098a7681d69f6730277 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 17 Sep 2012 18:28:38 +0200
Subject: [PATCH] constants: Stop using wildcard import for pathutils

It still needs to be imported for hypervisor parameter defaults, but
after this change paths are no longer exported from constants.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
 lib/constants.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/constants.py b/lib/constants.py
index 3d55468c9..45b3f41a5 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -26,7 +26,7 @@ import socket
 
 from ganeti import _autoconf
 from ganeti import _vcsversion
-from ganeti.pathutils import * # pylint: disable=W0401,W0614
+from ganeti import pathutils
 
 
 # various versions
@@ -1702,7 +1702,7 @@ HVC_DEFAULTS = {
     HV_NIC_TYPE: HT_NIC_RTL8139,
     HV_DISK_TYPE: HT_DISK_PARAVIRTUAL,
     HV_VNC_BIND_ADDRESS: IP4_ADDRESS_ANY,
-    HV_VNC_PASSWORD_FILE: VNC_PASSWORD_FILE,
+    HV_VNC_PASSWORD_FILE: pathutils.VNC_PASSWORD_FILE,
     HV_ACPI: True,
     HV_PAE: True,
     HV_KERNEL_PATH: "/usr/lib/xen/boot/hvmloader",
@@ -2028,7 +2028,4 @@ FAKE_OP_MASTER_TURNUP = "OP_CLUSTER_IP_TURNUP"
 FAKE_OP_MASTER_TURNDOWN = "OP_CLUSTER_IP_TURNDOWN"
 
 # Do not re-export imported modules
-del re, _vcsversion, _autoconf, socket
-
-# Unintended imports from pathutils (temporary)
-del GetLogFilename
+del re, _vcsversion, _autoconf, socket, pathutils
-- 
GitLab