Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] From-Import-Removal

Browse Source
This commit is contained in:
Faik Uygur
2007-04-26 13:33:23 +00:00
parent e24c765288
commit 9bd3820106
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/pxml/xmlfile.py
+4 -5
View File
@@ -31,8 +31,7 @@ import exceptions
import piksemel as iks import piksemel as iks
import pisi import pisi
from pisi.file import File import pisi.file
from pisi.util import join_path as join
class Error(pisi.Error): class Error(pisi.Error):
pass pass
@@ -74,9 +73,9 @@ class XmlFile(object):
def readxml(self, uri, tmpDir='/tmp', sha1sum=False, def readxml(self, uri, tmpDir='/tmp', sha1sum=False,
compress=None, sign=None, copylocal = False): compress=None, sign=None, copylocal = False):
uri = File.make_uri(uri) uri = pisi.file.File.make_uri(uri)
#try: #try:
localpath = File.download(uri, tmpDir, sha1sum=sha1sum, localpath = pisi.file.File.download(uri, tmpDir, sha1sum=sha1sum,
compress=compress,sign=sign, copylocal=copylocal) compress=compress,sign=sign, copylocal=copylocal)
#except IOError, e: #except IOError, e:
# raise Error(_("Cannot read URI %s: %s") % (uri, unicode(e)) ) # raise Error(_("Cannot read URI %s: %s") % (uri, unicode(e)) )
@@ -87,7 +86,7 @@ class XmlFile(object):
raise Error(_("File '%s' has invalid XML") % (localpath) ) raise Error(_("File '%s' has invalid XML") % (localpath) )
def writexml(self, uri, tmpDir = '/tmp', sha1sum=False, compress=None, sign=None): def writexml(self, uri, tmpDir = '/tmp', sha1sum=False, compress=None, sign=None):
f = File(uri, File.write, sha1sum=sha1sum, compress=compress, sign=sign) f = pisi.file.File(uri, pisi.file.File.write, sha1sum=sha1sum, compress=compress, sign=sign)
f.write(self.doc.toPrettyString()) f.write(self.doc.toPrettyString())
f.close() f.close()