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.

diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index 30615fcadcf272f4dd0a778f6416caec055f538f..470da531ba7c0736812dc505f6255017be283706 100644 (file)
--- 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 c2fe3f9fdbf0bd7db962e197589b0f1c6e8aadfc..081eda623f08c0d386d903bfbc9e4234aed4dba4 100644 (file)
--- 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):