Remove duplicate code

sebastinas · sebastinas · commit 935c849ff82b · 2015-02-06T23:06:38.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1915,7 +1915,12 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
             return (exit_value, clirepl.getstdout())
     else:
         sys.path.insert(0, '')
-        clirepl.startup()
+        try:
+            clirepl.startup()
+        except OSError as e:
+            # Handle this with a proper error message.
+            if e.errno != errno.ENOENT:
+                raise
 
     if banner is not None:
         clirepl.write(banner)
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -409,20 +409,6 @@ def sigtstp_handler(self, signum, frame):
         self.after_suspend()
         self.__enter__()
 
-    def run_startup(self):
-        """
-        Execute PYTHONSTARTUP file if it exits. Call this after front
-        end-specific initialisation.
-        """
-        filename = os.environ.get('PYTHONSTARTUP')
-        if filename:
-            with open(filename, 'r') as f:
-                if py3:
-                    #TODO runsource has a new signature in PY3
-                    self.interp.runsource(f.read(), filename, 'exec')
-                else:
-                    self.interp.runsource(f.read(), filename, 'exec')
-
     def clean_up_current_line_for_exit(self):
         """Called when trying to exit to prep for final paint"""
         logger.debug('unhighlighting paren for exit')
@@ -475,9 +461,10 @@ def process_control_event(self, e):
 
         elif isinstance(e, bpythonevents.RunStartupFileEvent):
             try:
-                self.run_startup()
+                self.startup()
             except IOError as e:
-                self.status_bar.message(_('Executing PYTHONSTARTUP failed: %s') % (str(e)))
+                self.status_bar.message(
+                  _('Executing PYTHONSTARTUP failed: %s') % (str(e)))
 
         elif isinstance(e, bpythonevents.UndoEvent):
             self.undo(n=e.n)
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -19,7 +19,6 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#
 
 from __future__ import with_statement
 import code
@@ -406,7 +405,7 @@ def startup(self):
         end-specific initialisation.
         """
         filename = os.environ.get('PYTHONSTARTUP')
-        if filename and os.path.isfile(filename):
+        if filename:
             with open(filename, 'r') as f:
                 if py3:
                     self.interp.runsource(f.read(), filename, 'exec')
