aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/util.py
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2011-05-18 11:32:29 +0200
committerElrond <elrond+mediagoblin.org@samba-tng.org>2011-05-18 11:32:29 +0200
commit254bc43174ecad984ce895c10e6be7926c52cc22 (patch)
tree641c533b47c4725a95aba28d2caa26e6b15174cc /mediagoblin/util.py
parenta4bae8700e2186adb91d5c0a5198e7a8923143c6 (diff)
downloadmediagoblin-254bc43174ecad984ce895c10e6be7926c52cc22.tar.lz
mediagoblin-254bc43174ecad984ce895c10e6be7926c52cc22.tar.xz
mediagoblin-254bc43174ecad984ce895c10e6be7926c52cc22.zip
Move ObjectId, DESCENDING to db.util
We used to import those from pymongo and mongokit directly. We should import them from a single place. So let's try db.util for this.
Diffstat (limited to 'mediagoblin/util.py')
-rw-r--r--mediagoblin/util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/util.py b/mediagoblin/util.py
index a66e2ba5..680ff62e 100644
--- a/mediagoblin/util.py
+++ b/mediagoblin/util.py
@@ -21,7 +21,7 @@ import smtplib
import sys
import re
import jinja2
-import mongokit
+from mediagoblin.db.util import ObjectId
import translitcodec
from mediagoblin import globals as mgoblin_globals
@@ -83,7 +83,7 @@ def setup_user_in_request(request):
user = None
user = request.app.db.User.one(
- {'_id': mongokit.ObjectId(request.session['user_id'])})
+ {'_id': ObjectId(request.session['user_id'])})
if not user:
# Something's wrong... this user doesn't exist? Invalidate