From python-checkins at python.org  Mon Feb 15 23:10:20 2010
From: python-checkins at python.org (richard)
Date: Mon, 15 Feb 2010 22:10:20 -0000
Subject: [Pypi-checkins] r732 - trunk/pypi
Message-ID: <mailman.1358.1266271846.28901.pypi-checkins@python.org>

Author: richard
Date: Wed Feb  3 21:50:29 2010
New Revision: 732

Modified:
   trunk/pypi/webui.py
Log:
remove with from stopwords

Modified: trunk/pypi/webui.py
==============================================================================
--- trunk/pypi/webui.py	(original)
+++ trunk/pypi/webui.py	Wed Feb  3 21:50:29 2010
@@ -1313,7 +1313,7 @@
         "for", "if", "in", "into", "is", "it",
         "no", "not", "of", "on", "or", "such",
         "that", "the", "their", "then", "there", "these",
-        "they", "this", "to", "was", "will", "with"
+        "they", "this", "to", "was", "will",
     ])
     def search(self, nav_current='index'):
         ''' Search for the indicated term.

From python-checkins at python.org  Sun Feb 21 22:32:20 2010
From: python-checkins at python.org (martin.von.loewis)
Date: Sun, 21 Feb 2010 22:32:20 +0100 (CET)
Subject: [Pypi-checkins] r733 - trunk/pypi/templates
Message-ID: <20100221213220.870C2D32E@mail.python.org>

Author: martin.von.loewis
Date: Sun Feb 21 22:32:20 2010
New Revision: 733

Modified:
   trunk/pypi/templates/standard_template.pt
Log:
Upgrade copyright year to 2010.


Modified: trunk/pypi/templates/standard_template.pt
==============================================================================
--- trunk/pypi/templates/standard_template.pt	(original)
+++ trunk/pypi/templates/standard_template.pt	Sun Feb 21 22:32:20 2010
@@ -181,7 +181,7 @@
             <a href="http://www.xs4all.com/" title="Web and email hosting provided by xs4all, Netherlands">hosting by xs4all</a> / 
             <a href="http://www.pollenation.net/" title="Design and content management system by Pollenation Internet, Yorkshire">design by pollenation</a>
           </div>
-          Copyright ? 1990-2007, <a href="http://www.python.org/psf">Python Software Foundation</a><br />
+          Copyright ? 1990-2010, <a href="http://www.python.org/psf">Python Software Foundation</a><br />
           <a href="http://www.python.org/about/legal">Legal Statements</a>
 
           </div>

From python-checkins at python.org  Tue Feb 23 04:36:58 2010
From: python-checkins at python.org (richard)
Date: Tue, 23 Feb 2010 04:36:58 +0100 (CET)
Subject: [Pypi-checkins] r734 - trunk/pypi
Message-ID: <20100223033658.3FBCCF8BC@mail.python.org>

Author: richard
Date: Tue Feb 23 04:36:58 2010
New Revision: 734

Modified:
   trunk/pypi/setup.py
Log:
add more useful information

Modified: trunk/pypi/setup.py
==============================================================================
--- trunk/pypi/setup.py	(original)
+++ trunk/pypi/setup.py	Tue Feb 23 04:36:58 2010
@@ -14,10 +14,13 @@
 <http://pypi.python.org/>. Users should need not need to change
 anything, as the old "www" address should still work. Use of the new
 address in preference is encouraged.
+
+Developers interested in how PyPI works, or in contributing to the project,
+should visit http://wiki.python.org/moin/CheeseShopDev
 ''',
     author = "Richard Jones",
-    author_email = "richard at mechanicalcat.net",
-    url = 'http://pypi.python.org/',
+    author_email = "richard at python.org",
+    url = 'http://wiki.python.org/moin/CheeseShopDev',
     classifiers = [
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',

From python-checkins at python.org  Tue Feb 23 04:51:46 2010
From: python-checkins at python.org (richard)
Date: Tue, 23 Feb 2010 04:51:46 +0100 (CET)
Subject: [Pypi-checkins] r735 - in trunk/pypi: . templates
Message-ID: <20100223035146.9B899FAFB@mail.python.org>

Author: richard
Date: Tue Feb 23 04:51:46 2010
New Revision: 735

Modified:
   trunk/pypi/templates/pkg_edit.pt
   trunk/pypi/webui.py
Log:
force presence of top-level index.html file

Modified: trunk/pypi/templates/pkg_edit.pt
==============================================================================
--- trunk/pypi/templates/pkg_edit.pt	(original)
+++ trunk/pypi/templates/pkg_edit.pt	Tue Feb 23 04:51:46 2010
@@ -92,7 +92,11 @@
 </form>
 
 <p>You can now host documentation at
-<a tal:attributes="href string:http://packages.python.org/${data/name}" tal:content="string:http://packages.python.org/${data/name}"></a>. To upload documentation, prepare a .zip file that is unpacked into this URL. Only static pages are supported. The directory index file is index.html.</p>
+<a tal:attributes="href string:http://packages.python.org/${data/name}"
+tal:content="string:http://packages.python.org/${data/name}"></a>. To
+upload documentation, prepare a .zip file that is unpacked into this URL.
+Only static pages are supported. The zip file must have a top-level
+"index.html".</p>
 <form tal:attributes="action app/url_path" method="POST"
     enctype="multipart/form-data">
 <input type="hidden" name=":action" value="doc_upload" />

Modified: trunk/pypi/webui.py
==============================================================================
--- trunk/pypi/webui.py	(original)
+++ trunk/pypi/webui.py	Tue Feb 23 04:51:46 2010
@@ -2227,6 +2227,9 @@
         except Exception,e:
             raise FormError, "Error uncompressing zipfile:" + str(e)
 
+        if 'index.html' not in members:
+            raise FormError, 'Error: top-level "index.html" missing in the zipfile'
+
         # Assume the file is valid; remove any previous data
         path = os.path.join(self.config.database_docs_dir, name, "")
         if os.path.exists(path):

From python-checkins at python.org  Thu Feb 25 22:05:54 2010
From: python-checkins at python.org (martin.von.loewis)
Date: Thu, 25 Feb 2010 22:05:54 +0100 (CET)
Subject: [Pypi-checkins] r736 - trunk/pypi
Message-ID: <20100225210554.64AECFAD8@mail.python.org>

Author: martin.von.loewis
Date: Thu Feb 25 22:05:54 2010
New Revision: 736

Modified:
   trunk/pypi/webui.py
Log:
Deal with case where OpenID provider provides no email address.


Modified: trunk/pypi/webui.py
==============================================================================
--- trunk/pypi/webui.py	(original)
+++ trunk/pypi/webui.py	Thu Feb 25 22:05:54 2010
@@ -2680,8 +2680,17 @@
         username = openid.get_username(qs)
         if isinstance(username, tuple):
             username = '.'.join(username)
-        elif username is None:
+        elif email and not username:
             username = email.split('@')[0]
+        else:
+            # suggest OpenID host name as username
+            username = urlparse.urlsplit(claimed_id)[1]
+            if ':' in username:
+                username = username.split(':')[0]
+            if '@' in username:
+                username = username.rsplit('@', 1)[0]
+            if not username:
+                username = "nonamegiven"
         username = username.replace(' ','.')
         username = re.sub('[^a-zA-Z0-9._]','',username)
         error = 'Please choose a username to complete registration'