Improved metadata read/write test and removed unused function

2 files changed, 6 insertions, 14 deletions

diff --git a/src/distutils2/metadata.py b/src/distutils2/metadata.py
index 55f1020..147404d 100644
--- a/src/distutils2/metadata.py
+++ b/src/distutils2/metadata.py
@@ -203,10 +203,6 @@ class DistributionMetadata(object):
     def _write_field(self, file, name, value):
         file.write('%s: %s\n' % (name, value))
 
-    def _write_list(self, file, name, values):
-        for value in values:
-            self._write_field(file, name, value)
-
     def _encode_field(self, value):
         if isinstance(value, unicode):
             return value.encode(PKG_INFO_ENCODING)
diff --git a/src/distutils2/tests/test_metadata.py b/src/distutils2/tests/test_metadata.py
index 3455342..cc6f9a2 100644
--- a/src/distutils2/tests/test_metadata.py
+++ b/src/distutils2/tests/test_metadata.py
@@ -1,6 +1,7 @@
 """Tests for distutils.command.bdist."""
 import os
 import sys
+import tempfile
 from StringIO import StringIO
 
 from distutils2.metadata import (DistributionMetadata, _interpret,
@@ -61,17 +62,12 @@ class DistributionMetadataTestCase(LoggingSilencer, unittest.TestCase):
 
         PKG_INFO = os.path.join(os.path.dirname(__file__), 'PKG-INFO')
         metadata = DistributionMetadata(PKG_INFO)
-        res = StringIO()
+        res = tempfile.NamedTemporaryFile()
         metadata.write_file(res)
-        res.seek(0)
-        res = res.read()
-        f = open(PKG_INFO)
-        try:
-            # XXX this is not used
-            wanted = f.read()
-        finally:
-            f.close()
-        self.assertTrue('Keywords: keyring,password,crypt' in res)
+        res.flush()
+        res = DistributionMetadata(res.name)
+        for k in metadata.keys():
+            self.assertTrue(metadata[k] == res[k])
 
     def test_metadata_markers(self):
         # see if we can be platform-aware