From 0aa39f69b6b7f98e18293c3fbfb2d3852e763859 Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@managedit.ie>
Date: Sun, 9 Dec 2012 20:22:03 +0000
Subject: [PATCH] Sync with Oslo e6c576d9

Change-Id: Ic6b6c8fe9797fcc72761bb05fd6d38beb6326be5
---
 monikerclient/openstack/common/setup.py   |  8 ++++--
 monikerclient/openstack/common/version.py | 32 ++++++++++++++++++-----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/monikerclient/openstack/common/setup.py b/monikerclient/openstack/common/setup.py
index 83eef07..e6f72f0 100644
--- a/monikerclient/openstack/common/setup.py
+++ b/monikerclient/openstack/common/setup.py
@@ -117,8 +117,12 @@ def write_requirements():
 
 
 def _run_shell_command(cmd):
-    output = subprocess.Popen(["/bin/sh", "-c", cmd],
-                              stdout=subprocess.PIPE)
+    if os.name == 'nt':
+        output = subprocess.Popen(["cmd.exe", "/C", cmd],
+                                  stdout=subprocess.PIPE)
+    else:
+        output = subprocess.Popen(["/bin/sh", "-c", cmd],
+                                  stdout=subprocess.PIPE)
     out = output.communicate()
     if len(out) == 0:
         return None
diff --git a/monikerclient/openstack/common/version.py b/monikerclient/openstack/common/version.py
index a19e422..dae88e3 100644
--- a/monikerclient/openstack/common/version.py
+++ b/monikerclient/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):