Fixed conflict in /auth/views.py.

3 files changed, 5 insertions, 4 deletions

diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py
index 6339b4a3..a932ad26 100644
--- a/mediagoblin/auth/forms.py
+++ b/mediagoblin/auth/forms.py
@@ -17,7 +17,7 @@
 import wtforms
 import re
 
-from mediagoblin.util import fake_ugettext_passthrough as _
+from mediagoblin.tools.translate import fake_ugettext_passthrough as _
 
 
 class RegistrationForm(wtforms.Form):
diff --git a/mediagoblin/auth/lib.py b/mediagoblin/auth/lib.py
index d7d351a5..4c57ef88 100644
--- a/mediagoblin/auth/lib.py
+++ b/mediagoblin/auth/lib.py
@@ -19,7 +19,8 @@ import random
 
 import bcrypt
 
-from mediagoblin.util import send_email, render_template
+from mediagoblin.tools.mail import send_email
+from mediagoblin.tools.template import render_template
 from mediagoblin import mg_globals
 
 
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index fdc5aec8..798fae25 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -21,8 +21,8 @@ from webob import exc
 
 from mediagoblin import messages
 from mediagoblin import mg_globals
-from mediagoblin.util import render_to_response, redirect, render_404, setup_user_in_request
-from mediagoblin.util import pass_to_ugettext as _
+from mediagoblin.tools.response import render_to_response, redirect, render_404
+from mediagoblin.tools.translate import pass_to_ugettext as _
 from mediagoblin.db.util import ObjectId, InvalidId
 from mediagoblin.auth import lib as auth_lib
 from mediagoblin.auth import forms as auth_forms