From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Thu, 2 Jun 2011 13:47:30 +0000 (-0500)
Subject: Elrond put that ObjectId thing in the db.util module and wants us to
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e0f8487005f4e9adca41648d35bb8dc6db850032;p=mediagoblin.git

Elrond put that ObjectId thing in the db.util module and wants us to
use that one ;)
---

diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index 4ccd3d86..0c125544 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -14,9 +14,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import bson.objectid
 from webob import Response, exc
 
+from mediagoblin.db.util import ObjectId
 from mediagoblin.auth import lib as auth_lib
 from mediagoblin.auth import forms as auth_forms
 from mediagoblin.util import send_email
@@ -154,7 +154,7 @@ def verify_email(request):
         return exc.HTTPNotFound()
 
     user = request.db.User.find_one(
-        {'_id': bson.objectid.ObjectId(unicode(request.GET['userid']))})
+        {'_id': ObjectId(unicode(request.GET['userid']))})
 
     verification_successful = bool