# HG changeset patch
# User acnt2@xxxxxxxxxxxxxxxxxxxxxxxx
# Node ID 6ffb8705f894a4c62db850c4c0186ea72bd20e94
# Parent 0d120850741a69db20f6774b6cc965436ff29cc7
[XEND] Make import sxp into absolute import.
* Replacing import sxp with from xen.xend import sxp to avoid
confusion.
Signed-off-by: Alastair Tse <atse@xxxxxxxxxxxxx>
---
tools/python/xen/xend/Args.py | 2 +-
tools/python/xen/xend/PrettyPrint.py | 2 +-
tools/python/xen/xend/XendBootloader.py | 2 +-
tools/python/xen/xend/XendCheckpoint.py | 13 +++++--------
tools/python/xen/xend/XendProtocol.py | 2 +-
tools/python/xen/xend/XendRoot.py | 7 ++-----
6 files changed, 11 insertions(+), 17 deletions(-)
diff -r 0d120850741a -r 6ffb8705f894 tools/python/xen/xend/Args.py
--- a/tools/python/xen/xend/Args.py Thu Oct 05 17:29:19 2006 +0100
+++ b/tools/python/xen/xend/Args.py Thu Oct 05 17:29:19 2006 +0100
@@ -18,7 +18,7 @@ import types
import types
import StringIO
-import sxp
+from xen.xend import sxp
class ArgError(StandardError):
pass
diff -r 0d120850741a -r 6ffb8705f894 tools/python/xen/xend/PrettyPrint.py
--- a/tools/python/xen/xend/PrettyPrint.py Thu Oct 05 17:29:19 2006 +0100
+++ b/tools/python/xen/xend/PrettyPrint.py Thu Oct 05 17:29:19 2006 +0100
@@ -22,7 +22,7 @@ import sys
import sys
import types
import StringIO
-import sxp
+from xen.xend import sxp
class PrettyItem:
diff -r 0d120850741a -r 6ffb8705f894 tools/python/xen/xend/XendBootloader.py
--- a/tools/python/xen/xend/XendBootloader.py Thu Oct 05 17:29:19 2006 +0100
+++ b/tools/python/xen/xend/XendBootloader.py Thu Oct 05 17:29:19 2006 +0100
@@ -14,8 +14,8 @@
import os, select, errno
import random
-import sxp
import shlex
+from xen.xend import sxp
from XendLogging import log
from XendError import VmError
diff -r 0d120850741a -r 6ffb8705f894 tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py Thu Oct 05 17:29:19 2006 +0100
+++ b/tools/python/xen/xend/XendCheckpoint.py Thu Oct 05 17:29:19 2006 +0100
@@ -8,21 +8,18 @@ import os
import os
import re
import string
-import sxp
import threading
from struct import pack, unpack, calcsize
from xen.util.xpopen import xPopen3
-
import xen.util.auxbin
-
import xen.lowlevel.xc
-import balloon
-from XendError import XendError
-from XendLogging import log
-from XendDomainInfo import DEV_MIGRATE_STEP1, DEV_MIGRATE_STEP2
-from XendDomainInfo import DEV_MIGRATE_STEP3
+from xen.xend import balloon, sxp
+from xen.xend.XendError import XendError
+from xen.xend.XendLogging import log
+from xen.xend.XendDomainInfo import DEV_MIGRATE_STEP1, DEV_MIGRATE_STEP2
+from xen.xend.XendDomainInfo import DEV_MIGRATE_STEP3
SIGNATURE = "LinuxGuestRecord"
XC_SAVE = "xc_save"
diff -r 0d120850741a -r 6ffb8705f894 tools/python/xen/xend/XendProtocol.py
--- a/tools/python/xen/xend/XendProtocol.py Thu Oct 05 17:29:19 2006 +0100
+++ b/tools/python/xen/xend/XendProtocol.py Thu Oct 05 17:29:19 2006 +0100
@@ -22,7 +22,7 @@ import types
import types
from encode import *
-import sxp
+from xen.xend import sxp
from xen.xend import XendRoot
diff -r 0d120850741a -r 6ffb8705f894 tools/python/xen/xend/XendRoot.py
--- a/tools/python/xen/xend/XendRoot.py Thu Oct 05 17:29:19 2006 +0100
+++ b/tools/python/xen/xend/XendRoot.py Thu Oct 05 17:29:19 2006 +0100
@@ -30,11 +30,8 @@ import string
import string
import sys
-import XendLogging
-from XendError import XendError
-
-import sxp
-
+from xen.xend import sxp, XendLogging
+from xen.xend.XendError import XendError
class XendRoot:
"""Root of the management classes."""
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home