From cecafa7e4809c8c2bfa77446beea8beb3a51d8dc Mon Sep 17 00:00:00 2001
From: John Ehresman <jpe@wingware.com>
Date: Fri, 16 Apr 2010 11:55:50 -0400
Subject: Test fixes for bytes

---
 tests/common.py        |  5 ++++-
 tests/test_gicon.py    | 12 ++++++------
 tests/test_mainloop.py |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'tests')

diff --git a/tests/common.py b/tests/common.py
index 5222230..b5f5bfc 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -51,7 +51,10 @@ def importModule(module, directory, name=None):
 
 if sys.version_info >= (3, 0):
     def _bytes(s):
-        return s.encode('latin1')
+        if isinstance(s, str):
+            return s.encode('latin1')
+        else:
+            return bytes(s)
 else:
     _bytes = str
 
diff --git a/tests/test_gicon.py b/tests/test_gicon.py
index 5ce7ece..67e33eb 100644
--- a/tests/test_gicon.py
+++ b/tests/test_gicon.py
@@ -3,7 +3,7 @@
 import os
 import unittest
 
-from common import gio, glib
+from common import gio, glib, _bytes
 
 
 class TestIcon(unittest.TestCase):
@@ -28,11 +28,11 @@ class TestIcon(unittest.TestCase):
 
 class TestLoadableIcon(unittest.TestCase):
     def setUp(self):
-        self.file = open('temp.svg', 'w')
-        self.svg = ('<?xml version="1.0" encoding="UTF-8" standalone="no"?>'
-                    '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" '
-                    '"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">'
-                    '<svg width="32" height="32"/>')
+        self.file = open('temp.svg', 'wb')
+        self.svg = _bytes('<?xml version="1.0" encoding="UTF-8" standalone="no"?>'
+                          '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" '
+                          '"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">'
+                          '<svg width="32" height="32"/>')
         self.file.write(self.svg)
         self.file.close()
         self.icon = gio.FileIcon(gio.File('temp.svg'))
diff --git a/tests/test_mainloop.py b/tests/test_mainloop.py
index afb550a..a82063f 100644
--- a/tests/test_mainloop.py
+++ b/tests/test_mainloop.py
@@ -5,7 +5,7 @@ import sys
 import select
 import unittest
 
-from common import glib
+from common import glib, _bytes
 
 class TestMainLoop(unittest.TestCase):
     def testExceptionHandling(self):
@@ -26,7 +26,7 @@ class TestMainLoop(unittest.TestCase):
         glib.child_watch_add(pid, child_died, loop)
 
         os.close(pipe_r)
-        os.write(pipe_w, "Y")
+        os.write(pipe_w, _bytes("Y"))
         os.close(pipe_w)
 
         def excepthook(type, value, traceback):
-- 
cgit