Fixed open_program to check .py files first.

crcollins · Jul 25, 2012 · 8c6630a · 8c6630a
1 parent e8bf58e
commit 8c6630a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/kernel/filesystem.py b/kernel/filesystem.py
@@ -119,10 +119,7 @@ def open_file(path, mode):
 def open_program(path):
     x = abs_path(path)
     try:
-        try:
-            program = imp.load_source('program', '%s.py' % (x, ))
-        except IOError:
-            program = imp.load_source('program', x)
+        program = imp.load_source('program', x)
     except IOError:
         program = False
     return program

diff --git a/kernel/shell.py b/kernel/shell.py
@@ -103,9 +103,15 @@ def hist_find(self, value, start=True):
 
     def find_program(self, name):
         for x in self.program_paths(name):
+            if not x.endswith('.py'):
+                x += '.py'
             program = self.syscall.open_program(x)
             if program:
                 break
+            else:
+                program = self.syscall.open_program(x[:-3])
+            if program:
+                break
         return program
 
     def __repr__(self):

diff --git a/kernel/system.py b/kernel/system.py
@@ -37,12 +37,12 @@ def run(self):
             self.run()
 
     def startup(self):
-        path = self.filesystem.join_path(KERNELDIR, "startup")
+        path = self.filesystem.join_path(KERNELDIR, "startup.py")
         program = self.new_shell(program=path)
         program.run()
 
     def shutdown(self):
-        path = self.filesystem.join_path(KERNELDIR, "shutdown")
+        path = self.filesystem.join_path(KERNELDIR, "shutdown.py")
         program = self.new_shell(program=path)
         program.run()