Remove InvalidId

It was a NoOp in our Non-mongo world. So it is safe to remove.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>

4 files changed, 8 insertions, 30 deletions

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 <http://www.gnu.org/licenses/>.
 
 #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
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index 0903dd41..ce5cb59c 100644
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -20,7 +20,7 @@ from urlparse import urljoin
 from werkzeug.exceptions import Forbidden
 from werkzeug.urls import url_quote
 
-from mediagoblin.db.util import ObjectId, InvalidId
+from mediagoblin.db.util import ObjectId
 from mediagoblin.db.sql.models import User
 from mediagoblin.tools.response import redirect, render_404
 
@@ -134,14 +134,10 @@ def get_user_media_entry(controller):
 
         # no media via slug?  Grab it via ObjectId
         if not media:
-            try:
-                media = request.db.MediaEntry.find_one(
+            media = request.db.MediaEntry.find_one(
                     {'id': ObjectId(request.matchdict['media']),
                      'state': u'processed',
                      'uploader': user.id})
-            except InvalidId:
-                return render_404(request)
-
             # Still no media?  Okay, 404.
             if not media:
                 return render_404(request)
@@ -210,13 +206,9 @@ def get_media_entry_by_id(controller):
     """
     @wraps(controller)
     def wrapper(request, *args, **kwargs):
-        try:
-            media = request.db.MediaEntry.find_one(
+        media = request.db.MediaEntry.find_one(
                 {'id': ObjectId(request.matchdict['media']),
                  'state': u'processed'})
-        except InvalidId:
-            return render_404(request)
-
         # Still no media?  Okay, 404.
         if not media:
             return render_404(request)
diff --git a/mediagoblin/tools/request.py b/mediagoblin/tools/request.py
index 66d7ffa3..a58d919d 100644
--- a/mediagoblin/tools/request.py
+++ b/mediagoblin/tools/request.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from mediagoblin.db.util import ObjectId, InvalidId
+from mediagoblin.db.util import ObjectId
 
 _log = logging.getLogger(__name__)
 
@@ -29,17 +29,11 @@ def setup_user_in_request(request):
         request.user = None
         return
 
-    try:
-        oid = ObjectId(request.session['user_id'])
-    except InvalidId:
-        user = None
-    else:
-        user = request.db.User.find_one({'id': oid})
+    request.user = User.query.get(request.session['user_id'])
 
-    if not user:
+    if not request.user:
         # Something's wrong... this user doesn't exist?  Invalidate
         # this session.
         _log.warn("Killing session for user id %r", request.session['user_id'])
         request.session.invalidate()
 
-    request.user = user