From bbe471e397ae1a997d4c7f44a2f134bb2d75c805 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Tue, 29 Jun 2010 10:42:47 +0200
Subject: [PATCH] [molecule] other Python3.x fixes

---
 molecule/compat.py     | 2 +-
 molecule/specs/skel.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/molecule/compat.py b/molecule/compat.py
index 486b297..094eb91 100644
--- a/molecule/compat.py
+++ b/molecule/compat.py
@@ -88,7 +88,7 @@ def convert_to_unicode(obj, enctype = 'raw_unicode_escape'):
         if sys.hexversion >= 0x3000000:
             return "None"
         else:
-            return u"None"
+            return unicode("None")
 
     # int support
     if isinstance(obj, int):
diff --git a/molecule/specs/skel.py b/molecule/specs/skel.py
index 00f8b94..e67c426 100644
--- a/molecule/specs/skel.py
+++ b/molecule/specs/skel.py
@@ -20,7 +20,7 @@ import os
 from molecule.compat import convert_to_unicode
 import molecule.utils
 
-class GenericSpecFunctions:
+class GenericSpecFunctions(object):
 
     def ne_string(self, x):
         return x, 'raw_unicode_escape'
@@ -144,7 +144,7 @@ class GenericExecutionStep:
         raise NotImplementedError()
 
 
-class GenericSpec(object, GenericSpecFunctions):
+class GenericSpec(GenericSpecFunctions):
 
     EXECUTION_STRATEGY_KEY = "execution_strategy"