projects
/
zzz-floof.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Augh! Removed trailing whitespace.
[zzz-floof.git]
/
floof
/
config
/
environment.py
diff --git
a/floof/config/environment.py
b/floof/config/environment.py
index
3470f2a
..
cf6c77e
100644
(file)
--- a/
floof/config/environment.py
+++ b/
floof/config/environment.py
@@
-35,7
+35,7
@@
def load_environment(global_conf, app_conf):
input_encoding='utf-8', output_encoding='utf-8',
imports=['from webhelpers.html import escape'],
default_filters=['escape'])
input_encoding='utf-8', output_encoding='utf-8',
imports=['from webhelpers.html import escape'],
default_filters=['escape'])
-
+
# Setup the SQLAlchemy^W Elixir database engine
engine = engine_from_config(config, 'sqlalchemy.')
if model.elixir.options_defaults.get('autoload'):
# Setup the SQLAlchemy^W Elixir database engine
engine = engine_from_config(config, 'sqlalchemy.')
if model.elixir.options_defaults.get('autoload'):
@@
-46,6
+46,6
@@
def load_environment(global_conf, app_conf):
else:
# Non-reflected tables
model.init_model(engine)
else:
# Non-reflected tables
model.init_model(engine)
-
+
# CONFIGURATION OPTIONS HERE (note: all config options will override
# any Pylons config options)
# CONFIGURATION OPTIONS HERE (note: all config options will override
# any Pylons config options)