From 203326be6c4acdd474fe307fb608ef35d95e0a4e Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Wed, 10 Aug 2011 15:47:22 -0400
Subject: tenant_id -> project_id

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

(limited to 'nova/utils.py')

diff --git a/nova/utils.py b/nova/utils.py
index 372358b42..4b068e3a5 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -291,7 +291,7 @@ EASIER_PASSWORD_SYMBOLS = ('23456789'  # Removed: 0, 1
 
 def usage_from_instance(instance_ref, **kw):
     usage_info = dict(
-          tenant_id=instance_ref['project_id'],
+          project_id=instance_ref['project_id'],
           user_id=instance_ref['user_id'],
           instance_id=instance_ref['id'],
           instance_type=instance_ref['instance_type']['name'],
-- 
cgit 


From c11a156b1e50fde6cf3047057746564d491634e2 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Fri, 19 Aug 2011 10:01:25 -0700
Subject: Fixes primitive with builtins, modules, etc

---
 nova/utils.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'nova/utils.py')

diff --git a/nova/utils.py b/nova/utils.py
index 54126f644..b42f76457 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -547,11 +547,17 @@ def to_primitive(value, convert_instances=False, level=0):
     Therefore, convert_instances=True is lossy ... be aware.
 
     """
-    if inspect.isclass(value):
-        return unicode(value)
+    nasty = [inspect.ismodule, inspect.isclass, inspect.ismethod,
+             inspect.isfunction, inspect.isgeneratorfunction,
+             inspect.isgenerator, inspect.istraceback, inspect.isframe,
+             inspect.iscode, inspect.isbuiltin, inspect.isroutine,
+             inspect.isabstract]
+    for test in nasty:
+        if test(value):
+            return unicode(value)
 
     if level > 3:
-        return []
+        return '?'
 
     # The try block may not be necessary after the class check above,
     # but just in case ...
-- 
cgit