From 9b4ad81a1d3a3394c1adb90a34952dd55a7333e5 2013-07-06 20:37:30
From: MinRK <benjaminrk@gmail.com>
Date: 2013-07-06 20:37:30
Subject: [PATCH] add PYTHONSTARTUP to startup files

closes #2706
---

diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py
index 4539c06..d9ca71d 100644
--- a/IPython/core/shellapp.py
+++ b/IPython/core/shellapp.py
@@ -300,7 +300,10 @@ class InteractiveShellApp(Configurable):
     def _run_startup_files(self):
         """Run files from profile startup directory"""
         startup_dir = self.profile_dir.startup_dir
-        startup_files = glob.glob(os.path.join(startup_dir, '*.py'))
+        startup_files = []
+        if os.environ.get('PYTHONSTARTUP', False):
+            startup_files.append(os.environ['PYTHONSTARTUP'])
+        startup_files += glob.glob(os.path.join(startup_dir, '*.py'))
         startup_files += glob.glob(os.path.join(startup_dir, '*.ipy'))
         if not startup_files:
             return