cpython: 9cee201388c9 (original) (raw)

Mercurial > cpython

changeset 92929:9cee201388c9 2.7

Issue #11694: Raise ConversionError in xdrlib as documented [#11694]

line wrap: on

line diff

--- a/Lib/test/test_xdrlib.py +++ b/Lib/test/test_xdrlib.py @@ -51,8 +51,32 @@ class XDRTest(unittest.TestCase): up.done() self.assertRaises(EOFError, up.unpack_uint) +class ConversionErrorTest(unittest.TestCase): +

• def setUp(self):

•    self.packer = xdrlib.Packer()[](#l1.10)

+

• def assertRaisesConversion(self, *args):

•    self.assertRaises(xdrlib.ConversionError, *args)[](#l1.13)

+

• def test_pack_int(self):

•    self.assertRaisesConversion(self.packer.pack_int, 'string')[](#l1.16)

+

• def test_pack_uint(self):

•    self.assertRaisesConversion(self.packer.pack_uint, 'string')[](#l1.19)

+

• def test_float(self):

•    self.assertRaisesConversion(self.packer.pack_float, 'string')[](#l1.22)

+

• def test_double(self):

•    self.assertRaisesConversion(self.packer.pack_double, 'string')[](#l1.25)

+

• def test_uhyper(self):

•    self.assertRaisesConversion(self.packer.pack_uhyper, 'string')[](#l1.28)

+ def test_main(): test_support.run_unittest(XDRTest)

• test_support.run_unittest(ConversionErrorTest)

if name == "main": test_main()

--- a/Lib/xdrlib.py +++ b/Lib/xdrlib.py @@ -9,6 +9,7 @@ try: from cStringIO import StringIO as _StringIO except ImportError: from StringIO import StringIO as _StringIO +from functools import wraps all = ["Error", "Packer", "Unpacker", "ConversionError"] @@ -34,6 +35,16 @@ class Error(Exception): class ConversionError(Error): pass +def raise_conversion_error(function):

• """ Wrap any raised struct.errors in a ConversionError. """

+

• @wraps(function)
• def result(self, value):

•    try:[](#l2.20)

•        return function(self, value)[](#l2.21)

•    except struct.error as e:[](#l2.22)

•        raise ConversionError(e.args[0])[](#l2.23)

• return result

class Packer: @@ -50,9 +61,11 @@ class Packer: # backwards compatibility get_buf = get_buffer

• @raise_conversion_error def pack_uint(self, x): self.__buf.write(struct.pack('>L', x))

• @raise_conversion_error def pack_int(self, x): self.__buf.write(struct.pack('>l', x))

@@ -63,20 +76,24 @@ class Packer: else: self.__buf.write('\0\0\0\0') def pack_uhyper(self, x):

•    self.pack_uint(x>>32 & 0xffffffffL)[](#l2.44)

•    self.pack_uint(x & 0xffffffffL)[](#l2.45)

•    try:[](#l2.46)

•        self.pack_uint(x>>32 & 0xffffffffL)[](#l2.47)

•    except (TypeError, struct.error) as e:[](#l2.48)

•        raise ConversionError(e.args[0])[](#l2.49)

•    try:[](#l2.50)

•        self.pack_uint(x & 0xffffffffL)[](#l2.51)

•    except (TypeError, struct.error) as e:[](#l2.52)

•        raise ConversionError(e.args[0])[](#l2.53)

pack_hyper = pack_uhyper

• @raise_conversion_error def pack_float(self, x):

•    try: self.__buf.write(struct.pack('>f', x))[](#l2.59)

•    except struct.error, msg:[](#l2.60)

•        raise ConversionError, msg[](#l2.61)

•    self.__buf.write(struct.pack('>f', x))[](#l2.62)

• @raise_conversion_error def pack_double(self, x):

•    try: self.__buf.write(struct.pack('>d', x))[](#l2.66)

•    except struct.error, msg:[](#l2.67)

•        raise ConversionError, msg[](#l2.68)

•    self.__buf.write(struct.pack('>d', x))[](#l2.69)

def pack_fstring(self, n, s): if n < 0:

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -34,6 +34,9 @@ Core and Builtins Library ------- +- Issue #11694: Raise ConversionError in xdrlib as documented. Patch

• by Filip Gruszczyński and Claudiu Popa. +

• Issue #1686: Fix string.Template when overriding the pattern attribute.
• Issue #11866: Eliminated race condition in the computation of names