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.

diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index 89e0dbef9c61732872cdbfef45781369339ede17..56f22d7ea864038d6ec3585fa428b0ffe378b662 100644 (file)
--- a/mediagoblin/db/util.py
+++ b/mediagoblin/db/util.py
@@ -1,4 +1,6 @@
 import mongokit
+from pymongo import DESCENDING
+from mongokit import ObjectId
 
 
 def connect_database(app_config):

diff --git a/mediagoblin/process_media/__init__.py b/mediagoblin/process_media/__init__.py
index 3c4d0ca1cb430eaba23324e3b299f6034c303838..4f06a6868f70a8ab56511fa3892987088062fa7a 100644 (file)
--- a/mediagoblin/process_media/__init__.py
+++ b/mediagoblin/process_media/__init__.py
@@ -15,7 +15,7 @@
 # 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
@@ -27,7 +27,7 @@ THUMB_SIZE = 200, 200
 @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')

diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index c99556c2cddbf8bab938628e521d8e022adebc6c..1ab3c8ef9942e6f7603beb07802383b1434f7933 100644 (file)
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -15,8 +15,7 @@
 # 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
 
 

diff --git a/mediagoblin/util.py b/mediagoblin/util.py
index a66e2ba5bd29dd2e4c5ec174614e2f0a46357b11..680ff62e3f27d7e96ed27f8696d48a4d891b93c5 100644 (file)
--- 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

diff --git a/mediagoblin/views.py b/mediagoblin/views.py
index 60d349081bfd6d7b5122e146f28185c4e629e420..5bc04b66d4fbebb749bf566102b2163ab653fc03 100644 (file)
--- a/mediagoblin/views.py
+++ b/mediagoblin/views.py
@@ -18,9 +18,8 @@ import datetime
 
 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):