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.
This commit is contained in:
parent
a4bae8700e
commit
254bc43174
@ -1,4 +1,6 @@
|
|||||||
import mongokit
|
import mongokit
|
||||||
|
from pymongo import DESCENDING
|
||||||
|
from mongokit import ObjectId
|
||||||
|
|
||||||
|
|
||||||
def connect_database(app_config):
|
def connect_database(app_config):
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import Image
|
import Image
|
||||||
import mongokit
|
from mediagoblin.db.util import ObjectId
|
||||||
from celery.task import task
|
from celery.task import task
|
||||||
|
|
||||||
from mediagoblin.globals import database, queue_store, public_store
|
from mediagoblin.globals import database, queue_store, public_store
|
||||||
@ -27,7 +27,7 @@ THUMB_SIZE = 200, 200
|
|||||||
@task
|
@task
|
||||||
def process_media_initial(media_id):
|
def process_media_initial(media_id):
|
||||||
entry = database.MediaEntry.one(
|
entry = database.MediaEntry.one(
|
||||||
{'_id': mongokit.ObjectId(media_id)})
|
{'_id': ObjectId(media_id)})
|
||||||
|
|
||||||
queued_filepath = entry['queued_media_file']
|
queued_filepath = entry['queued_media_file']
|
||||||
queued_file = queue_store.get_file(queued_filepath, 'r')
|
queued_file = queue_store.get_file(queued_filepath, 'r')
|
||||||
|
@ -15,8 +15,7 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from webob import Response, exc
|
from webob import Response, exc
|
||||||
from pymongo import DESCENDING
|
from mediagoblin.db.util import ObjectId, DESCENDING
|
||||||
from mongokit import ObjectId
|
|
||||||
import wtforms
|
import wtforms
|
||||||
|
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ import smtplib
|
|||||||
import sys
|
import sys
|
||||||
import re
|
import re
|
||||||
import jinja2
|
import jinja2
|
||||||
import mongokit
|
from mediagoblin.db.util import ObjectId
|
||||||
import translitcodec
|
import translitcodec
|
||||||
|
|
||||||
from mediagoblin import globals as mgoblin_globals
|
from mediagoblin import globals as mgoblin_globals
|
||||||
@ -83,7 +83,7 @@ def setup_user_in_request(request):
|
|||||||
|
|
||||||
user = None
|
user = None
|
||||||
user = request.app.db.User.one(
|
user = request.app.db.User.one(
|
||||||
{'_id': mongokit.ObjectId(request.session['user_id'])})
|
{'_id': ObjectId(request.session['user_id'])})
|
||||||
|
|
||||||
if not user:
|
if not user:
|
||||||
# Something's wrong... this user doesn't exist? Invalidate
|
# Something's wrong... this user doesn't exist? Invalidate
|
||||||
|
@ -18,9 +18,8 @@ import datetime
|
|||||||
|
|
||||||
from webob import Response, exc
|
from webob import Response, exc
|
||||||
import wtforms
|
import wtforms
|
||||||
from pymongo import DESCENDING
|
|
||||||
from mongokit import ObjectId
|
|
||||||
from mediagoblin.db import models
|
from mediagoblin.db import models
|
||||||
|
from mediagoblin.db.util import ObjectId, DESCENDING
|
||||||
import gettext
|
import gettext
|
||||||
|
|
||||||
def root_view(request):
|
def root_view(request):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user