pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update flask, flask-{login,principal,babel,assets} versions to the latest, flask.ext. => flask_

Browse source
This commit is contained in:
Kyle Evans 2016-10-06 20:25:04 -05:00
parent f1891fedb4
commit bb2fcd5b00
13 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
setup.py
View file

@ -14,15 +14,15 @@ import octoprint_setuptools
# Requirements for our application
INSTALL_REQUIRES = [
"flask>=0.9,<0.11",
"flask>=0.11,<0.12",
"werkzeug>=0.8.3,<0.9",
"tornado>=4.0.2,<4.1",
"sockjs-tornado>=1.0.2,<1.1",
"PyYAML>=3.10,<3.11",
"Flask-Login>=0.2.2,<0.3",
"Flask-Principal>=0.3.5,<0.4",
"Flask-Babel>=0.9,<0.10",
"Flask-Assets>=0.10,<0.11",
"Flask-Login>=0.3,<0.4",
"Flask-Principal>=0.4,<0.5",
"Flask-Babel>=0.11,<0.12",
"Flask-Assets>=0.12,<0.13",
"markdown>=2.6.4,<2.7",
"pyserial>=2.7,<2.8",
"netaddr>=0.7.17,<0.8",

2
src/octoprint/plugin/types.py
View file

@ -1373,7 +1373,7 @@ class SettingsPlugin(OctoPrintPlugin):
:return: the current settings of the plugin, as a dictionary
"""
from flask.ext.login import current_user
from flask_login import current_user
data = self._settings.get_all_data()
if self.config_version_key in data:

2
src/octoprint/plugins/announcements/__init__.py
View file

@ -20,7 +20,7 @@ import flask
from octoprint.server import admin_permission
from octoprint.server.util.flask import restricted_access, with_revalidation_checking, check_etag
from flask.ext.babel import gettext
from flask_babel import gettext
class AnnouncementPlugin(octoprint.plugin.AssetPlugin,
octoprint.plugin.SettingsPlugin,

2
src/octoprint/plugins/corewizard/__init__.py
View file

@ -9,7 +9,7 @@ __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms
import octoprint.plugin
from flask.ext.babel import gettext
from flask_babel import gettext
class CoreWizardPlugin(octoprint.plugin.AssetPlugin,

2
src/octoprint/plugins/pluginmanager/__init__.py
View file

@ -15,7 +15,7 @@ from octoprint.server import admin_permission, VERSION
from octoprint.util.pip import LocalPipCaller, UnknownPip
from flask import jsonify, make_response
from flask.ext.babel import gettext
from flask_babel import gettext
import logging
import sarge

4
src/octoprint/plugins/softwareupdate/__init__.py
View file

@ -491,7 +491,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin,
##~~ TemplatePlugin API
def get_template_configs(self):
from flask.ext.babel import gettext
from flask_babel import gettext
return [
dict(type="settings", name=gettext("Software Update"))
]
@ -806,7 +806,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin,
result = dict(check)
if target == "octoprint":
from flask.ext.babel import gettext
from flask_babel import gettext
result["displayName"] = check.get("displayName", gettext("OctoPrint"))
result["displayVersion"] = check.get("displayVersion", "{octoprint_version}")

8
src/octoprint/server/__init__.py
View file

@ -8,10 +8,10 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms
import uuid
from sockjs.tornado import SockJSRouter
from flask import Flask, g, request, session, Blueprint, Request, Response
from flask.ext.login import LoginManager, current_user
from flask.ext.principal import Principal, Permission, RoleNeed, identity_loaded, UserNeed
from flask.ext.babel import Babel, gettext, ngettext
from flask.ext.assets import Environment, Bundle
from flask_login import LoginManager, current_user
from flask_principal import Principal, Permission, RoleNeed, identity_loaded, UserNeed
from flask_babel import Babel, gettext, ngettext
from flask_assets import Environment, Bundle
from babel import Locale
from watchdog.observers import Observer
from watchdog.observers.polling import PollingObserver

4
src/octoprint/server/api/__init__.py
View file

@ -10,8 +10,8 @@ import netaddr
import sarge
from flask import Blueprint, request, jsonify, abort, current_app, session, make_response, g
from flask.ext.login import login_user, logout_user, current_user
from flask.ext.principal import Identity, identity_changed, AnonymousIdentity
from flask_login import login_user, logout_user, current_user
from flask_principal import Identity, identity_changed, AnonymousIdentity
import octoprint.util as util
import octoprint.users

2
src/octoprint/server/api/languages.py
View file

@ -26,7 +26,7 @@ from octoprint.server.util.flask import restricted_access
from octoprint.plugin import plugin_manager
from flask.ext.babel import Locale
from flask_babel import Locale
@api.route("/languages", methods=["GET"])
@restricted_access

2
src/octoprint/server/api/system.py
View file

@ -9,7 +9,7 @@ import logging
import sarge
from flask import request, make_response, jsonify, url_for
from flask.ext.babel import gettext
from flask_babel import gettext
from octoprint.settings import settings as s

2
src/octoprint/server/api/users.py
View file

@ -7,7 +7,7 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms
from flask import request, jsonify, abort, make_response
from werkzeug.exceptions import BadRequest
from flask.ext.login import current_user
from flask_login import current_user
import octoprint.users as users

42
src/octoprint/server/util/flask.py
View file

@ -8,9 +8,9 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms
import tornado.web
import flask
import flask.ext.login
import flask.ext.principal
import flask.ext.assets
import flask_login
import flask_principal
import flask_assets
import webassets.updater
import webassets.utils
import functools
@ -40,7 +40,7 @@ def enable_additional_translations(default_locale="en", additional_folders=None)
import os
from flask import _request_ctx_stack
from babel import support, Locale
import flask.ext.babel
import flask_babel
if additional_folders is None:
additional_folders = []
@ -85,7 +85,7 @@ def enable_additional_translations(default_locale="en", additional_folders=None)
return None
translations = getattr(ctx, 'babel_translations', None)
if translations is None:
locale = flask.ext.babel.get_locale()
locale = flask_babel.get_locale()
translations = support.Translations()
if str(locale) != default_locale:
@ -123,8 +123,8 @@ def enable_additional_translations(default_locale="en", additional_folders=None)
ctx.babel_translations = translations
return translations
flask.ext.babel.Babel.list_translations = fixed_list_translations
flask.ext.babel.get_translations = fixed_get_translations
flask_babel.Babel.list_translations = fixed_list_translations
flask_babel.get_translations = fixed_get_translations
def fix_webassets_cache():
from webassets import cache
@ -426,12 +426,12 @@ class OctoPrintFlaskResponse(flask.Response):
def passive_login():
if octoprint.server.userManager.enabled:
user = octoprint.server.userManager.login_user(flask.ext.login.current_user)
user = octoprint.server.userManager.login_user(flask_login.current_user)
else:
user = flask.ext.login.current_user
user = flask_login.current_user
if user is not None and not user.is_anonymous():
flask.ext.principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask.ext.principal.Identity(user.get_id()))
if user is not None and not user.is_anonymous:
flask_principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask_principal.Identity(user.get_id()))
if hasattr(user, "get_session"):
flask.session["usersession.id"] = user.get_session()
flask.g.user = user
@ -453,8 +453,8 @@ def passive_login():
user = octoprint.server.userManager.login_user(user)
flask.session["usersession.id"] = user.get_session()
flask.g.user = user
flask.ext.login.login_user(user)
flask.ext.principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask.ext.principal.Identity(user.get_id()))
flask_login.login_user(user)
flask_principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask_principal.Identity(user.get_id()))
return flask.jsonify(user.asDict())
except:
logger = logging.getLogger(__name__)
@ -999,14 +999,14 @@ def _get_flask_user_from_request(request):
:return: the user or None if no user could be determined
"""
import octoprint.server.util
import flask.ext.login
import flask_login
from octoprint.settings import settings
apikey = octoprint.server.util.get_api_key(request)
if settings().getBoolean(["api", "enabled"]) and apikey is not None:
user = octoprint.server.util.get_user_for_apikey(apikey)
else:
user = flask.ext.login.current_user
user = flask_login.current_user
return user
@ -1061,7 +1061,7 @@ def restricted_access(func):
apikey = octoprint.server.util.get_api_key(flask.request)
if apikey == octoprint.server.UI_API_KEY:
# UI API key => call regular login_required decorator, we are using browser sessions here
return flask.ext.login.login_required(func)(*args, **kwargs)
return flask_login.login_required(func)(*args, **kwargs)
# try to determine user for key
user = octoprint.server.util.get_user_for_apikey(apikey)
@ -1069,11 +1069,11 @@ def restricted_access(func):
# no user or no key => go away
return flask.make_response("Invalid API key", 401)
if not flask.ext.login.login_user(user, remember=False):
if not flask_login.login_user(user, remember=False):
# user for API key could not be logged in => go away
return flask.make_response("Invalid API key", 401)
flask.ext.principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask.ext.principal.Identity(user.get_id()))
flask_principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask_principal.Identity(user.get_id()))
return func(*args, **kwargs)
return decorated_view
@ -1172,7 +1172,7 @@ def get_json_command_from_request(request, valid_commands):
##~~ Flask-Assets resolver with plugin asset support
class PluginAssetResolver(flask.ext.assets.FlaskResolver):
class PluginAssetResolver(flask_assets.FlaskResolver):
def split_prefix(self, ctx, item):
app = ctx.environment._app
@ -1181,14 +1181,14 @@ class PluginAssetResolver(flask.ext.assets.FlaskResolver):
prefix, plugin, name = item.split("/", 2)
blueprint = prefix + "." + plugin
directory = flask.ext.assets.get_static_folder(app.blueprints[blueprint])
directory = flask_assets.get_static_folder(app.blueprints[blueprint])
item = name
endpoint = blueprint + ".static"
return directory, item, endpoint
except (ValueError, KeyError):
pass
return flask.ext.assets.FlaskResolver.split_prefix(self, ctx, item)
return flask_assets.FlaskResolver.split_prefix(self, ctx, item)
def resolve_output_to_path(self, ctx, target, bundle):
import os

4
src/octoprint/users.py
View file

@ -5,8 +5,8 @@ __author__ = "Gina Häußge <osd@foosel.net>"
__license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html'
__copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms of the AGPLv3 License"
from flask.ext.login import UserMixin
from flask.ext.principal import Identity
from flask_login import UserMixin
from flask_principal import Identity
from werkzeug.local import LocalProxy
import hashlib
import os