Skip to content

Commit 733c362

Browse files
vidya-ramjace
authored andcommitted
Make init_for call implicit
Fixes #10
1 parent 511e4b0 commit 733c362

File tree

7 files changed

+17
-43
lines changed

7 files changed

+17
-43
lines changed

hasmail/__init__.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@
3232

3333

3434
# Configure the app
35-
def init_for(env):
36-
coaster.app.init_app(app, env)
37-
db.init_app(app)
38-
db.app = app
39-
RQ(app) # Pick up RQ configuration from the app
40-
baseframe.init_app(app, requires=['hasmail'],
41-
ext_requires=['bootstrap3-editable', 'codemirror-markdown', 'codemirror-css', 'fontawesome', 'baseframe-bs3'])
42-
mail.init_app(app)
43-
lastuser.init_app(app)
44-
lastuser.init_usermanager(UserManager(db, models.User))
35+
coaster.app.init_app(app)
36+
db.init_app(app)
37+
db.app = app
38+
RQ(app) # Pick up RQ configuration from the app
39+
baseframe.init_app(app, requires=['hasmail'],
40+
ext_requires=['bootstrap3-editable', 'codemirror-markdown', 'codemirror-css', 'fontawesome', 'baseframe-bs3'])
41+
mail.init_app(app)
42+
lastuser.init_app(app)
43+
lastuser.init_usermanager(UserManager(db, models.User))

manage.py

+2-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from flask_alembic import ManageMigrations, FlaskAlembicConfig
66
from alembic import command
77

8-
from hasmail import app, init_for
8+
from hasmail import app
99
from hasmail import models
1010
from hasmail.models import db
1111

@@ -21,35 +21,29 @@ def get_options(self):
2121
)
2222

2323
def handle(self, *args, **kwargs):
24-
if 'env' in kwargs:
25-
init_for(kwargs.pop('env'))
2624
super(InitedServer, self).handle(*args, **kwargs)
2725

2826

2927
class InitedMigrations(ManageMigrations):
3028
def run(self, args):
31-
if len(args) and not args[0].startswith('-'):
32-
init_for(args[0])
3329
super(InitedMigrations, self).run(args[1:])
3430

3531

3632
@manager.shell
3733
def _make_context():
38-
return dict(app=app, db=db, models=models, init_for=init_for)
34+
return dict(app=app, db=db, models=models)
3935

4036

4137
@database.option('-e', '--env', default='dev', help="runtime environment [default 'dev']")
4238
def drop(env):
4339
"Drops database tables"
44-
init_for(env)
4540
if prompt_bool("Are you sure you want to lose all your data?"):
4641
db.drop_all()
4742

4843

4944
@database.option('-e', '--env', default='dev', help="runtime environment [default 'dev']")
5045
def create(env):
5146
"Creates database tables from sqlalchemy models"
52-
init_for(env)
5347
db.create_all()
5448
config = FlaskAlembicConfig("alembic.ini")
5549
command.stamp(config, "head")
@@ -61,7 +55,6 @@ def setversion(env):
6155
Manually set the alembic version of the
6256
database to the provided value.
6357
'''
64-
init_for(env)
6558
config = FlaskAlembicConfig("alembic.ini")
6659
version = raw_input("Enter the alembic version to be set:")
6760
command.stamp(config, version)

rq.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
rqworker -c rqdev hasmail
3+
rqworker -c rqinit hasmail

rqdev.py

-16
This file was deleted.

rqinit.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from urlparse import urlparse
22

3-
from hasmail import init_for, app
3+
from hasmail import app
4+
45

5-
init_for('production')
66
REDIS_URL = app.config.get('REDIS_URL', 'redis://localhost:6379/0')
77

88
# REDIS_URL is not taken by setup_default_arguments function of rq/scripts/__init__.py

runserver.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/usr/bin/env python
22
import sys
3-
from hasmail import app, init_for
4-
init_for('dev')
3+
from hasmail import app
54

65
try:
76
port = int(sys.argv[1])
87
except (IndexError, ValueError):
98
port = 7890
10-
app.run('0.0.0.0', port=port, debug=True)
9+
app.run('0.0.0.0', port=port)

website.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import sys
22
import os.path
33
sys.path.insert(0, os.path.dirname(__file__))
4-
from hasmail import app as application, init_for
5-
init_for('production')
4+
from hasmail import app as application

0 commit comments

Comments
 (0)