[Python-checkins] distutils2: make sure we don't mix 1.1 metadata and setuptools ones

[tarek.ziade]

tarek.ziade pushed 11adbbb89d73 to distutils2:

http://hg.python.org/distutils2/rev/11adbbb89d73
changeset:   826:11adbbb89d73
user:        Tarek Ziade <tarek at ziade.org>
date:        Fri Dec 10 17:26:57 2010 +0100
summary:
  make sure we don't mix 1.1 metadata and setuptools ones

files:
  distutils2/_backport/pkgutil.py
  distutils2/tests/test_depgraph.py

diff --git a/distutils2/_backport/pkgutil.py b/distutils2/_backport/pkgutil.py
--- a/distutils2/_backport/pkgutil.py
+++ b/distutils2/_backport/pkgutil.py
@@ -680,7 +680,6 @@
                                   dir.endswith('.egg')):
                 yield EggInfoDistribution(dist_path)
 
-
 def _generate_cache(use_egg_info=False):
     global _cache_generated, _cache_generated_egg
 
@@ -913,14 +912,15 @@
         else:
             raise ValueError('The path must end with .egg-info or .egg')
 
-        provides = "%s (%s)" % (self.metadata['name'],
-                                self.metadata['version'])
-        #if self.metadata['Metadata-Version'] == '1.2':
-        #    self.metadata['Provides-Dist'] += (provides,)
-        #else:
-        #    self.metadata['Provides'] += (provides,)
 
-        if len(provides) > 0:
+        if requires is not None:
+            if self.metadata['Metadata-Version'] == '1.1':
+                # we can't have 1.1 metadata *and* Setuptools requires
+                for field in ('Obsoletes', 'Requires', 'Provides'):
+                    del self.metadata[field]
+
+            provides = "%s (%s)" % (self.metadata['name'],
+                                    self.metadata['version'])
             self.metadata['Provides-Dist'] += (provides,)
 
         reqs = []
@@ -958,10 +958,7 @@
                             reqs.append(name)
                         else:
                             reqs.append('%s (%s)' % (name, version))
-            #if self.metadata['Metadata-Version'] == '1.2':
-            #    self.metadata['Requires-Dist'] += reqs
-            #else:
-            #    self.metadata['Requires'] += reqs
+
             if len(reqs) > 0:
                 self.metadata['Requires-Dist'] += reqs
 
diff --git a/distutils2/tests/test_depgraph.py b/distutils2/tests/test_depgraph.py
--- a/distutils2/tests/test_depgraph.py
+++ b/distutils2/tests/test_depgraph.py
@@ -231,7 +231,6 @@
         # checks what main did XXX could do more here
         tempout.seek(0)
         res = tempout.read()
-        import pdb; pdb.set_trace()
         self.assertTrue('towel' in res)
 
 

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