Changeset 3115

Timestamp:

07/09/08 14:24:25 (5 years ago)

Author:

nopper

Message:

Fixing umit-console loading on windows.

Location:

branch/UmitPlugins

Files:

• source-plugins/umit-console/sources/console/console.py (modified) (1 diff)
• umitPlugin/Tree.py (modified) (2 diffs)

branch/UmitPlugins/source-plugins/umit-console/sources/console/console.py

@@ -395 +395 @@
         iter = self.buffer.get_iter_at_mark(self.buffer.get_insert())
         self.buffer.insert_with_tags_by_name(iter,
-                'Welcome to UMIT Python Shell (running on %s)\n' % os.uname()[0],
+                'Welcome to UMIT Python Shell (running on %s)\n' % os.name,
                 'center', 'extern'
         )

branch/UmitPlugins/umitPlugin/Tree.py

@@ -48 +48 @@
             path = os.path.join(Path.config_dir, "plugins-temp", \
                                 lib.split('.')[-1] + get_config_vars("SO")[0])
-            
-            out = open(path, 'wb')
-            
-            out.write(reader.file.read( \
-                'lib/%s%s' % (lib.replace(".", "/"), get_config_vars("SO")[0])) \
-            )
-            out.close()
+
+            try:
+                out = open(path, 'wb')
+                
+                out.write(reader.file.read( \
+                    'lib/%s%s' % (lib.replace(".", "/"), get_config_vars("SO")[0])) \
+                )
+                out.close()
+            except Exception, exc:
+                continue
             
             path = os.path.dirname(out.name)
@@ -62 +65 @@
                 sys.path.insert(0, path)
                 
-                module = original_import(name.replace(get_config_vars("SO")[0], ""), \
+                return original_import(name.replace(get_config_vars("SO")[0], ""), \
                                          level=0)
-                
+            except Exception, exc:
+                continue
             finally:
                 sys.path.pop(0)
-            
-            return module
-        
+
         raise err