From python-checkins at python.org  Sat Jan  1 11:03:10 2011
From: python-checkins at python.org (martin.von.loewis)
Date: Sat,  1 Jan 2011 11:03:10 +0100 (CET)
Subject: [Pypi-checkins] r878 - trunk/pypi/templates
Message-ID: <20110101100310.BE31BEE987@mail.python.org>

Author: martin.von.loewis
Date: Sat Jan  1 11:03:10 2011
New Revision: 878

Modified:
   trunk/pypi/templates/standard_template.pt
Log:
Bump year.


Modified: trunk/pypi/templates/standard_template.pt
==============================================================================
--- trunk/pypi/templates/standard_template.pt	(original)
+++ trunk/pypi/templates/standard_template.pt	Sat Jan  1 11:03:10 2011
@@ -201,7 +201,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-2010, <a href="http://www.python.org/psf">Python Software Foundation</a><br />
+          Copyright ? 1990-2011, <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 Jan 25 23:38:58 2011
From: python-checkins at python.org (richard)
Date: Tue, 25 Jan 2011 23:38:58 +0100 (CET)
Subject: [Pypi-checkins] r879 - trunk/pypi
Message-ID: <20110125223858.3BBDCEEC77@mail.python.org>

Author: richard
Date: Tue Jan 25 23:38:58 2011
New Revision: 879

Modified:
   trunk/pypi/admin.py
Log:
fix some name clashes

Modified: trunk/pypi/admin.py
==============================================================================
--- trunk/pypi/admin.py	(original)
+++ trunk/pypi/admin.py	Tue Jan 25 23:38:58 2011
@@ -127,10 +127,10 @@
 
 if __name__ == '__main__':
     config = config.Config('/data/pypi/config.ini')
-    store = store.Store(config)
-    store.open()
+    st = store.Store(config)
+    st.open()
     command = sys.argv[1]
-    args = (store, ) + tuple(sys.argv[2:])
+    args = (st, ) + tuple(sys.argv[2:])
     try:
         if command == 'password':
             set_password(*args)
@@ -157,7 +157,7 @@
             merge_user(*args)
         else:
             print "unknown command '%s'!"%command
-        store.changed()
+        st.changed()
     finally:
-        store.close()
+        st.close()
 

From python-checkins at python.org  Fri Jan 28 09:56:42 2011
From: python-checkins at python.org (martin.von.loewis)
Date: Fri, 28 Jan 2011 09:56:42 +0100 (CET)
Subject: [Pypi-checkins] r880 - in trunk/pypi: . tools
Message-ID: <20110128085642.3929CEEA5A@mail.python.org>

Author: martin.von.loewis
Date: Fri Jan 28 09:56:42 2011
New Revision: 880

Added:
   trunk/pypi/tools/sql-migrate-20110129.sql   (contents, props changed)
Modified:
   trunk/pypi/pkgbase_schema.sql
Log:
Add uniqueness constraint for otks.


Modified: trunk/pypi/pkgbase_schema.sql
==============================================================================
--- trunk/pypi/pkgbase_schema.sql	(original)
+++ trunk/pypi/pkgbase_schema.sql	Fri Jan 28 09:56:42 2011
@@ -56,7 +56,7 @@
 -- Table structure for table: rego_otk
 CREATE TABLE rego_otk (
    name TEXT REFERENCES users,
-   otk TEXT,
+   otk TEXT UNIQUE,
    date TIMESTAMP );
 CREATE INDEX rego_otk_name_idx ON rego_otk(name);
 CREATE INDEX rego_otk_otk_idx ON rego_otk(otk);
@@ -277,4 +277,4 @@
   FOREIGN KEY (name, version) REFERENCES releases (name, version) ON DELETE CASCADE
 );
 
-commit;
\ No newline at end of file
+commit;

Added: trunk/pypi/tools/sql-migrate-20110129.sql
==============================================================================
--- (empty file)
+++ trunk/pypi/tools/sql-migrate-20110129.sql	Fri Jan 28 09:56:42 2011
@@ -0,0 +1 @@
+alter TABLE rego_otk add rego_otk_unique constraint unique(otk);

From python-checkins at python.org  Fri Jan 28 09:57:42 2011
From: python-checkins at python.org (martin.von.loewis)
Date: Fri, 28 Jan 2011 09:57:42 +0100 (CET)
Subject: [Pypi-checkins] r881 - trunk/pypi/tools
Message-ID: <20110128085742.48084EEA5B@mail.python.org>

Author: martin.von.loewis
Date: Fri Jan 28 09:57:42 2011
New Revision: 881

Modified:
   trunk/pypi/tools/sql-migrate-20110129.sql
Log:
Fix syntax error.


Modified: trunk/pypi/tools/sql-migrate-20110129.sql
==============================================================================
--- trunk/pypi/tools/sql-migrate-20110129.sql	(original)
+++ trunk/pypi/tools/sql-migrate-20110129.sql	Fri Jan 28 09:57:42 2011
@@ -1 +1 @@
-alter TABLE rego_otk add rego_otk_unique constraint unique(otk);
+alter TABLE rego_otk add constraint rego_otk_unique unique(otk);

From python-checkins at python.org  Fri Jan 28 10:01:55 2011
From: python-checkins at python.org (martin.von.loewis)
Date: Fri, 28 Jan 2011 10:01:55 +0100 (CET)
Subject: [Pypi-checkins] r882 - trunk/pypi
Message-ID: <20110128090155.B51B0EEA29@mail.python.org>

Author: martin.von.loewis
Date: Fri Jan 28 10:01:55 2011
New Revision: 882

Modified:
   trunk/pypi/webui.py
Log:
Don't try to explicitly seed the random module;
use default seeding instead (based on urandom)


Modified: trunk/pypi/webui.py
==============================================================================
--- trunk/pypi/webui.py	(original)
+++ trunk/pypi/webui.py	Fri Jan 28 10:01:55 2011
@@ -252,7 +252,6 @@
         self.config = handler.config
         self.wfile = handler.wfile
         self.env = env
-        random.seed(int(time.time())%256)
         self.nav_current = None
         self.privkey = None
         self.username = None