From 7c029a1f338bd918b80a4ad071ad05180647750f Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 25 Dec 2012 20:28:19 +0100 Subject: Remove InvalidId It was a NoOp in our Non-mongo world. So it is safe to remove. Signed-off-by: Sebastian Spaeth --- mediagoblin/db/sql/fake.py | 10 +--------- mediagoblin/db/util.py | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'mediagoblin/db') diff --git a/mediagoblin/db/sql/fake.py b/mediagoblin/db/sql/fake.py index 0fd0cc41..bb91dbcb 100644 --- a/mediagoblin/db/sql/fake.py +++ b/mediagoblin/db/sql/fake.py @@ -24,7 +24,6 @@ Currently: - ObjectId "class": It's a function mostly doing int(init_arg) to convert string primary keys into integer primary keys. -- InvalidId exception - DESCENDING "constant" """ @@ -32,14 +31,7 @@ Currently: DESCENDING = object() # a unique object for this "constant" -class InvalidId(Exception): - pass - - def ObjectId(value=None): if value is None: return None - try: - return int(value) - except ValueError: - raise InvalidId("%r is an invalid id" % value) + return int(value) diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py index 9fa3b204..f14f79aa 100644 --- a/mediagoblin/db/util.py +++ b/mediagoblin/db/util.py @@ -15,6 +15,6 @@ # along with this program. If not, see . #TODO: check now after mongo removal if we can't rip out a layer of abstraction -from mediagoblin.db.sql.fake import ObjectId, InvalidId, DESCENDING +from mediagoblin.db.sql.fake import ObjectId, DESCENDING from mediagoblin.db.sql.util import atomic_update, check_media_slug_used, \ media_entries_for_tag_slug, check_collection_slug_used -- cgit v1.2.3