From: "Tu, Lijuan" <lijuan.tu@intel.com>
To: "Xiao, QimaiX" <qimaix.xiao@intel.com>, "dts@dpdk.org" <dts@dpdk.org>
Cc: "Xiao, QimaiX" <qimaix.xiao@intel.com>
Subject: Re: [dts] [PATCH V1]dep/lldp: explicitly encode str to bytes in python3
Date: Thu, 16 Jan 2020 07:17:34 +0000 [thread overview]
Message-ID: <8CE3E05A3F976642AAB0F4675D0AD20E0BBAB73E@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <1579158326-432253-1-git-send-email-qimaix.xiao@intel.com>
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
prev parent reply other threads:[~2020-01-16 7:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-16 7:05 Xiao Qimai
2020-01-16 7:17 ` Tu, Lijuan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8CE3E05A3F976642AAB0F4675D0AD20E0BBAB73E@SHSMSX101.ccr.corp.intel.com \
--to=lijuan.tu@intel.com \
--cc=dts@dpdk.org \
--cc=qimaix.xiao@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).