dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed pythonrc, thanks Vlad

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-05-29 00:20:46 -05:00
parent ebcdbae047
commit 2eecd735da
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-05-28 19:14:35) dev Version 2.00.0 (2012-05-29 00:19:18) dev
gluon/shell.py
+3 -2
View File
@@ -146,7 +146,8 @@ def exec_pythonrc():
try: try:
return execfile_getlocals(pythonrc) return execfile_getlocals(pythonrc)
except NameError: except NameError:
return dict() pass
return dict()
def run( def run(
@@ -205,7 +206,7 @@ def run(
exec ('print %s()' % f, _env) exec ('print %s()' % f, _env)
return return
_env.update(exec_pythonrc() or {}) _env.update(exec_pythonrc())
if startfile: if startfile:
try: try:
execfile(startfile, _env) execfile(startfile, _env)