further updates

This commit is contained in:
Miroslav Stampar
2010-10-06 22:43:04 +00:00
parent de6fa1247b
commit 1bf8939e2f
4 changed files with 19 additions and 22 deletions

View File

@@ -44,6 +44,7 @@ from subprocess import Popen as execute
from tempfile import NamedTemporaryFile
from tempfile import mkstemp
from xml.etree import ElementTree as ET
from xml.dom import minidom
from xml.sax import parse
from extra.cloak.cloak import decloak
@@ -1218,6 +1219,7 @@ def getConsoleWidth(default=80):
return width if width else default
def parseXmlFile(xmlFile, handler):
checkFile(xmlFile)
xfile = codecs.open(xmlFile, 'rb', conf.dataEncoding)
content = xfile.read()
stream = StringIO(content)
@@ -1225,6 +1227,13 @@ def parseXmlFile(xmlFile, handler):
stream.close()
xfile.close()
def readXmlFile(xmlFile):
checkFile(xmlFile)
xfile = codecs.open(xmlFile, 'r', conf.dataEncoding)
retVal = minidom.parse(xfile).documentElement
xfile.close()
return retVal
def calculateDeltaSeconds(start, epsilon=0.05):
"""
Returns elapsed time from start till now (including expected