Conflicts:

	mediagoblin/auth/tools.py
	mediagoblin/auth/views.py
	mediagoblin/plugins/basic_auth/tools.py

2 files changed, 20 insertions, 0 deletions

diff --git a/mediagoblin/auth/tools.py b/mediagoblin/auth/tools.py
index e2c84347..48e0d572 100644
--- a/mediagoblin/auth/tools.py
+++ b/mediagoblin/auth/tools.py
@@ -17,6 +17,7 @@
 import logging
 
 import wtforms
+from sqlalchemy import or_
 
 from mediagoblin import mg_globals
 from mediagoblin.db.models import User
@@ -33,6 +34,8 @@ _log = logging.getLogger(__name__)
 
 _log = logging.getLogger(__name__)
 
+_log = logging.getLogger(__name__)
+
 
 def normalize_user_or_email_field(allow_email=True, allow_user=True):
     """
@@ -193,6 +196,7 @@ def register_user(request, register_form):
         # send verification email
         email_debug_message(request)
         send_verification_email(user, request)
+
         return user
 
     return None
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index f063add8..d2220cb7 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -22,12 +22,20 @@ from mediagoblin.db.models import User
 from mediagoblin.tools.response import render_to_response, redirect, render_404
 from mediagoblin.tools.translate import pass_to_ugettext as _
 from mediagoblin.tools.mail import email_debug_message
+<<<<<<< HEAD
 from mediagoblin.auth import forms as auth_forms
 from mediagoblin.auth.tools import (send_verification_email,
                                     register_user,
                                     send_fp_verification_email,
                                     check_login_simple)
 from mediagoblin import auth
+=======
+from mediagoblin.auth import lib as auth_lib
+from mediagoblin.auth import forms as auth_forms
+from mediagoblin.auth.lib import send_fp_verification_email
+from mediagoblin.auth.tools import (send_verification_email, register_user,
+                                    check_login_simple)
+>>>>>>> upstream/master
 
 
 def register(request):
@@ -93,10 +101,18 @@ def login(request):
     login_failed = False
 
     if request.method == 'POST':
+<<<<<<< HEAD
         username = login_form.username.data
 
         if login_form.validate():
             user = check_login_simple(username, login_form.password.data)
+=======
+
+        username = login_form.data['username']
+
+        if login_form.validate():
+            user = check_login_simple(username, login_form.password.data, True)
+>>>>>>> upstream/master
 
             if user:
                 # set up login in session