From: Zooko O'Whielacronx zooko@zooko.com Date: Wed, 9 May 2007 22:58:40 +0000 (+0530) Subject: zfec: import latest version.py module from pyutil library X-Git-Url: https://git.rkrishnan.org/vdrive/%22news.html/listings/pb1client.py?a=commitdiff_plain;h=409418937d7e6abcdcb2d80314d164670699a577;p=tahoe-lafs%2Fzfec.git zfec: import latest version.py module from pyutil library darcs-hash:edce6d5037574a96f67fe35c631add9a141878b9 --- diff --git a/zfec/zfec/util/version.py b/zfec/zfec/util/version.py index d5cbb36..5b67bda 100644 --- a/zfec/zfec/util/version.py +++ b/zfec/zfec/util/version.py @@ -74,6 +74,12 @@ class Tag(str): class Version: def __init__(self, vstring=None): + self.major = None + self.minor = None + self.micro = None + self.prereleasetag = None + self.nano = None + self.tags = None if vstring: self.parse(vstring) @@ -87,17 +93,21 @@ class Version: estring = None self.strictversion = version.StrictVersion(svstring) + self.major = self.strictversion.version[0] + self.minor = self.strictversion.version[1] + self.micro = self.strictversion.version[2] + self.prereleasetag = self.strictversion.prerelease if estring: try: - (self.nanovernum, tags,) = estring.split('-') + (self.nano, tags,) = estring.split('-') except: print estring raise self.tags = map(Tag, tags.split('_')) self.tags.sort() - self.fullstr = '-'.join([str(self.strictversion), str(self.nanovernum), '_'.join(self.tags)]) + self.fullstr = '-'.join([str(self.strictversion), str(self.nano), '_'.join(self.tags)]) def tags(self): return self.tags @@ -122,7 +132,7 @@ class Version: if res != 0: return res - res = cmp(self.nanovernum, other.nanovernum) + res = cmp(self.nano, other.nano) if res != 0: return res