From 3fc6b8cbbd1be5baffc300112a0e39a807209c36 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 7 Mar 2011 16:34:59 -0600
Subject: virt.xenapi.vmops._get_vm_opaque_ref checks for basestring instance
 instead of str

---
 nova/virt/xenapi/vmops.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index ae4609418..30fa5bdd7 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -189,7 +189,7 @@ class VMOps(object):
         a vm name or a vm instance, and want a vm instance in return.
         """
         # if instance_or_vm is a string it must be opaque ref or instance name
-        if isinstance(instance_or_vm, str):
+        if isinstance(instance_or_vm, basestring):
             ref = None
             try:
                 ref = self._session.get_xenapi().VM.get_record(instance_or_vm)
-- 
cgit