fixed pythonrc, thanks Vlad

This commit is contained in:
Massimo Di Pierro committed 2012-05-29 00:20:46 -05:00
1 parent 3af2c7153f
commit e4357d2988
2 files changed
+3 -2

No files matched your search

+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
+2 -1
View File
@@ -146,6 +146,7 @@ def exec_pythonrc():
try: try:
return execfile_getlocals(pythonrc) return execfile_getlocals(pythonrc)
except NameError: except NameError:
pass
return dict() return dict()
@@ -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)