ia64/xen-unstable

changeset 7086:8fe341229827

Remove unused imports, variables.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
author emellor@ewan
date Tue Sep 27 22:09:12 2005 +0100 (2005-09-27)
parents 8d5760e8e3f1
children 46046d5fb354
files tools/python/xen/xend/server/SrvDaemon.py
line diff
     1.1 --- a/tools/python/xen/xend/server/SrvDaemon.py	Tue Sep 27 22:08:07 2005 +0100
     1.2 +++ b/tools/python/xen/xend/server/SrvDaemon.py	Tue Sep 27 22:09:12 2005 +0100
     1.3 @@ -9,26 +9,24 @@ import signal
     1.4  import sys
     1.5  import threading
     1.6  import linecache
     1.7 -import socket
     1.8  import pwd
     1.9  import re
    1.10 -import StringIO
    1.11  import traceback
    1.12 -import time
    1.13 -import glob
    1.14  
    1.15 -from xen.xend import sxp
    1.16 -from xen.xend import PrettyPrint
    1.17 -from xen.xend import EventServer; eserver = EventServer.instance()
    1.18 -from xen.xend.XendError import XendError
    1.19 +from xen.xend import EventServer
    1.20  from xen.xend.server import SrvServer
    1.21  from xen.xend.XendLogging import log
    1.22 -from xen.xend import XendRoot; xroot = XendRoot.instance()
    1.23 +from xen.xend import XendRoot
    1.24  
    1.25  import event
    1.26  import relocate
    1.27  from params import *
    1.28  
    1.29 +
    1.30 +eserver = EventServer.instance()
    1.31 +xroot = XendRoot.instance()
    1.32 +
    1.33 +
    1.34  class Daemon:
    1.35      """The xend daemon.
    1.36      """
    1.37 @@ -233,7 +231,7 @@ class Daemon:
    1.38              except:
    1.39                  pass
    1.40  
    1.41 -    def print_trace(self, str):
    1.42 +    def print_trace(self, string):
    1.43          for i in range(self.traceindent):
    1.44              ch = " "
    1.45              if (i % 5):
    1.46 @@ -241,7 +239,7 @@ class Daemon:
    1.47              else:
    1.48                  ch = '|'
    1.49              self.tracefile.write(ch)
    1.50 -        self.tracefile.write(str)
    1.51 +        self.tracefile.write(string)
    1.52              
    1.53      def trace(self, frame, event, arg):
    1.54          if not self.traceon:
    1.55 @@ -289,7 +287,7 @@ class Daemon:
    1.56          try:
    1.57              os.setuid(pwd.getpwnam(XEND_USER)[2])
    1.58              return 0
    1.59 -        except KeyError, error:
    1.60 +        except KeyError:
    1.61              print >>sys.stderr, "Error: no such user '%s'" % XEND_USER
    1.62              return 1
    1.63