commit 4f0467a545de9e4e5e9080472a45fdc1c70bae3c
author Jean-Paul Calderone <exarkun@twistedmatrix.com> Sat Jan 11 11:58:41 2014 -0500
committer Jean-Paul Calderone <exarkun@twistedmatrix.com> Sat Jan 11 11:58:41 2014 -0500
tree 72fc443cb4a37d75490d1d0b828f0a45cc7a6e56
parent 7307cd3c62c6c4b08d3302db1853ea4b3dba2f9a

Lots of Python 3.2 porting work

OpenSSL/test/util.py

diff --git a/OpenSSL/test/util.py b/OpenSSL/test/util.py
index 2096fd5..011e7da 100644
--- a/OpenSSL/test/util.py
+++ b/OpenSSL/test/util.py
@@ -19,16 +19,7 @@
 
 import memdbg
 
-if sys.version_info < (3, 0):
-    def b(s):
-        return s
-    bytes = str
-else:
-    def b(s):
-        return s.encode("charmap")
-    bytes = bytes
-
-from OpenSSL._util import ffi, lib
+from OpenSSL._util import ffi, lib, byte_string as b
 
 class TestCase(TestCase):
     """