Use six.text_type instead of unicode().
I will be switch to use ``from __future__ import unicode_literals`` later.
This commit is contained in:
@@ -16,6 +16,8 @@
|
||||
|
||||
|
||||
import logging
|
||||
|
||||
import six
|
||||
import wtforms
|
||||
from sqlalchemy import or_
|
||||
|
||||
@@ -140,7 +142,7 @@ def register_user(request, register_form):
|
||||
user.save()
|
||||
|
||||
# log the user in
|
||||
request.session['user_id'] = unicode(user.id)
|
||||
request.session['user_id'] = six.text_type(user.id)
|
||||
request.session.save()
|
||||
|
||||
# send verification email
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
# 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 six
|
||||
|
||||
from itsdangerous import BadSignature
|
||||
|
||||
from mediagoblin import messages, mg_globals
|
||||
@@ -93,7 +95,7 @@ def login(request):
|
||||
# set up login in session
|
||||
if login_form.stay_logged_in.data:
|
||||
request.session['stay_logged_in'] = True
|
||||
request.session['user_id'] = unicode(user.id)
|
||||
request.session['user_id'] = six.text_type(user.id)
|
||||
request.session.save()
|
||||
|
||||
if request.form.get('next'):
|
||||
|
||||
Reference in New Issue
Block a user