Changeset 3956

Timestamp:

01/30/09 13:08:20 (4 years ago)

Author:

gpolo

Message:

Merged revisions 3948 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

................

r3948 | nopper | 2009-01-11 17:13:04 -0200 (Sun, 11 Jan 2009) | 9 lines

Merged revisions 3944 via svnmerge from
http://svn.umitproject.org/svnroot/umit/branch/UmitPlugins

........

r3944 | nopper | 2009-01-11 19:47:12 +0100 (dom, 11 gen 2009) | 1 line

Backport to py24

........

................

Location:

branch/NetworkInventory/umitPlugin

Files:

• Containers.py (modified) (2 diffs)
• Engine.py (modified) (2 diffs)
• PluginPage.py (modified) (5 diffs)
• Tree.py (modified) (4 diffs)
• Update.py (modified) (12 diffs)

branch/NetworkInventory/umitPlugin/Containers.py

@@ -41 +41 @@
 from distutils.command.install import install as installcmd
 from distutils.command.install_lib import install_lib as install_libcmd
-from distutils.command.install_egg_info import install_egg_info as install_egginfocmd
+
+try:
+    from distutils.command.install_egg_info import install_egg_info as install_egginfocmd
+
+    class PlugEggInstaller(install_egginfocmd):
+        def run(self):
+            pass
+
+except ImportError:
+    pass
 
 # For removing directory trees we need
@@ -367 +376 @@
         installcmd.run(self)
 
-class PlugEggInstaller(install_egginfocmd):
-    def run(self):
-        pass
-
 class PlugDistribution(Distribution):
     def __init__(self, *attrs):

branch/NetworkInventory/umitPlugin/Engine.py

@@ -20 +20 @@
 
 import sys
-import os, os.path
+import os
+import os.path
 
 from umitPlugin.Core import Core
@@ -38 +39 @@
     """
     def start(self, reader):
-        "This is the main for your plugin"
+        "This is the main for your plugin (reader could be None if testing)"
         pass
 

branch/NetworkInventory/umitPlugin/PluginPage.py

@@ -18 +18 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-from __future__ import with_statement
-
 import os
 import gtk
@@ -203 +201 @@
         
         for obj in self.p_window.update_eng.list:
-            with obj.lock:
+            obj.lock.acquire()
+
+            try:
                 if obj.status == FILE_GETTING or \
                    obj.status == FILE_CHECKING:
@@ -211 +211 @@
                 row.message = obj.label
                 row.progress = obj.fract
+            finally:
+                obj.lock.release()
         
         if not working:
@@ -299 +301 @@
         
         for upd_obj in self.p_window.update_eng.list:
-            with upd_obj.lock:
-
+            upd_obj.lock.acquire()
+
+            try:
                 # Check if we are working
                 if upd_obj.status == LATEST_GETTING:
@@ -308 +311 @@
                 row = upd_obj.object
                 row.message = upd_obj.label
+            finally:
+                upd_obj.lock.release()
         
         # No locking from here we have finished

branch/NetworkInventory/umitPlugin/Tree.py

@@ -64 +64 @@
             try:
                 sys.path.insert(0, path)
-                
-                return original_import(name.replace(get_config_vars("SO")[0], ""), \
-                                         level=0)
-            except Exception, exc:
-                continue
+
+                try:
+                    return original_import(name.replace(get_config_vars("SO")[0], ""), \
+                                             level=0)
+                except Exception, exc:
+                    continue
             finally:
                 sys.path.pop(0)
@@ -489 +490 @@
             __builtin__.__import__ = original_import
 
-
     def __load_hook(self, pkg):
         """
@@ -519 +519 @@
 
         try:
-            # We add to modules to avoid deleting and stop working plugin ;)
-            sys.plugins_path.insert(0, pkg)
-            module = self.__cache_import(pkg)
-        
-        except Exception, err:
-            sys.plugins_path.pop(0)
-            raise PluginException(pkg, str(err))
+            try:
+                # We add to modules to avoid deleting and stop working plugin ;)
+                sys.plugins_path.insert(0, pkg)
+                module = self.__cache_import(pkg)
+            
+            except Exception, err:
+                sys.plugins_path.pop(0)
+                raise PluginException(pkg, str(err))
         
         finally:
@@ -544 +545 @@
                 except Exception, err:
                     log.critical("Error while starting %s from %s:" % (plug, pkg))
-                    log.critical(err)
+                    log.critical(generate_traceback())
                     log.critical("Ignoring instance.")
 

branch/NetworkInventory/umitPlugin/Update.py

@@ -18 +18 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-from __future__ import with_statement
-
 import os
-import md5
+
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import md5
 
 from threading import RLock
@@ -177 +179 @@
 
         if isinstance(exc, ErrorNetException):
-
-            with obj.lock:
+            obj.lock.acquire()
+
+            try:
                 obj.status = FILE_ERROR
                 obj.label = exc.reason
@@ -185 +188 @@
                 self.__process_next_download()
                 return
+            finally:
+                obj.lock.release()
         
         elif isinstance(exc, StopNetException):
@@ -190 +195 @@
 
                 data = ""
-
-                with obj.lock:
+                obj.lock.acquire()
+
+                try:
                     obj.label = _('Checking validity ...')
                     obj.status = FILE_CHECKING
@@ -199 +205 @@
 
                     data = obj.fd.read()
+                finally:
+                    obj.lock.release()
                 
                 # Not locked it could freeze the ui
-                hasher = md5.new()
-                hasher.update(data)
-                
-                with obj.lock:
+                hasher = md5(data)
+                
+                obj.lock.acquire()
+
+                try:
                     if hasher.hexdigest() == obj.hash:
                         obj.label = _('Updated. Restart to take effect')
@@ -211 +220 @@
                         obj.label = _('Corrupted file.')
                         obj.status = FILE_ERROR
+                finally:
+                    obj.lock.release()
+
             else:
-                with obj.lock:
+                obj.lock.acquire()
+
+                try:
                     obj.label = _('Updated. Restart to take effect')
                     obj.status = FILE_GETTED
-            
-            with obj.lock:
+                finally:
+                    obj.lock.release()
+            
+            obj.lock.acquire()
+
+            try:
                 obj.fd.close()
                 obj.fract = 1
+            finally:
+                obj.lock.release()
             
             try:
@@ -233 +253 @@
         
         elif isinstance(exc, StartNetException):
-            with obj.lock:
+            obj.lock.acquire()
+
+            try:
                 try:
                     obj.status = FILE_GETTING
@@ -242 +264 @@
             
                 obj.label = _('Downloading ...')
+            finally:
+                obj.lock.release()
 
         elif not exc:
@@ -268 +292 @@
 
         if isinstance(exc, ErrorNetException):
-            with obj.lock:
+            obj.lock.acquire()
+
+            try:
                 obj.status = LATEST_ERROR
                 obj.label = _('Cannot find newer version (%s)') % exc.reason
@@ -274 +300 @@
                 self.__process_next()
                 return
+            finally:
+                obj.lock.release()
         
         elif isinstance(exc, StopNetException):
@@ -288 +316 @@
                 type = 1
 
-            with obj.lock:
+            obj.lock.acquire()
+
+            try:
                 if url and version and type >= 0:
 
@@ -320 +350 @@
 
                 self.__process_next()
+            finally:
+                obj.lock.release()
 
         elif not exc: