diff options
| author | Alan Conway <aconway@apache.org> | 2010-04-06 18:26:22 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-04-06 18:26:22 +0000 |
| commit | 4517306f15bb760814a75797f4b229132114ff6d (patch) | |
| tree | d19938ebae877e759b59c502b022f70358175aa5 | |
| parent | 7e080f3ef470dcec94079f3d7e59edbf4c791844 (diff) | |
| download | qpid-python-4517306f15bb760814a75797f4b229132114ff6d.tar.gz | |
Remove non-portable @staticmethod from qpid/datatypes.py
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@931262 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | python/qpid/datatypes.py | 12 | ||||
| -rwxr-xr-x | tools/src/py/qpid-cluster-store | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/python/qpid/datatypes.py b/python/qpid/datatypes.py index fc267c48ef..c37929394c 100644 --- a/python/qpid/datatypes.py +++ b/python/qpid/datatypes.py @@ -308,17 +308,15 @@ except ImportError: def uuid4(): return UUID(random_uuid()) -class UUID: +def parseUUID(str): + fields=str.split("-") + fields[4:5] = [fields[4][:4], fields[4][4:]] + return UUID(struct.pack("!LHHHHL", *[int(x,16) for x in fields])) +class UUID: def __init__(self, bytes): self.bytes = bytes - @staticmethod - def parse(str): - fields=str.split("-") - fields[4:5] = [fields[4][:4], fields[4][4:]] - return UUID(struct.pack("!LHHHHL", *[int(x,16) for x in fields])) - def __cmp__(self, other): if isinstance(other, UUID): return cmp(self.bytes, other.bytes) diff --git a/tools/src/py/qpid-cluster-store b/tools/src/py/qpid-cluster-store index 4599f613d9..0333b371fd 100755 --- a/tools/src/py/qpid-cluster-store +++ b/tools/src/py/qpid-cluster-store @@ -19,7 +19,7 @@ # under the License. # -from qpid.datatypes import uuid4, UUID +from qpid.datatypes import uuid4, UUID, parseUUID import optparse, os.path, sys op = optparse.OptionParser( @@ -39,7 +39,7 @@ class ClusterStoreStatus: def read(self): f = open(self.file) - try: self.cluster_id, self.shutdown_id = [UUID.parse(s) for s in f.readlines()] + try: self.cluster_id, self.shutdown_id = [parseUUID(s) for s in f.readlines()] finally: f.close() def write(self): |