[Pypi-checkins] r1013 - trunk/pypi

[richard]

Author: richard
Date: Tue Mar 13 00:24:37 2012
New Revision: 1013

Modified:
   trunk/pypi/webui.py
Log:
handle distutils "UNKNOWN"

Modified: trunk/pypi/webui.py
==============================================================================
--- trunk/pypi/webui.py	(original)
+++ trunk/pypi/webui.py	Tue Mar 13 00:24:37 2012
@@ -2198,11 +2198,11 @@
         # verify the release exists
         if self.store.has_release(name, version):
             release_metadata = self.store.get_package(name, version)
-            has_description = release_metadata['description']
+            description = release_metadata['description']
         else:
             # auto-register the release...
             release_metadata = self.form_metadata()
-            has_description = release_metadata.get('description')
+            description = release_metadata.get('description')
             try:
                 self.validate_metadata(release_metadata)
             except ValueError, message:
@@ -2211,6 +2211,10 @@
             self.store.store_package(name, version, release_metadata)
             self.store.changed()
 
+        # distutils handily substitutes blank descriptions with "UNKNOWN"
+        if description == 'UNKNOWN':
+            description = ''
+
         # verify we have enough information
         pyversion = 'source'
         content = filetype = md5_digest = comment = None
@@ -2292,11 +2296,11 @@
 
         # Determine whether we could use a README to fill out a missing
         # description
-        if not has_description:
-            desc_text, desc_html = extractPackageReadme(content,
+        if not description:
+            description, desc_html = extractPackageReadme(content,
                 filename, filetype)
-            if desc_text:
-                self.store.set_description(name, version, desc_text, desc_html,
+            if description:
+                self.store.set_description(name, version, description, desc_html,
                     from_readme=True)
 
         # digest content