From 07a0d6dcc20dcf201d242ba2d8e4f14e5254b49f Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Sat, 4 Jun 2016 20:50:42 +0530 Subject: Py3: Return bytes from _Component class --- pathod/language/base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pathod/language/base.py') diff --git a/pathod/language/base.py b/pathod/language/base.py index 1369a3c7..228bfe3b 100644 --- a/pathod/language/base.py +++ b/pathod/language/base.py @@ -261,7 +261,7 @@ class _Component(Token): """ A value component of the primary specification of an message. - Components produce byte values desribe the bytes of the message. + Components produce byte values describing the bytes of the message. """ def values(self, settings): # pragma: no cover @@ -272,9 +272,9 @@ class _Component(Token): def string(self, settings=None): """ - A string representation of the object. + A bytestring representation of the object. """ - return "".join(i[:] for i in self.values(settings or {})) + return b"".join(i[:] for i in self.values(settings or {})) class KeyValue(_Component): -- cgit v1.2.3 From daba944151097da7fd1d3f9f2af1bd931e013003 Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Sun, 5 Jun 2016 23:21:11 +0530 Subject: Py3: Store base.Integer value as bytes --- pathod/language/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pathod/language/base.py') diff --git a/pathod/language/base.py b/pathod/language/base.py index 228bfe3b..c75005be 100644 --- a/pathod/language/base.py +++ b/pathod/language/base.py @@ -391,7 +391,7 @@ class Integer(_Component): "Integer value must be between %s and %s." % self.bounds, 0, 0 ) - self.value = str(value) + self.value = str(value).encode() @classmethod def expr(cls): @@ -404,7 +404,7 @@ class Integer(_Component): return self.value def spec(self): - return "%s%s" % (self.preamble, self.value) + return "%s%s" % (self.preamble, self.value.decode()) def freeze(self, settings_): return self -- cgit v1.2.3 From 5a2932adc11b9049e5609ae564cdee2482ef800c Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Sun, 5 Jun 2016 23:21:50 +0530 Subject: Py3: Fix corresponding base.Integer test in test_language_base --- pathod/language/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pathod/language/base.py') diff --git a/pathod/language/base.py b/pathod/language/base.py index c75005be..bc389792 100644 --- a/pathod/language/base.py +++ b/pathod/language/base.py @@ -401,7 +401,7 @@ class Integer(_Component): return e.setParseAction(lambda x: cls(*x)) def values(self, settings): - return self.value + return [self.value] def spec(self): return "%s%s" % (self.preamble, self.value.decode()) -- cgit v1.2.3 From 6447c8ae2256b0e074a04307a748d61f990e98d4 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 6 Jun 2016 13:31:44 -0700 Subject: fix .freeze(), improve tests --- pathod/language/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pathod/language/base.py') diff --git a/pathod/language/base.py b/pathod/language/base.py index bc389792..6cafdebd 100644 --- a/pathod/language/base.py +++ b/pathod/language/base.py @@ -578,4 +578,4 @@ class NestedMessage(Token): def freeze(self, settings): f = self.parsed.freeze(settings).spec() - return self.__class__(TokValueLiteral(strutils.bytes_to_escaped_str(f))) + return self.__class__(TokValueLiteral(strutils.bytes_to_escaped_str(f.encode()))) -- cgit v1.2.3 From 2ee5e8ef0e632545038a72f0cedc0320c59b00ff Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 6 Jun 2016 13:39:38 -0700 Subject: fix NestedMessage encoding --- pathod/language/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pathod/language/base.py') diff --git a/pathod/language/base.py b/pathod/language/base.py index 6cafdebd..25f3fd1a 100644 --- a/pathod/language/base.py +++ b/pathod/language/base.py @@ -555,7 +555,7 @@ class NestedMessage(Token): try: self.parsed = self.nest_type( self.nest_type.expr().parseString( - value.val, + value.val.decode(), parseAll=True ) ) -- cgit v1.2.3