Browse files

set global_conf and app_conf arguments to None in environment.py load…

…_environment, then check them or set them to empty dict
  • Loading branch information...
1 parent 178da70 commit 4611b002aae5f932efce57e07fc5699bae57113d @shawnps committed Apr 12, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 r2/r2/config/environment.py
View
4 r2/r2/config/environment.py
@@ -37,7 +37,9 @@
from r2.templates import tmpl_dirs
-def load_environment(global_conf={}, app_conf={}, setup_globals=True):
+def load_environment(global_conf=None, app_conf=None, setup_globals=True):
+ global_conf = global_conf or {}
+ app_conf = app_conf or {}
map = make_map(global_conf, app_conf)
# Setup our paths
root_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

0 comments on commit 4611b00

Please sign in to comment.