##// END OF EJS Templates
Simplify logic
Bouke van der Bijl -
Show More
@@ -358,7 +358,7 b' class InteractiveShellApp(Configurable):'
358 """Run files from profile startup directory"""
358 """Run files from profile startup directory"""
359 startup_dir = self.profile_dir.startup_dir
359 startup_dir = self.profile_dir.startup_dir
360 startup_files = []
360 startup_files = []
361 if self.exec_PYTHONSTARTUP and not self.file_to_run and not self.code_to_run and not self.module_to_run:
361 if self.exec_PYTHONSTARTUP and not (self.file_to_run or self.code_to_run or self.module_to_run):
362 if os.environ.get('PYTHONSTARTUP', False):
362 if os.environ.get('PYTHONSTARTUP', False):
363 startup_files.append(os.environ['PYTHONSTARTUP'])
363 startup_files.append(os.environ['PYTHONSTARTUP'])
364 startup_files += glob.glob(os.path.join(startup_dir, '*.py'))
364 startup_files += glob.glob(os.path.join(startup_dir, '*.py'))
General Comments 0
You need to be logged in to leave comments. Login now