diff options
| author | Alexis Metaireau <alexis@notmyidea.org> | 2013-03-16 23:19:06 -0700 |
|---|---|---|
| committer | Alexis Metaireau <alexis@notmyidea.org> | 2013-03-16 23:19:06 -0700 |
| commit | 396a91e1ac6f65b88cc25ac208b606b0ebe79b9c (patch) | |
| tree | 24108b2273454d74b7699d74764b8a470c41b88d | |
| parent | 64385e0fa3139d7392f107c69267e977f72a4d46 (diff) | |
| parent | bfea4e436fbe3126949785eff66aef901f6e2f65 (diff) | |
| download | ihatemoney-mirror-396a91e1ac6f65b88cc25ac208b606b0ebe79b9c.zip ihatemoney-mirror-396a91e1ac6f65b88cc25ac208b606b0ebe79b9c.tar.gz ihatemoney-mirror-396a91e1ac6f65b88cc25ac208b606b0ebe79b9c.tar.bz2 | |
Merge pull request #98 from aavenel/flask0.9
Flask0.9
| -rw-r--r-- | budget/api.py | 2 | ||||
| -rw-r--r-- | budget/forms.py | 4 | ||||
| -rw-r--r-- | budget/models.py | 2 | ||||
| -rw-r--r-- | budget/requirements.txt | 2 | ||||
| -rw-r--r-- | budget/run.py | 2 | ||||
| -rw-r--r-- | budget/web.py | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/budget/api.py b/budget/api.py index ec664b6..0c62b29 100644 --- a/budget/api.py +++ b/budget/api.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from flask import Blueprint, request -from flask_rest import RESTResource, need_auth +from flask.ext.rest import RESTResource, need_auth from models import db, Project, Person, Bill from forms import (ProjectForm, EditProjectForm, MemberForm, diff --git a/budget/forms.py b/budget/forms.py index f243c39..9b11085 100644 --- a/budget/forms.py +++ b/budget/forms.py @@ -1,7 +1,7 @@ -from flaskext.wtf import DateField, DecimalField, Email, Form, PasswordField, \ +from flask.ext.wtf import DateField, DecimalField, Email, Form, PasswordField, \ Required, SelectField, SelectMultipleField, SubmitField, TextAreaField, \ TextField, ValidationError -from flaskext.babel import lazy_gettext as _ +from flask.ext.babel import lazy_gettext as _ from flask import request from wtforms.widgets import html_params diff --git a/budget/models.py b/budget/models.py index cac9664..586f43b 100644 --- a/budget/models.py +++ b/budget/models.py @@ -1,7 +1,7 @@ from collections import defaultdict from datetime import datetime -from flask_sqlalchemy import SQLAlchemy, BaseQuery +from flask.ext.sqlalchemy import SQLAlchemy, BaseQuery from flask import g from sqlalchemy import orm diff --git a/budget/requirements.txt b/budget/requirements.txt index cae3d1a..baeb33a 100644 --- a/budget/requirements.txt +++ b/budget/requirements.txt @@ -1,4 +1,4 @@ -flask +flask>=0.9 flask-wtf flask-sqlalchemy flask-mail diff --git a/budget/run.py b/budget/run.py index 2c2cab5..845192d 100644 --- a/budget/run.py +++ b/budget/run.py @@ -1,5 +1,5 @@ from flask import Flask, g, request, session -from flaskext.babel import Babel +from flask.ext.babel import Babel from raven.contrib.flask import Sentry from web import main, db, mail diff --git a/budget/web.py b/budget/web.py index af0a933..defa17e 100644 --- a/budget/web.py +++ b/budget/web.py @@ -11,8 +11,8 @@ and `add_project_id` for a quick overview) from flask import Blueprint, current_app, flash, g, redirect, \ render_template, request, session, url_for -from flaskext.mail import Mail, Message -from flaskext.babel import get_locale, gettext as _ +from flask.ext.mail import Mail, Message +from flask.ext.babel import get_locale, gettext as _ from smtplib import SMTPRecipientsRefused import werkzeug |