aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2011-06-20 00:09:40 +0200
committerElrond <elrond+mediagoblin.org@samba-tng.org>2011-06-20 00:09:40 +0200
commit3efdd97c2e3e3af3b9c74e6ab217fd57088e9dfa (patch)
treebe537228bacb5e9887834e1ebc464e2260f48ef7 /mediagoblin
parent188240e312b8c5ff50bef276c97b36e5b3835f1e (diff)
downloadmediagoblin-3efdd97c2e3e3af3b9c74e6ab217fd57088e9dfa.tar.lz
mediagoblin-3efdd97c2e3e3af3b9c74e6ab217fd57088e9dfa.tar.xz
mediagoblin-3efdd97c2e3e3af3b9c74e6ab217fd57088e9dfa.zip
Move InvalidId to db.util
Instead of import InvalidId from the low level bson module, first import it in our db.util wrapper and second import it from pymongo.errors.
Diffstat (limited to 'mediagoblin')
-rw-r--r--mediagoblin/db/util.py1
-rw-r--r--mediagoblin/decorators.py3
2 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index 30615fca..470da531 100644
--- a/mediagoblin/db/util.py
+++ b/mediagoblin/db/util.py
@@ -17,4 +17,5 @@
# Imports that other modules might use
from pymongo import DESCENDING
+from pymongo.errors import InvalidId
from mongokit import ObjectId
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index c2fe3f9f..081eda62 100644
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -15,11 +15,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from bson.errors import InvalidId
from webob import exc
from mediagoblin.util import redirect
-from mediagoblin.db.util import ObjectId
+from mediagoblin.db.util import ObjectId, InvalidId
def _make_safe(decorator, original):