From fc23de6a414fdb6f142cb70e248a9163615d19f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eray=20=C3=96zkural?= Date: Wed, 14 Dec 2005 22:48:36 +0000 Subject: [PATCH] 4suite is the most counterintuitive API on earth --- pisi/pxml/xmlextcdom.py | 7 +++---- pisi/pxml/xmlfilecdom.py | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pisi/pxml/xmlextcdom.py b/pisi/pxml/xmlextcdom.py index ae713679..f889e52c 100644 --- a/pisi/pxml/xmlextcdom.py +++ b/pisi/pxml/xmlextcdom.py @@ -33,9 +33,8 @@ _ = __trans.ugettext import Ft from Ft.Xml.Domlette import implementation -from Ft.Xml import ParsePath -from Ft.Xml.Domlette import NonvalidatingReader - +from Ft.Xml.Domlette import NoExtDtdReader +import Ft.Lib import pisi class XmlError(pisi.Error): @@ -52,7 +51,7 @@ def newDocument(tag): def parse(filename): # parse file and return document root try: - doc = ParsePath(filename) + doc = NoExtDtdReader.parseUri(Ft.Lib.Uri.OsPathToUri(filename)) return doc.documentElement except Ft.FtException, e: raise Error(_("File '%s' has invalid XML: %s") % (filename, str(e))) diff --git a/pisi/pxml/xmlfilecdom.py b/pisi/pxml/xmlfilecdom.py index 3f71e205..567d2fd0 100644 --- a/pisi/pxml/xmlfilecdom.py +++ b/pisi/pxml/xmlfilecdom.py @@ -34,8 +34,7 @@ import exceptions import Ft from Ft.Xml.Domlette import implementation -from Ft.Xml.Domlette import NonvalidatingReader -from Ft.Xml import Parse, ParsePath +from Ft.Xml.Domlette import NoExtDtdReader from Ft.Xml.Domlette import Print, PrettyPrint from xml.dom import XHTML_NAMESPACE, XML_NAMESPACE @@ -72,7 +71,7 @@ class XmlFile(object): uri = File.make_uri(uri) localpath = File.download(uri, tmpDir) try: - self.doc = ParsePath(localpath) + self.doc = NoExtDtdReader.parseUri(Ft.Lib.Uri.OsPathToUri(localpath)) return self.doc.documentElement except Ft.FtException, e: raise Error(_("File '%s' has invalid XML: %s") % (localpath, str(e)) )