[Lxml-checkins] r33862 - lxml/branch/lxml-1.1/src/lxml/tests

[scoder at codespeak.net]

Author: scoder
Date: Sun Oct 29 20:49:31 2006
New Revision: 33862

Modified:
   lxml/branch/lxml-1.1/src/lxml/tests/test_io.py
Log:
forgotten merge from trunk

Modified: lxml/branch/lxml-1.1/src/lxml/tests/test_io.py
==============================================================================
--- lxml/branch/lxml-1.1/src/lxml/tests/test_io.py	(original)
+++ lxml/branch/lxml-1.1/src/lxml/tests/test_io.py	Sun Oct 29 20:49:31 2006
@@ -25,16 +25,17 @@
     def test_write_filename(self):
         # (c)ElementTree  supports filename strings as write argument
         
-        filename = tempfile.mktemp(suffix=".xml")
+        handle, filename = tempfile.mkstemp(suffix=".xml")
         self.tree.write(filename)
         try:
             self.assertEqual(open(filename).read(), self.root_str)
         finally:
+            os.close(handle)
             os.remove(filename)
 
     def test_module_parse_gzipobject(self):
         # (c)ElementTree supports gzip instance as parse argument
-        filename = tempfile.mktemp(suffix=".xml.gz")
+        handle, filename = tempfile.mkstemp(suffix=".xml.gz")
         f = gzip.open(filename, 'wb')
         f.write(self.root_str)
         f.close()
@@ -44,6 +45,7 @@
             f_gz.close()
             self.assertEqual(self.etree.tostring(tree.getroot()), self.root_str)
         finally:
+            os.close(handle)
             os.remove(filename)
 
     def test_class_parse_filename(self):
@@ -52,17 +54,18 @@
 
         # parse from filename
         
-        filename = tempfile.mktemp(suffix=".xml")
+        handle, filename = tempfile.mkstemp(suffix=".xml")
         open(filename, 'wb').write(self.root_str)
         try:
             tree = self.etree.ElementTree()
             root = tree.parse(filename)
             self.assertEqual(self.etree.tostring(root), self.root_str)
         finally:
+            os.close(handle)
             os.remove(filename)
 
     def test_class_parse_filename_remove_previous(self):
-        filename = tempfile.mktemp(suffix=".xml")
+        handle, filename = tempfile.mkstemp(suffix=".xml")
         open(filename, 'wb').write(self.root_str)
         try:
             tree = self.etree.ElementTree()
@@ -79,6 +82,7 @@
             # root2's memory should've been freed here
             # XXX how to check?
         finally:
+            os.close(handle)
             os.remove(filename)
         
     def test_class_parse_fileobject(self):
@@ -87,7 +91,7 @@
 
         # parse from file object
         
-        filename = tempfile.mktemp(suffix=".xml")
+        handle, filename = tempfile.mkstemp(suffix=".xml")
         os.write(handle, self.root_str)
         try:
             f = open(filename, 'r')
@@ -96,6 +100,7 @@
             f.close()
             self.assertEqual(self.etree.tostring(root), self.root_str)
         finally:
+            os.close(handle)
             os.remove(filename)
 
     def test_class_parse_unamed_fileobject(self):