X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Frspec.py;h=ffc816c3fdb8d0b5c42c5ec53ff283652b6b85a8;hb=bfcea75fd4f7d91b186f4f0e479db0e6f0a231ae;hp=aab5592e7d8405f357721c4e9b7d24e007c32f17;hpb=0cf0d31c313a366e3f272f830bdb4f2a7308e11f;p=sfa.git diff --git a/sfa/util/rspec.py b/sfa/util/rspec.py index aab5592e..ffc816c3 100644 --- a/sfa/util/rspec.py +++ b/sfa/util/rspec.py @@ -1,14 +1,11 @@ -### $Id$ -### $URL$ - import sys import pprint import os +from StringIO import StringIO +from types import StringTypes, ListType import httplib from xml.dom import minidom -from types import StringTypes, ListType from lxml import etree -from StringIO import StringIO from sfa.util.sfalogging import sfa_logger @@ -235,11 +232,11 @@ class RSpec: except Exception, e: # logging.debug("%s: web file not found" % xsdURI) # logging.debug("Using local file %s" % self.xsd") - sfa_logger.log_exc("rspec.parseXSD: can't find %s on the web. Continuing." % xsdURI) + sfa_logger().log_exc("rspec.parseXSD: can't find %s on the web. Continuing." % xsdURI) if not schemaDom: if os.path.exists(xsdURI): # logging.debug("using local copy.") - sfa_logger.debug("rspec.parseXSD: Using local %s" % xsdURI) + sfa_logger().debug("rspec.parseXSD: Using local %s" % xsdURI) schemaDom = minidom.parse(xsdURI) else: raise Exception("rspec.parseXSD: can't find xsd locally")