Fixed unicode literals in Python and MOF strings

Signed-off-by: Andreas Maier <andreas.r.maier@gmx.de>

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: pywbem
-Version: 0.12.1.dev32
+Version: 0.12.1.dev42
 Summary: pywbem - A WBEM client
 Home-page: http://pywbem.github.io/pywbem/
 Author: Tim Potter

pywbem_mock/_wbemconnection_mock.py

@@ -92,14 +92,16 @@ def _uprint(dest, text):
     """
     Write text to dest, adding a newline character.
 
-    Text must be a unicode string and must not be None.
+    Text must be bytes or a unicode string and must not be None.
 
     If dest is a file path, the text is encoded to a UTF-8 Byte sequence and
     is appended to the file (opening and closing the file).
 
     If dest is None, the text is encoded to a codepage suitable for the current
     stdout and is written to stdout.
     """
+    if isinstance(text, six.binary_type):
+        text = text.decode('utf-8')
     if dest is None:
         btext = text.encode(STDOUT_ENCODING, 'replace')
         if six.PY3:
@@ -109,10 +111,10 @@ def _uprint(dest, text):
     else:
         if six.PY2:
             # Open with codecs to define text mode
-            with codecs.open(dest, mode='a', encoding='utf-8')as f:
+            with codecs.open(dest, mode='a', encoding='utf-8') as f:
                 print(text, file=f)
         else:
-            with open(dest, 'a') as f:
+            with open(dest, 'a', encoding='utf-8') as f:
                 print(text, file=f)
 
 

testsuite/test_wbemconnection_mock.py

@@ -1206,8 +1206,8 @@ def test_unicode(self, conn):
         cmof = u"""
         class CIM_Foo {
                 [Key,
-                 Description ("Å \u0420\u043e\u0441\u0441\u0438\u044f"
-                              "\u00E0 voil\u00e0")]
+                 Description ("\u212b \u0420\u043e\u0441\u0441\u0438"
+                              "\u044f\u00E0 voil\u00e0")]
             string InstanceID;
         };
         """