git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleaned up imports
[sfa.git]
/
sfa
/
util
/
rspec.py
diff --git
a/sfa/util/rspec.py
b/sfa/util/rspec.py
index
f891034
..
ffc816c
100644
(file)
--- a/
sfa/util/rspec.py
+++ b/
sfa/util/rspec.py
@@
-1,12
+1,13
@@
-### $Id$
-### $URL$
-
import sys
import pprint
import os
import sys
import pprint
import os
+from StringIO import StringIO
+from types import StringTypes, ListType
import httplib
from xml.dom import minidom
import httplib
from xml.dom import minidom
-from types import StringTypes, ListType
+from lxml import etree
+
+from sfa.util.sfalogging import sfa_logger
class RSpec:
class RSpec:
@@
-231,15
+232,14
@@
class RSpec:
except Exception, e:
# logging.debug("%s: web file not found" % xsdURI)
# logging.debug("Using local file %s" % self.xsd")
except Exception, e:
# logging.debug("%s: web file not found" % xsdURI)
# logging.debug("Using local file %s" % self.xsd")
- print e
- print "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.")
if not schemaDom:
if os.path.exists(xsdURI):
# logging.debug("using local copy.")
- print "Using local %s" % xsdURI
+ sfa_logger().debug("rspec.parseXSD: Using local %s" % xsdURI)
schemaDom = minidom.parse(xsdURI)
else:
schemaDom = minidom.parse(xsdURI)
else:
- raise Exception("
C
an't find xsd locally")
+ raise Exception("
rspec.parseXSD: c
an't find xsd locally")
self.schemaDict = self.toDict(schemaDom.childNodes[0])
self.schemaDict = self.toDict(schemaDom.childNodes[0])