|
| 1 | +diff --git a/refinery/refinery/__init__.py b/refinery/refinery/__init__.py |
| 2 | +index 3bd6a8b..4ad1311 100644 |
| 3 | +--- a/refinery/refinery/__init__.py |
| 4 | ++++ b/refinery/refinery/__init__.py |
| 5 | +@@ -1,6 +1,6 @@ |
| 6 | + from flask import Flask |
| 7 | +-from flask.ext.sqlalchemy import SQLAlchemy |
| 8 | +-from flask.ext.login import LoginManager |
| 9 | ++from flask_sqlalchemy import SQLAlchemy |
| 10 | ++from flask_login import LoginManager |
| 11 | + from celery import Celery |
| 12 | + |
| 13 | + print "Opening a Refinery" |
| 14 | +diff --git a/refinery/refinery/webapp/admin.py b/refinery/refinery/webapp/admin.py |
| 15 | +index e6d26d4..23af1dd 100644 |
| 16 | +--- a/refinery/refinery/webapp/admin.py |
| 17 | ++++ b/refinery/refinery/webapp/admin.py |
| 18 | +@@ -1,6 +1,6 @@ |
| 19 | + from flask import g, redirect, render_template, session, url_for, flash #url_for, abort, render_template, flash, send_from_directory, jsonify, Response, json |
| 20 | + from refinery import app, lm |
| 21 | +-from flask.ext.login import login_user, logout_user, login_required |
| 22 | ++from flask_login import login_user, logout_user, login_required |
| 23 | + from refinery.data.models import User |
| 24 | + from flask_wtf import Form |
| 25 | + from wtforms import TextField, PasswordField, BooleanField |
| 26 | +diff --git a/refinery/refinery/webapp/main_menu.py b/refinery/refinery/webapp/main_menu.py |
| 27 | +index 670c62e..6e5ca7f 100644 |
| 28 | +--- a/refinery/refinery/webapp/main_menu.py |
| 29 | ++++ b/refinery/refinery/webapp/main_menu.py |
| 30 | +@@ -14,7 +14,7 @@ Or else what? Exactly. |
| 31 | + """ |
| 32 | + |
| 33 | + from flask import request, g, render_template, jsonify, Response, json |
| 34 | +-from flask.ext.login import current_user,login_required |
| 35 | ++from flask_login import current_user,login_required |
| 36 | + |
| 37 | + import celery |
| 38 | + |
0 commit comments