[Python-checkins] distutils2: Automated merge with https://bitbucket.org/mtlpython/distutils2

[tarek.ziade]

tarek.ziade pushed 611d144bff64 to distutils2:

http://hg.python.org/distutils2/rev/611d144bff64
changeset:   389:611d144bff64
parent:      387:ba37b166e4f9
parent:      388:4e592a276c7b
user:        Nicolas Cadou <ncadou at cadou.ca>
date:        Thu Jul 29 21:42:30 2010 -0400
summary:     Automated merge with https://bitbucket.org/mtlpython/distutils2
files:       src/distutils2/tests/test_metadata.py

diff --git a/src/distutils2/metadata.py b/src/distutils2/metadata.py
--- a/src/distutils2/metadata.py
+++ b/src/distutils2/metadata.py
@@ -203,10 +203,6 @@
     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
--- 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,
@@ -62,17 +63,12 @@
 
         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

--
Repository URL: http://hg.python.org/distutils2