Merge a8c7ced into e965cc3

pybossa/api/__init__.py

@@ -33,7 +33,7 @@
 import jwt
 from flask import Blueprint, request, abort, Response, make_response
 from flask import current_app
-from flask.ext.login import current_user
+from flask_login import current_user
 from werkzeug.exceptions import NotFound
 from pybossa.util import jsonpify, get_user_id_or_ip, fuzzyboolean
 from pybossa.util import get_disqus_sso_payload

pybossa/api/announcement.py

@@ -25,7 +25,7 @@
 from api_base import APIBase
 from pybossa.model.announcement import Announcement
 from pybossa.core import user_repo, project_repo
-from flask.ext.login import current_user
+from flask_login import current_user
 from werkzeug.exceptions import BadRequest, NotFound
 
 

pybossa/api/api_base.py

@@ -28,7 +28,7 @@
 """
 import json
 from flask import request, abort, Response, current_app
-from flask.ext.login import current_user
+from flask_login import current_user
 from flask.views import MethodView
 from werkzeug.exceptions import NotFound, Unauthorized, Forbidden
 from werkzeug.exceptions import MethodNotAllowed

pybossa/api/blogpost.py

@@ -25,7 +25,7 @@
 from api_base import APIBase
 from pybossa.model.blogpost import Blogpost
 from pybossa.core import user_repo, project_repo
-from flask.ext.login import current_user
+from flask_login import current_user
 from werkzeug.exceptions import BadRequest, NotFound
 
 

pybossa/api/favorites.py

@@ -25,7 +25,7 @@
 import json
 from api_base import APIBase
 from pybossa.core import task_repo
-from flask.ext.login import current_user, request
+from flask_login import current_user, request
 from flask import Response, abort
 from werkzeug.exceptions import MethodNotAllowed, NotFound, Unauthorized
 from pybossa.core import ratelimits

pybossa/api/helpingmaterial.py

@@ -24,7 +24,7 @@
 """
 from api_base import APIBase
 from pybossa.model.helpingmaterial import HelpingMaterial
-from flask.ext.login import current_user
+from flask_login import current_user
 from werkzeug.exceptions import BadRequest
 
 

pybossa/api/project.py

