Changeset 86891 in vbox for trunk/src/VBox/ValidationKit/testmanager

Timestamp:

Nov 16, 2020 2:39:15 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

141362

Message:

vsheriff: python 3 adjustments. bugref:9788

File:

• trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py

@@ -348 +348 @@
         print('error: %s' % (sText,));
         if self.oLogFile is not None:
-            self.oLogFile.write((u'error: %s\n' % (sText,)).encode('utf-8'));
+            if sys.version_info[0] >= 3:
+                self.oLogFile.write(u'error: %s\n' % (sText,));
+            else:
+                self.oLogFile.write((u'error: %s\n' % (sText,)).encode('utf-8'));
         return 1;
 
@@ -359 +362 @@
                 print('debug: %s' % (sText, ));
             if self.oLogFile is not None:
-                self.oLogFile.write((u'debug: %s\n' % (sText,)).encode('utf-8'));
+                if sys.version_info[0] >= 3:
+                    self.oLogFile.write(u'debug: %s\n' % (sText,));
+                else:
+                    self.oLogFile.write((u'debug: %s\n' % (sText,)).encode('utf-8'));
         return 0;
 
@@ -369 +375 @@
             print('info: %s' % (sText,));
         if self.oLogFile is not None:
-            self.oLogFile.write((u'info: %s\n' % (sText,)).encode('utf-8'));
+            if sys.version_info[0] >= 3:
+                self.oLogFile.write(u'info: %s\n' % (sText,));
+            else:
+                self.oLogFile.write((u'info: %s\n' % (sText,)).encode('utf-8'));
         return 0;