Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Move xdrlib over to the bytes type.

This commit is contained in:
Brett Cannon 2007-07-26 03:19:46 +00:00
parent d24fffe7c6
commit 1eb79cfd6d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_xdrlib.py
View File

@ -8,8 +8,8 @@ class XDRTest(unittest.TestCase):
def test_xdr(self): def test_xdr(self):
p = xdrlib.Packer() p = xdrlib.Packer()
s = 'hello world' s = b'hello world'
a = ['what', 'is', 'hapnin', 'doctor'] a = [b'what', b'is', b'hapnin', b'doctor']
p.pack_int(42) p.pack_int(42)
p.pack_uint(9) p.pack_uint(9)

10
Lib/xdrlib.py
View File

@ -5,7 +5,7 @@ See: RFC 1014
""" """
import struct import struct
from io import StringIO as _StringIO from io import BytesIO
__all__ = ["Error", "Packer", "Unpacker", "ConversionError"] __all__ = ["Error", "Packer", "Unpacker", "ConversionError"]
@ -40,7 +40,7 @@ class Packer:
self.reset() self.reset()
def reset(self): def reset(self):
self.__buf = _StringIO() self.__buf = BytesIO()
def get_buffer(self): def get_buffer(self):
return self.__buf.getvalue() return self.__buf.getvalue()
@ -54,8 +54,8 @@ class Packer:
pack_enum = pack_int pack_enum = pack_int
def pack_bool(self, x): def pack_bool(self, x):
if x: self.__buf.write('\0\0\0\1') if x: self.__buf.write(b'\0\0\0\1')
else: self.__buf.write('\0\0\0\0') else: self.__buf.write(b'\0\0\0\0')
def pack_uhyper(self, x): def pack_uhyper(self, x):
self.pack_uint(x>>32 & 0xffffffff) self.pack_uint(x>>32 & 0xffffffff)
@ -78,7 +78,7 @@ class Packer:
raise ValueError, 'fstring size must be nonnegative' raise ValueError, 'fstring size must be nonnegative'
data = s[:n] data = s[:n]
n = ((n+3)//4)*4 n = ((n+3)//4)*4
data = data + (n - len(data)) * '\0' data = data + (n - len(data)) * b'\0'
self.__buf.write(data) self.__buf.write(data)
pack_fopaque = pack_fstring pack_fopaque = pack_fstring