@@ -24,7 +24,7 @@
 """
 import copy
 from werkzeug.exceptions import BadRequest, Forbidden
-from flask.ext.login import current_user
+from flask_login import current_user
 from api_base import APIBase
 from pybossa.model.project import Project
 from pybossa.cache.categories import get_all as get_categories
@@ -108,4 +108,3 @@ def _select_attributes(self, data):
         else:
             data = self._filter_private_data(data)
             return data
-

pybossa/api/task_run.py

@@ -25,7 +25,7 @@
 import json
 import time
 from flask import request, Response, current_app
-from flask.ext.login import current_user
+from flask_login import current_user
 from pybossa.model.task_run import TaskRun
 from werkzeug.exceptions import Forbidden, BadRequest
 

pybossa/api/token.py

@@ -25,7 +25,7 @@
 import json
 from werkzeug.exceptions import MethodNotAllowed, NotFound
 from flask import Response
-from flask.ext.login import current_user
+from flask_login import current_user
 from pybossa.util import jsonpify
 from pybossa.ratelimit import ratelimit
 from api_base import APIBase, error

pybossa/api/user.py

@@ -26,7 +26,7 @@
 from pybossa.model.user import User
 from werkzeug.exceptions import MethodNotAllowed
 from flask import request
-from flask.ext.login import current_user
+from flask_login import current_user
 
 
 class UserAPI(APIBase):

pybossa/auth/__init__.py

@@ -18,7 +18,7 @@
 
 import inspect
 from flask import abort
-from flask.ext.login import current_user
+from flask_login import current_user
 from pybossa.core import announcement_repo, task_repo, project_repo, result_repo
 from pybossa.core import project_stats_repo
 from pybossa.auth.errcodes import *

pybossa/cache/project_stats.py

@@ -22,7 +22,7 @@
 from pybossa.cache import memoize, ONE_DAY, FIVE_MINUTES
 import pybossa.cache.projects as cached_projects
 from pybossa.model.project_stats import ProjectStats
-from flask.ext.babel import gettext
+from flask_babel import gettext
 
 import operator
 import time

pybossa/core.py

@@ -21,9 +21,9 @@
 import humanize
 from flask import Flask, url_for, request, render_template, \
     flash, _app_ctx_stack, abort
-from flask.ext.login import current_user
-from flask.ext.babel import gettext
-from flask.ext.assets import Bundle
+from flask_login import current_user
+from flask_babel import gettext
+from flask_assets import Bundle
 from flask_json_multidict import get_json_multidict
 from pybossa import default_settings as settings
 from pybossa.extensions import *
@@ -694,7 +694,7 @@ def setup_newsletter(app):
 
 def setup_assets(app):
     """Setup assets."""
-    from flask.ext.assets import Environment
+    from flask_assets import Environment
     assets = Environment(app)
 
 

pybossa/extensions.py

@@ -49,7 +49,7 @@
 sentinel = Sentinel()
 
 # DB
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 db = SQLAlchemy()
 db.slave_session = db.session
 
@@ -68,15 +68,15 @@
 signer = Signer()
 
 # Mail
-from flask.ext.mail import Mail
+from flask_mail import Mail
 mail = Mail()
 
 # Login Manager
-from flask.ext.login import LoginManager
+from flask_login import LoginManager
 login_manager = LoginManager()
 
 # Debug Toolbar
-from flask.ext.debugtoolbar import DebugToolbarExtension
+from flask_debugtoolbar import DebugToolbarExtension
 debug_toolbar = DebugToolbarExtension()
 
 # OAuth providers
@@ -93,11 +93,11 @@
 flickr = Flickr()
 
 # Markdown support
-from flask.ext.misaka import Misaka
+from flask_misaka import Misaka
 misaka = Misaka()
 
 # Babel
-from flask.ext.babel import Babel
+from flask_babel import Babel
 babel = Babel()
 
 # Uploader
@@ -125,10 +125,10 @@
 from importers import Importer
 importer = Importer()
 
-from flask.ext.plugins import PluginManager
+from flask_plugins import PluginManager
 plugin_manager = PluginManager()
 
-from flask.ext.assets import Environment
+from flask_assets import Environment
 assets = Environment()
 
 from flask.json import JSONEncoder as BaseEncoder

pybossa/forms/forms.py

@@ -23,7 +23,7 @@
     SelectField, validators, TextAreaField, PasswordField, FieldList, SelectMultipleField
 from wtforms.fields.html5 import EmailField, URLField
 from wtforms.widgets import HiddenInput
-from flask.ext.babel import lazy_gettext, gettext
+from flask_babel import lazy_gettext, gettext
 
 from pybossa.core import project_repo, user_repo
 from pybossa.sched import sched_variants
@@ -35,7 +35,7 @@
 from pybossa.core import uploader
 from pybossa.uploader import local
 from flask import safe_join
-from flask.ext.login import current_user
+from flask_login import current_user
 import os
 from pybossa.forms.fields.time_field import TimeField
 from validator import TimeFieldsValidator

pybossa/forms/validator.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with PYBOSSA.  If not, see <http://www.gnu.org/licenses/>.
 
-from flask.ext.babel import lazy_gettext
+from flask_babel import lazy_gettext
 from wtforms.validators import ValidationError
 import re
 import requests

pybossa/importers/csv.py

@@ -18,7 +18,7 @@
 
 import requests
 from StringIO import StringIO
-from flask.ext.babel import gettext
+from flask_babel import gettext
 from pybossa.util import unicode_csv_reader
 
 from .base import BulkTaskImport, BulkImportException

pybossa/importers/epicollect.py

@@ -18,7 +18,7 @@
 
 import json
 import requests
-from flask.ext.babel import gettext
+from flask_babel import gettext
 
 from .base import BulkTaskImport, BulkImportException
 

pybossa/importers/importer.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with PYBOSSA.  If not, see <http://www.gnu.org/licenses/>.
 
-from flask.ext.babel import gettext
+from flask_babel import gettext
 from .csv import BulkTaskCSVImport, BulkTaskGDImport, BulkTaskLocalCSVImport
 from .dropbox import BulkTaskDropboxImport
 from .flickr import BulkTaskFlickrImport

pybossa/importers/youtubeapi.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with PYBOSSA.  If not, see <http://www.gnu.org/licenses/>.
 from .base import BulkTaskImport, BulkImportException
-from flask.ext.babel import gettext
+from flask_babel import gettext
 from apiclient.discovery import build
 from apiclient.errors import HttpError
 from urlparse import urlparse, parse_qs

pybossa/jobs.py

@@ -20,7 +20,7 @@
 import math
 import requests
 from flask import current_app, render_template
-from flask.ext.mail import Message
+from flask_mail import Message
 from pybossa.core import mail, task_repo, importer, create_app
 from pybossa.model.webhook import Webhook
 from pybossa.util import with_cache_disabled, publish_channel
@@ -466,7 +466,7 @@ def warn_old_project_owners():
     from smtplib import SMTPRecipientsRefused
     from pybossa.core import mail, project_repo
     from pybossa.cache.projects import clean
-    from flask.ext.mail import Message
+    from flask_mail import Message
 
     projects = get_non_updated_projects()
 

pybossa/model/user.py

@@ -21,7 +21,7 @@
 from sqlalchemy.orm import relationship
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.ext.mutable import MutableDict
-from flask.ext.login import UserMixin
+from flask_login import UserMixin
 from flask import current_app
 
 from pybossa.core import db, signer

pybossa/password_manager.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with PYBOSSA.  If not, see <http://www.gnu.org/licenses/>.
 """Module for password protect a project."""
-from flask.ext.login import current_user
+from flask_login import current_user
 
 
 class ProjectPasswdManager(object):

pybossa/util.py

@@ -27,7 +27,7 @@
 from flask import redirect, render_template, jsonify, get_flashed_messages
 from flask_wtf.csrf import generate_csrf
 from functools import wraps
-from flask.ext.login import current_user
+from flask_login import current_user
 from sqlalchemy import text
 from sqlalchemy.exc import ProgrammingError
 from math import ceil
@@ -37,7 +37,7 @@
 import hmac
 import simplejson
 import time
-from flask.ext.babel import lazy_gettext
+from flask_babel import lazy_gettext
 import re
 import pycountry
 
@@ -516,7 +516,9 @@ def get_avatar_url(upload_method, avatar, container, external):
                        container=container)
     else:
         filename = container + '/' + avatar
-        return url_for('uploads.uploaded_file', filename=filename,
+        return url_for('uploads.uploaded_file',
+                       filename=filename,
+                       _scheme=current_app.config.get('PREFERRED_URL_SCHEME'),
                        _external=external)
 
 

pybossa/view/account.py

@@ -32,12 +32,12 @@
 
 from flask import Blueprint, request, url_for, flash, redirect, abort
 from flask import render_template, current_app
-from flask.ext.login import login_required, login_user, logout_user, \
+from flask_login import login_required, login_user, logout_user, \
     current_user
 from rq import Queue
 
 import pybossa.model as model
-from flask.ext.babel import gettext
+from flask_babel import gettext
 from flask_wtf.csrf import generate_csrf
 from flask import jsonify
 from pybossa.core import signer, uploader, sentinel, newsletter
@@ -263,7 +263,14 @@ def signout():
 def get_email_confirmation_url(account):
     """Return confirmation url for a given user email."""
     key = signer.dumps(account, salt='account-validation')
-    return url_for_app_type('.confirm_account', key=key, _external=True)
+    scheme = current_app.config.get('PREFERRED_URL_SCHEME')
+    if (scheme):
+        return url_for_app_type('.confirm_account',
+                                key=key,
+                                _scheme=scheme,
+                                _external=True)
+    else:
+        return url_for_app_type('.confirm_account', key=key, _external=True)
 
 
 @blueprint.route('/confirm-email')

pybossa/view/admin.py

@@ -27,8 +27,8 @@
 from flask import current_app
 from flask import Response
 from flask import Markup
-from flask.ext.login import login_required, current_user
-from flask.ext.babel import gettext
+from flask_login import login_required, current_user
+from flask_babel import gettext
 from flask_wtf.csrf import generate_csrf
 from werkzeug.exceptions import HTTPException
 from sqlalchemy.exc import ProgrammingError

pybossa/view/announcements.py

@@ -18,7 +18,7 @@
 """Announcements view for PYBOSSA."""
 from flask import Blueprint, current_app
 from flask import render_template
-from flask.ext.login import current_user
+from flask_login import current_user
 from pybossa.cache import users as cached_users
 from pybossa.util import handle_content_type
 from pybossa.core import announcement_repo

pybossa/view/facebook.py

@@ -19,7 +19,7 @@
 """Facebook view for PYBOSSA."""
 from flask import Blueprint, request, url_for, flash, redirect, session, current_app
 from flask import abort
-from flask.ext.login import login_user, current_user
+from flask_login import login_user, current_user
 from flask_oauthlib.client import OAuthException
 
 from pybossa.core import facebook, user_repo, newsletter

pybossa/view/google.py

@@ -19,7 +19,7 @@
 """Google view for PYBOSSA."""
 from flask import Blueprint, request, url_for, flash, redirect, session, current_app
 from flask import abort
-from flask.ext.login import login_user, current_user
+from flask_login import login_user, current_user
 from flask_oauthlib.client import OAuthException
 
 from pybossa.core import google, user_repo, newsletter

pybossa/view/home.py

@@ -17,7 +17,7 @@
 # along with PYBOSSA.  If not, see <http://www.gnu.org/licenses/>.
 """Home view for PYBOSSA."""
 from flask import current_app, abort
-from flask.ext.login import current_user
+from flask_login import current_user
 from pybossa.model.category import Category
 from flask import Blueprint
 from flask import render_template