[dts] [PATCH V1]dep/lldp: explicitly encode str to bytes in python3
Tu, Lijuan
lijuan.tu at intel.com
Thu Jan 16 08:17:34 CET 2020
Applied failed, please rework.
> -----Original Message-----
> From: dts [mailto:dts-bounces at dpdk.org] On Behalf Of Xiao Qimai
> Sent: Thursday, January 16, 2020 3:05 PM
> To: dts at dpdk.org
> Cc: Xiao, QimaiX <qimaix.xiao at 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 at 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
More information about the dts
mailing list