From python-checkins at python.org  Sun Jan  1 18:55:35 2012
From: python-checkins at python.org (martin.von.loewis)
Date: Sun,  1 Jan 2012 18:55:35 +0100 (CET)
Subject: [Pypi-checkins] r1005 - trunk/pypi
Message-ID: <3TGTj311TlzPnL@mail.python.org>

Author: martin.von.loewis
Date: Sun Jan  1 18:55:34 2012
New Revision: 1005

Modified:
   trunk/pypi/webui.py
Log:
Add X-XRDS-Location header to /pypi.


Modified: trunk/pypi/webui.py
==============================================================================
--- trunk/pypi/webui.py	(original)
+++ trunk/pypi/webui.py	Sun Jan  1 18:55:34 2012
@@ -333,7 +333,7 @@
     error_message = None
     ok_message = None
 
-    def write_template(self, filename, **options):
+    def write_template(self, filename, headers={}, **options):
         context = {}
         options.setdefault('norobots', False)
         options.setdefault('keywords', 'python programming language object'
@@ -384,6 +384,8 @@
         if self.usercookie:
             self.handler.send_header('Set-Cookie',
                                      'pypi='+self.usercookie+';path='+self.url_path)
+        for k,v in headers.items():
+            self.handler.send_header(k, v)
         self.handler.end_headers()
         self.wfile.write(content.encode('utf-8'))
 
@@ -721,7 +723,8 @@
             return self.openid_user(path)
 
     def home(self, nav_current='home'):
-        self.write_template('home.pt', title='PyPI - the Python Package Index')
+        self.write_template('home.pt', title='PyPI - the Python Package Index',
+                            headers={'X-XRDS-Location':self.url_machine+'/id'})
 
     def about(self, nav_current='home'):
         self.write_template('about.pt', title='About PyPI')

From python-checkins at python.org  Sat Jan  7 19:03:08 2012
From: python-checkins at python.org (martin.von.loewis)
Date: Sat,  7 Jan 2012 19:03:08 +0100 (CET)
Subject: [Pypi-checkins] r1006 - trunk/pypi
Message-ID: <3TL9b051VSzQBZ@mail.python.org>

Author: martin.von.loewis
Date: Sat Jan  7 19:03:07 2012
New Revision: 1006

Modified:
   trunk/pypi/webui.py
Log:
Issue 3467609: Bump maximum file size in uploads.


Modified: trunk/pypi/webui.py
==============================================================================
--- trunk/pypi/webui.py	(original)
+++ trunk/pypi/webui.py	Sat Jan  7 19:03:07 2012
@@ -2277,8 +2277,8 @@
         else:
             signature = None
 
-        # nothing over 20M please
-        if len(content) > 20*1024*1024:
+        # nothing over 40M please
+        if len(content) > 40*1024*1024:
             raise FormError, 'distribution file too large'
         if signature and len(signature) > 100*1024:
             raise FormError, 'invalid signature'

From python-checkins at python.org  Tue Jan 24 00:24:40 2012
From: python-checkins at python.org (martin.von.loewis)
Date: Tue, 24 Jan 2012 00:24:40 +0100 (CET)
Subject: [Pypi-checkins] r1007 - trunk/pypi/templates
Message-ID: <3TX7yc1Qd0zPxp@mail.python.org>

Author: martin.von.loewis
Date: Tue Jan 24 00:24:39 2012
New Revision: 1007

Modified:
   trunk/pypi/templates/register.pt
Log:
Document OpenID support


Modified: trunk/pypi/templates/register.pt
==============================================================================
--- trunk/pypi/templates/register.pt	(original)
+++ trunk/pypi/templates/register.pt	Tue Jan 24 00:24:39 2012
@@ -21,6 +21,12 @@
     <tal:block tal:condition="data/owns_packages">You cannot delete your account since you
     are still listed as owner of some packages.</tal:block>
     </p>
+    <p>
+    You can use your PyPI account to log into other services supporting <a href="http://en.wikipedia.org/wiki/OpenID">OpenID</a>.
+    You need to first log into PyPI before logging into other services (doing it the other way is prone to phishing attacks).
+    To log in, simply type <b>pypi.python.org</b> into the field asking for an OpenID. Your OpenID is
+    <b>http://pypi.python.org/id/<span tal:replace="data/name"/></b>; you can also use this ID directly to log in.
+    </p>
     <form tal:attributes="action app/url_path" method="POST">
       <input type="hidden" name=":action" value="user" />
       <input type="hidden" name="name" tal:condition="not:data/new_user"