[Uludag-commits] r12305 - in trunk/pisi/pisi: . pxml

[svn-uludag at uludag.org.tr]

Author: caglar
Date: Fri Feb  9 12:07:39 2007
New Revision: 12305

Modified:
   trunk/pisi/pisi/file.py
   trunk/pisi/pisi/pxml/autoxml.py
   trunk/pisi/pisi/pxml/xmlfile.py
Log:
revert r12253 as it breaks whole external scripts which uses specFile cause api.init becomes must with that revision, we will solve these issues with the big refactor :)

Modified: trunk/pisi/pisi/file.py
=================================================================
--- trunk/pisi/pisi/file.py	(original)
+++ trunk/pisi/pisi/file.py	Fri Feb  9 12:07:39 2007
@@ -90,14 +90,11 @@
         return localfile
 
     @staticmethod
-    def download(uri, transfer_dir = None, sha1sum = False,
+    def download(uri, transfer_dir = "/tmp", sha1sum = False,
                  compress = None, sign = None, copylocal = False):
 
         assert isinstance(uri, URI)
 
-        if not transfer_dir:
-            transfer_dir = ctx.config.tmp_dir()
-
         if sha1sum:
             sha1filename = File.download(URI(uri.get_uri() + '.sha1sum'), transfer_dir)
             sha1f = file(sha1filename)
@@ -142,14 +139,12 @@
         return localfile
 
 
-    def __init__(self, uri, mode, transfer_dir = None,
+    def __init__(self, uri, mode, transfer_dir = "/tmp",
                  sha1sum = False, compress = None, sign = None):
         "it is pointless to open a file without a URI and a mode"
 
-        if transfer_dir:
-            self.transfer_dir = transfer_dir
-        else:
-            self.trasfer_dir = ctx.config.tmp_dir()
+        self.transfer_dir = transfer_dir
+
         self.sha1sum = sha1sum
         self.compress = compress
         self.sign = sign

Modified: trunk/pisi/pisi/pxml/autoxml.py
=================================================================
--- trunk/pisi/pisi/pxml/autoxml.py	(original)
+++ trunk/pisi/pisi/pxml/autoxml.py	Fri Feb  9 12:07:39 2007
@@ -310,11 +310,8 @@
 
         # generate top-level helper functions
         cls.initializers = inits
-        def initialize(self, uri = None, keepDoc = False, tmpDir = None,
+        def initialize(self, uri = None, keepDoc = False, tmpDir = '/tmp',
                        **args):
-            if not tmpDir:
-                tmpDir = ctx.config.tmp_dir()
-
             if xmlfile_support:
                 if args.has_key('tag'):
                     XmlFile.__init__(self, tag = args['tag'])
@@ -435,13 +432,9 @@
                 if errs:
                     errs.append(_("autoxml.parse: String '%s' has errors") % xml)
 
-            def read(self, uri, keepDoc = False, tmpDir = None,
+            def read(self, uri, keepDoc = False, tmpDir = '/tmp',
                      sha1sum = False, compress = None, sign = None, copylocal = False):
                 "read XML file and decode it into a python object"
-                
-                if not tmpDir:
-                    tmpDir = ctx.config.tmp_dir()
-
                 self.readxml(uri, tmpDir, sha1sum=sha1sum, 
                              compress=compress, sign=sign, copylocal=copylocal)
                 errs = []
@@ -460,7 +453,7 @@
                     errs.append(_("autoxml.read: File '%s' has errors") % uri)
                     raise Error(*errs)
 
-            def write(self, uri, keepDoc = False, tmpDir = None,
+            def write(self, uri, keepDoc = False, tmpDir = '/tmp',
                       sha1sum = False, compress = None, sign = None):
                 "encode the contents of the python object into an XML file"
                 errs = self.errors()
@@ -468,10 +461,6 @@
                     errs.append(_("autoxml.write: object validation has failed"))
                     raise Error(*errs)
                 errs = []
-
-                if not tmpDir:
-                    tmpDir = ctx.config.tmp_dir()
-
                 self.newDocument()
                 self.encode(self.rootNode(), errs)
                 if hasattr(self, 'write_hook'):

Modified: trunk/pisi/pisi/pxml/xmlfile.py
=================================================================
--- trunk/pisi/pisi/pxml/xmlfile.py	(original)
+++ trunk/pisi/pisi/pxml/xmlfile.py	Fri Feb  9 12:07:39 2007
@@ -72,12 +72,8 @@
             raise Error(_("File '%s' has invalid XML") % (f) )
 
 
-    def readxml(self, uri, tmpDir=None, sha1sum=False,
+    def readxml(self, uri, tmpDir='/tmp', sha1sum=False,
                 compress=None, sign=None, copylocal = False):
-        
-        if not tmpDir:
-            tmpDir = ctx.config.tmp_dir()   
-
         uri = File.make_uri(uri)
         #try:
         localpath = File.download(uri, tmpDir, sha1sum=sha1sum,
@@ -90,7 +86,7 @@
         except Exception, e:
             raise Error(_("File '%s' has invalid XML") % (localpath) )
 
-    def writexml(self, uri, tmpDir = None, 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.write(self.doc.toPrettyString())
         f.close()