* [dts] [PATCH V1]dep/lldp: explicitly encode str to bytes in python3
@ 2020-01-16 7:05 Xiao Qimai
2020-01-16 7:17 ` Tu, Lijuan
0 siblings, 1 reply; 2+ messages in thread
From: Xiao Qimai @ 2020-01-16 7:05 UTC (permalink / raw)
To: dts; +Cc: Xiao Qimai
python3 will not implicitly convert bytes to str
Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
dep/lldp.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dep/lldp.py b/dep/lldp.py
index d8fabe2..faa3b4d 100644
--- a/dep/lldp.py
+++ b/dep/lldp.py
@@ -79,7 +79,7 @@ class LLDPGeneric(Packet):
def post_build(self, p, pay):
if self.length is None:
l = len(p) - 2
- p = chr((self.type << 1) ^ (l >> 8)) + chr(l & 0xff) + p[2:]
+ p = chr((self.type << 1) ^ (l >> 8)).encode() + chr(l & 0xff).encode() + p[2:]
return p+pay
@@ -212,7 +212,7 @@ class LLDPManagementAddress(LLDPGeneric):
# TODO Remove redundant code. LLDPGeneric.post_build()
if self.length is None:
l = len(p) - 2
- p = chr((self.type << 1) ^ (l >> 8)) + chr(l & 0xff) + p[2:]
+ p = chr((self.type << 1) ^ (l >> 8)).encode() + chr(l & 0xff).encode() + p[2:]
if self.addrlen is None:
addrlen = len(p) - 2 - 8 - len(self.oid) + 1
--
2.17.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [dts] [PATCH V1]dep/lldp: explicitly encode str to bytes in python3
2020-01-16 7:05 [dts] [PATCH V1]dep/lldp: explicitly encode str to bytes in python3 Xiao Qimai
@ 2020-01-16 7:17 ` Tu, Lijuan
0 siblings, 0 replies; 2+ messages in thread
From: Tu, Lijuan @ 2020-01-16 7:17 UTC (permalink / raw)
To: Xiao, QimaiX, dts; +Cc: Xiao, QimaiX
Applied failed, please rework.
> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Xiao Qimai
> Sent: Thursday, January 16, 2020 3:05 PM
> To: dts@dpdk.org
> Cc: Xiao, QimaiX <qimaix.xiao@intel.com>
> Subject: [dts] [PATCH V1]dep/lldp: explicitly encode str to bytes in python3
>
> python3 will not implicitly convert bytes to str
>
> Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
> ---
> dep/lldp.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/dep/lldp.py b/dep/lldp.py
> index d8fabe2..faa3b4d 100644
> --- a/dep/lldp.py
> +++ b/dep/lldp.py
> @@ -79,7 +79,7 @@ class LLDPGeneric(Packet):
> def post_build(self, p, pay):
> if self.length is None:
> l = len(p) - 2
> - p = chr((self.type << 1) ^ (l >> 8)) + chr(l & 0xff) + p[2:]
> + p = chr((self.type << 1) ^ (l >> 8)).encode() + chr(l & 0xff).encode() +
> p[2:]
>
> return p+pay
>
> @@ -212,7 +212,7 @@ class LLDPManagementAddress(LLDPGeneric):
> # TODO Remove redundant code. LLDPGeneric.post_build()
> if self.length is None:
> l = len(p) - 2
> - p = chr((self.type << 1) ^ (l >> 8)) + chr(l & 0xff) + p[2:]
> + p = chr((self.type << 1) ^ (l >> 8)).encode() + chr(l & 0xff).encode() +
> p[2:]
>
> if self.addrlen is None:
> addrlen = len(p) - 2 - 8 - len(self.oid) + 1
> --
> 2.17.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-16 7:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-16 7:05 [dts] [PATCH V1]dep/lldp: explicitly encode str to bytes in python3 Xiao Qimai
2020-01-16 7:17 ` Tu, Lijuan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).