[Pypi-checkins] r750 - branches/tarek-pep-345-support
tarek.ziade
python-checkins at python.org
Sun Mar 21 00:01:22 CET 2010
Author: tarek.ziade
Date: Sun Mar 21 00:01:22 2010
New Revision: 750
Modified:
branches/tarek-pep-345-support/store.py
Log:
storing PEP 345 fields
Modified: branches/tarek-pep-345-support/store.py
==============================================================================
--- branches/tarek-pep-345-support/store.py (original)
+++ branches/tarek-pep-345-support/store.py Sun Mar 21 00:01:22 2010
@@ -199,7 +199,6 @@
journal entry.
'''
date = time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime())
-
cursor = self.get_cursor()
# see if we're inserting or updating a package
if not self.has_package(name):
@@ -268,7 +267,9 @@
old.append('classifiers')
# get old classifiers list
- for col in ('requires', 'provides', 'obsoletes'):
+ for col in ('requires', 'provides', 'obsoletes', 'requires_dist',
+ 'provides_dist', 'obsoletes_dist', 'requires_python',
+ 'requires_external', 'project_url'):
relationships[col] = self.get_release_relationships(name,
version, col)
relationships[col].sort()
@@ -353,7 +354,9 @@
(name, version, trove_id))
# handle relationship specifiers
- for col in ('requires', 'provides', 'obsoletes'):
+ for col in ('requires', 'provides', 'obsoletes', 'requires_dist',
+ 'provides_dist', 'obsoletes_dist', 'requires_python',
+ 'requires_external', 'project_url'):
if not info.has_key(col) or relationships.get(col, []) == info[col]:
continue
safe_execute(cursor, '''delete from release_%s where name=%%s
@@ -658,7 +661,7 @@
def get_package_requires_dist(self, name, version):
cursor = self.get_cursor()
- safe_execute(cursor, '''select specifier from release_requires_dist
+ safe_execute(cursor, '''select specifier from release_requires_dist
where name=%s and version=%s ''', (name, version))
packages = []
for package in cursor.fetchall():
@@ -669,7 +672,7 @@
def get_package_provides_dist(self, name, version):
cursor = self.get_cursor()
- safe_execute(cursor, '''select specifier from release_provides_dist
+ safe_execute(cursor, '''select specifier from release_provides_dist
where name=%s and version=%s ''', (name, version))
packages = []
for package in cursor.fetchall():
@@ -680,7 +683,7 @@
def get_package_project_url(self, name, version):
cursor = self.get_cursor()
- safe_execute(cursor, '''select specifier from release_project_url
+ safe_execute(cursor, '''select specifier from release_project_url
where name=%s and version=%s ''', (name, version))
project_urls = []
for project in cursor.fetchall():
@@ -908,7 +911,9 @@
# delete ancillary table entries
for tab in ('files', 'provides', 'requires', 'obsoletes',
- 'classifiers'):
+ 'classifiers', 'requires_dist', 'provides_dist',
+ 'obsoletes_dist', 'requires_python', 'requires_external',
+ 'project_url'):
safe_execute(cursor, '''delete from release_%s where
name=%%s and version=%%s'''%tab, (name, version))
safe_execute(cursor, 'delete from description_urls where name=%s and version=%s',
@@ -922,7 +927,7 @@
safe_execute(cursor, '''insert into journals (name, version, action,
submitted_date, submitted_by, submitted_from) values
(%s, %s, %s, %s, %s, %s)''', (name, version, 'remove', date,
- self.username, self.userip))
+ self.username, self.userip))
def remove_package(self, name):
''' Delete an entire package from the database.
@@ -935,7 +940,9 @@
# delete ancillary table entries
for tab in ('files', 'provides', 'requires', 'obsoletes',
- 'classifiers'):
+ 'classifiers', 'requires_dist', 'provides_dist',
+ 'obsoletes_dist', 'requires_python', 'requires_external',
+ 'project_url'):
safe_execute(cursor, 'delete from release_%s where name=%%s'%tab,
(name, ))
@@ -1000,7 +1007,7 @@
'''Copy a user-s rating of package name from one version to another;
return the comment if any'''
cursor = self.get_cursor()
- safe_execute(cursor, '''insert into ratings(name,version,user_name,date,rating)
+ safe_execute(cursor, '''insert into ratings(name,version,user_name,date,rating)
select name,%s,user_name,now(),rating from ratings
where name=%s and version=%s and user_name=%s''',
(toversion, name, fromversion, self.username))
@@ -1010,10 +1017,10 @@
if cid:
cid = cid[0]
safe_execute(cursor, '''insert into comments(rating, user_name, date, message, in_reply_to)
- select currval('ratings_id_seq'), user_name, date, message, in_reply_to
+ select currval('ratings_id_seq'), user_name, date, message, in_reply_to
from comments where id=%s''', (cid,))
safe_execute(cursor, '''insert into comments_journal(name, version, id, submitted_by, date, action)
- values(%s, %s, currval('comments_id_seq'), %s, now(), %s)''', (name, toversion,
+ values(%s, %s, currval('comments_id_seq'), %s, now(), %s)''', (name, toversion,
self.username, 'copied %s' % cid))
safe_execute(cursor, '''select message from comments
@@ -1027,7 +1034,7 @@
safe_execute(cursor, """insert into comments_journal(name, version, id, submitted_by, date, action)
select %s, %s, id, %s, now(), 'deleted' from ratings where user_name=%s and name=%s and version=%s""",
(name, version, self.username, self.username, name, version))
- safe_execute(cursor, "delete from ratings where user_name=%s and name=%s and version=%s",
+ safe_execute(cursor, "delete from ratings where user_name=%s and name=%s and version=%s",
(self.username, name, version))
_Rating=FastResultRow('id! date! user rating!')
@@ -1035,7 +1042,7 @@
def get_ratings(self, name, version):
'''Return ratings,messages for a release.'''
cursor = self.get_cursor()
- safe_execute(cursor, '''select id, date, user_name, rating from ratings
+ safe_execute(cursor, '''select id, date, user_name, rating from ratings
where name=%s and version=%s order by date''', (name, version))
res = cursor.fetchall()
safe_execute(cursor, '''select c.id, c.rating, c.user_name, c.date, c.message, c.in_reply_to from
@@ -1129,14 +1136,14 @@
def has_rating(self, name, version):
'''Check whether user has rated this release'''
cursor = self.get_cursor()
- safe_execute(cursor, '''select count(*) from ratings
+ safe_execute(cursor, '''select count(*) from ratings
where user_name=%s and name=%s and version=%s''', (self.username, name, version))
return cursor.fetchall()[0][0]
def latest_rating(self, name):
'''Return the user-s latest rating on any release, or None.'''
cursor = self.get_cursor()
- safe_execute(cursor, '''select version from ratings
+ safe_execute(cursor, '''select version from ratings
where user_name=%s and name=%s order by date desc limit 1''', (self.username, name))
res = cursor.fetchone()
if res:
@@ -1352,7 +1359,7 @@
'''
cursor = self.get_cursor()
safe_execute(cursor, 'insert into sshkeys(name, key) values(%s, %s)', (username, key))
-
+
def delete_sshkey(self, id):
'''Delete an SSH key given by ID.
'''
More information about the Pypi-checkins
mailing list