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.
import mongokit
+from pymongo import DESCENDING
+from mongokit import ObjectId
def connect_database(app_config):
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import Image
-import mongokit
+from mediagoblin.db.util import ObjectId
from celery.task import task
from mediagoblin.globals import database, queue_store, public_store
@task
def process_media_initial(media_id):
entry = database.MediaEntry.one(
- {'_id': mongokit.ObjectId(media_id)})
+ {'_id': ObjectId(media_id)})
queued_filepath = entry['queued_media_file']
queued_file = queue_store.get_file(queued_filepath, 'r')
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from webob import Response, exc
-from pymongo import DESCENDING
-from mongokit import ObjectId
+from mediagoblin.db.util import ObjectId, DESCENDING
import wtforms
import sys
import re
import jinja2
-import mongokit
+from mediagoblin.db.util import ObjectId
import translitcodec
from mediagoblin import globals as mgoblin_globals
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
from webob import Response, exc
import wtforms
-from pymongo import DESCENDING
-from mongokit import ObjectId
from mediagoblin.db import models
+from mediagoblin.db.util import ObjectId, DESCENDING
import gettext
def root_view(request):