Index: Lib/distutils/tests/test_dist.py
===================================================================
--- Lib/distutils/tests/test_dist.py	(wersja 88694)
+++ Lib/distutils/tests/test_dist.py	(kopia robocza)
@@ -237,6 +237,20 @@
         self.assertTrue("requires:" not in meta.lower())
         self.assertTrue("Obsoletes: other" in meta)
         self.assertTrue("Obsoletes: another (<1.0)" in meta)
+        
+    def test_download_url(self):
+        attrs = {"name": "package", "version": "1.0", 
+                 "download_url": "url.org"}
+        dist = Distribution(attrs)
+        meta = self.format_metadata(dist)
+        self.assertTrue("Metadata-Version: 1.1" in meta)
+        
+    def test_classifier(self):
+        attrs = {"name": "package", "version": "1.0", 
+                 "classifiers": ("class1",)}
+        dist = Distribution(attrs)
+        meta = self.format_metadata(dist)
+        self.assertTrue("Metadata-Version: 1.1" in meta)
 
     def test_obsoletes_illegal(self):
         self.assertRaises(ValueError, Distribution,
Index: Lib/distutils/dist.py
===================================================================
--- Lib/distutils/dist.py	(wersja 88694)
+++ Lib/distutils/dist.py	(kopia robocza)
@@ -1022,7 +1022,8 @@
         """Write the PKG-INFO format data to a file object.
         """
         version = '1.0'
-        if self.provides or self.requires or self.obsoletes:
+        if (self.provides or self.requires or self.obsoletes or 
+            self.download_url or self.classifiers):
             version = '1.1'
 
         file.write('Metadata-Version: %s\n' % version)