From: Jeff Peeler <jpeeler@redhat.com>
Date: Wed, 5 Dec 2012 21:44:08 +0000 (-0500)
Subject: Update openstack-common to get newly fixed version.py
X-Git-Tag: 2014.1~1108^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ca22f0e44323c511866cf45006cbc8095433444a;p=openstack-build%2Fheat-build.git

Update openstack-common to get newly fixed version.py

Now at oslo-incubator version ea7ced276d2f080718cd89f3a77378cdf24fabf5

Bug 1078480

Change-Id: I0569a1c0b8af42ceb768095d4b852b557b238e61
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
---

diff --git a/heat/openstack/common/version.py b/heat/openstack/common/version.py
index a19e4226..dae88e37 100644
--- a/heat/openstack/common/version.py
+++ b/heat/openstack/common/version.py
@@ -24,17 +24,37 @@ import pkg_resources
 import setup
 
 
-class _deferred_version_string(object):
+class _deferred_version_string(str):
     """Internal helper class which provides delayed version calculation."""
-    def __init__(self, version_info, prefix):
-        self.version_info = version_info
-        self.prefix = prefix
+
+    def __new__(cls, version_info, prefix):
+        new_obj = str.__new__(cls, "")
+        new_obj._version_info = version_info
+        new_obj._prefix = prefix
+        new_obj._cached_version = None
+        return new_obj
+
+    def _get_cached_version(self):
+        if not self._cached_version:
+            self._cached_version = \
+                "%s%s" % (self._prefix,
+                self._version_info.version_string())
+        return self._cached_version
+
+    def __len__(self):
+        return self._get_cached_version().__len__()
+
+    def __contains__(self, item):
+        return self._get_cached_version().__contains__(item)
+
+    def __getslice__(self, i, j):
+        return self._get_cached_version().__getslice__(i, j)
 
     def __str__(self):
-        return "%s%s" % (self.prefix, self.version_info.version_string())
+        return self._get_cached_version()
 
     def __repr__(self):
-        return "%s%s" % (self.prefix, self.version_info.version_string())
+        return self._get_cached_version()
 
 
 class VersionInfo(object):