1.1 --- a/tools/python/xen/util/blkif.py	Wed May 21 10:38:57 2008 +0100
     1.2 +++ b/tools/python/xen/util/blkif.py	Wed May 21 10:57:08 2008 +0100
     1.3 @@ -2,8 +2,6 @@ import os
     1.4  import re
     1.5  import string
     1.6  
     1.7 -from xen.xend.XendLogging import log
     1.8 -
     1.9  def expand_dev_name(name):
    1.10      if not name:
    1.11          return name

     2.1 --- a/tools/python/xen/xend/xenstore/xswatch.py	Wed May 21 10:38:57 2008 +0100
     2.2 +++ b/tools/python/xen/xend/xenstore/xswatch.py	Wed May 21 10:57:08 2008 +0100
     2.3 @@ -9,8 +9,6 @@ import errno
     2.4  import threading
     2.5  from xen.xend.xenstore.xsutil import xshandle
     2.6  
     2.7 -from xen.xend.XendLogging import log
     2.8 -
     2.9  
    2.10  class xswatch:
    2.11  
    2.12 @@ -76,7 +74,7 @@ def watchMain():
    2.13                      else:
    2.14                          raise
    2.15          except:
    2.16 -            log.exception("read_watch failed")
    2.17 +            pass
    2.18              # Ignore this exception -- there's no point throwing it
    2.19              # further on because that will just kill the watcher thread,
    2.20              # which achieves nothing.