From 9cc70bbe0ed008653b050fe2e2fec0a90aa8ad1f Mon Sep 17 00:00:00 2001 From: Aidan Skinner Date: Wed, 14 May 2008 14:47:31 +0000 Subject: Merge branch 'python-mllib' git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@656301 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/python/mllib/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'qpid/python/mllib') diff --git a/qpid/python/mllib/__init__.py b/qpid/python/mllib/__init__.py index 81165f6999..39e9363614 100644 --- a/qpid/python/mllib/__init__.py +++ b/qpid/python/mllib/__init__.py @@ -22,7 +22,7 @@ This module provides document parsing and transformation utilities for both SGML and XML. """ -import os, dom, transforms, parsers +import os, dom, transforms, parsers, sys import xml.sax, types from cStringIO import StringIO @@ -50,8 +50,11 @@ def sgml_parse(source): return p.parser.tree def xml_parse(filename): - # XXX: this is for older versions of python - source = "file://%s" % os.path.abspath(filename) + if sys.version_info[0:2] == (2,3): + # XXX: this is for older versions of python + source = "file://%s" % os.path.abspath(filename) + else: + source = filename p = parsers.XMLParser() xml.sax.parse(source, p) return p.parser.tree -- cgit v1.2.1