[rhmessaging-commits] rhmessaging commits: r1991 - in mgmt: mint/python/mint and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: nunofsantos
Date: 2008-05-01 12:03:25 -0400 (Thu, 01 May 2008)
New Revision: 1991

Modified:
   mgmt/basil/python/basil/__init__.py
   mgmt/mint/python/mint/__init__.py
Log:
use alternative UUID factory if uuid module not present

Modified: mgmt/basil/python/basil/__init__.py
===================================================================
--- mgmt/basil/python/basil/__init__.py	2008-05-01 15:20:16 UTC (rev 1990)
+++ mgmt/basil/python/basil/__init__.py	2008-05-01 16:03:25 UTC (rev 1991)
@@ -1,4 +1,5 @@
-import mllib, qpid, new, uuid
+import mllib, qpid, new
+from qpid.datatypes import uuid4
 from string import Template
 from qpid.management import managementChannel, managementClient
 from qpid.util import connect
@@ -216,7 +217,7 @@
     def open(self):
         self.conn.start()
         self.chan = self.mclient.addChannel \
-            (self.conn.session(str(uuid.uuid4())), self.context_id)
+            (self.conn.session(str(uuid4())), self.context_id)
 
     def close(self):
         self.mclient.removeChannel(self.chan)

Modified: mgmt/mint/python/mint/__init__.py
===================================================================
--- mgmt/mint/python/mint/__init__.py	2008-05-01 15:20:16 UTC (rev 1990)
+++ mgmt/mint/python/mint/__init__.py	2008-05-01 16:03:25 UTC (rev 1991)
@@ -1,4 +1,5 @@
-import os, socket, qpid, logging, uuid
+import os, socket, qpid, logging
+from qpid.datatypes import uuid4
 from qpid.connection import Connection
 from qpid.util import connect
 from qpid.management import managementChannel, managementClient
@@ -197,7 +198,7 @@
         self.model.connections[self.key] = self
 
         self.conn.start()
-        self.mchan = self.mclient.addChannel (self.conn.session(str(uuid.uuid4())), self.key)
+        self.mchan = self.mclient.addChannel (self.conn.session(str(uuid4())), self.key)
 
         self.state = "opened"
       except Exception, e: