Skip to content

Commit

Permalink
Change to new import syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
jace committed May 3, 2017
1 parent ffff2df commit 511e4b0
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion alembic/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from alembic.config import Config
from sqlalchemy import engine_from_config, pool
from logging.config import fileConfig
from flask.ext.alembic import FlaskAlembicConfig
from flask_alembic import FlaskAlembicConfig

# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
Expand Down
8 changes: 4 additions & 4 deletions hasmail/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

from __future__ import absolute_import
from flask import Flask
from flask.ext.mail import Mail
from flask.ext.rq import RQ
from flask.ext.lastuser import Lastuser
from flask.ext.lastuser.sqlalchemy import UserManager
from flask_mail import Mail
from flask_rq import RQ
from flask_lastuser import Lastuser
from flask_lastuser.sqlalchemy import UserManager
from baseframe import baseframe, assets, Version, _, __
import coaster.app
from ._version import __version__
Expand Down
2 changes: 1 addition & 1 deletion hasmail/models/user.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

from flask.ext.lastuser.sqlalchemy import UserBase2
from flask_lastuser.sqlalchemy import UserBase2
from . import db

__all__ = ['User']
Expand Down
4 changes: 2 additions & 2 deletions hasmail/views/campaign.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
from StringIO import StringIO
import unicodecsv
from flask import g, url_for, request, render_template, flash, redirect, Markup
from flask.ext.mail import Message
from flask.ext.rq import job
from flask_mail import Message
from flask_rq import job
from coaster.utils import make_name
from coaster.views import load_model
from baseframe.forms import render_redirect, render_delete_sqla
Expand Down
2 changes: 1 addition & 1 deletion hasmail/views/diffpatch.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

from diff_match_patch import diff_match_patch
from flask.ext.rq import job
from flask_rq import job
from ..models import db, EmailCampaign, EmailRecipient


Expand Down
6 changes: 3 additions & 3 deletions manage.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env python

from flask.ext.script import Manager, Server, Option, prompt_bool
from flask.ext.script.commands import Clean, ShowUrls
from flask.ext.alembic import ManageMigrations, FlaskAlembicConfig
from flask_script import Manager, Server, Option, prompt_bool
from flask_script.commands import Clean, ShowUrls
from flask_alembic import ManageMigrations, FlaskAlembicConfig
from alembic import command

from hasmail import app, init_for
Expand Down

0 comments on commit 511e4b0

Please sign in to comment.