From: Seth Forshee <seth.forshee@canonical.com>
To: Hauke Mehrtens <hauke@hauke-m.de>
Cc: haim.dreyfuss@intel.com, linux-wireless@vger.kernel.org,
wireless-regdb@lists.infradead.org
Subject: Re: [PATCH] wireless-regdb: remove dependency to python attr
Date: Wed, 24 Oct 2018 08:07:43 -0600 [thread overview]
Message-ID: <20181024140743.GC8750@ubuntu-xps13> (raw)
In-Reply-To: <20181006160254.7980-1-hauke@hauke-m.de>
Please remember to Cc wireless-regdb@lists.infradead.org for regdb
changes, adding now.
On Sat, Oct 06, 2018 at 06:02:54PM +0200, Hauke Mehrtens wrote:
> Commit 8607edfdb6568 ("wireless-regdb: Parse wmm rule data") introduced
> a dependency to the python module attr which is not included by default
> in all python installations. Replace the code with manually coding the
> constructor instead of using attr. This makes the code also work on
> systems without attr.
>
> I would like to avoid an additional dependency in OpenWrt where we
> compile the regulatory database inside of the build system.
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
I had wonderd if this would turn out to be a problem for someone.
Applied, thanks!
> ---
> dbparse.py | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/dbparse.py b/dbparse.py
> index 5fe752b..993f757 100755
> --- a/dbparse.py
> +++ b/dbparse.py
> @@ -5,7 +5,6 @@ from functools import total_ordering
> import sys, math
> from math import ceil, log
> from collections import defaultdict, OrderedDict
> -import attr
>
> # must match <linux/nl80211.h> enum nl80211_reg_rule_flags
>
> @@ -32,16 +31,17 @@ dfs_regions = {
>
> @total_ordering
>
> -@attr.s(frozen=True, cmp=False)
> class WmmRule(object):
> - vo_c = attr.ib()
> - vi_c = attr.ib()
> - be_c = attr.ib()
> - bk_c = attr.ib()
> - vo_ap = attr.ib()
> - vi_ap = attr.ib()
> - be_ap = attr.ib()
> - bk_ap = attr.ib()
> +
> + def __init__(self, vo_c, vi_c, be_c, bk_c, vo_ap, vi_ap, be_ap, bk_ap):
> + self.vo_c = vo_c
> + self.vi_c = vi_c
> + self.be_c = be_c
> + self.bk_c = bk_c
> + self.vo_ap = vo_ap
> + self.vi_ap = vi_ap
> + self.be_ap = be_ap
> + self.bk_ap = bk_ap
>
> def _as_tuple(self):
> return (self.vo_c, self.vi_c, self.be_c, self.bk_c,
> --
> 2.11.0
>
WARNING: multiple messages have this Message-ID (diff)
From: Seth Forshee <seth.forshee@canonical.com>
To: Hauke Mehrtens <hauke@hauke-m.de>
Cc: linux-wireless@vger.kernel.org, haim.dreyfuss@intel.com,
wireless-regdb@lists.infradead.org
Subject: Re: [wireless-regdb] [PATCH] wireless-regdb: remove dependency to python attr
Date: Wed, 24 Oct 2018 08:07:43 -0600 [thread overview]
Message-ID: <20181024140743.GC8750@ubuntu-xps13> (raw)
In-Reply-To: <20181006160254.7980-1-hauke@hauke-m.de>
Please remember to Cc wireless-regdb@lists.infradead.org for regdb
changes, adding now.
On Sat, Oct 06, 2018 at 06:02:54PM +0200, Hauke Mehrtens wrote:
> Commit 8607edfdb6568 ("wireless-regdb: Parse wmm rule data") introduced
> a dependency to the python module attr which is not included by default
> in all python installations. Replace the code with manually coding the
> constructor instead of using attr. This makes the code also work on
> systems without attr.
>
> I would like to avoid an additional dependency in OpenWrt where we
> compile the regulatory database inside of the build system.
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
I had wonderd if this would turn out to be a problem for someone.
Applied, thanks!
> ---
> dbparse.py | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/dbparse.py b/dbparse.py
> index 5fe752b..993f757 100755
> --- a/dbparse.py
> +++ b/dbparse.py
> @@ -5,7 +5,6 @@ from functools import total_ordering
> import sys, math
> from math import ceil, log
> from collections import defaultdict, OrderedDict
> -import attr
>
> # must match <linux/nl80211.h> enum nl80211_reg_rule_flags
>
> @@ -32,16 +31,17 @@ dfs_regions = {
>
> @total_ordering
>
> -@attr.s(frozen=True, cmp=False)
> class WmmRule(object):
> - vo_c = attr.ib()
> - vi_c = attr.ib()
> - be_c = attr.ib()
> - bk_c = attr.ib()
> - vo_ap = attr.ib()
> - vi_ap = attr.ib()
> - be_ap = attr.ib()
> - bk_ap = attr.ib()
> +
> + def __init__(self, vo_c, vi_c, be_c, bk_c, vo_ap, vi_ap, be_ap, bk_ap):
> + self.vo_c = vo_c
> + self.vi_c = vi_c
> + self.be_c = be_c
> + self.bk_c = bk_c
> + self.vo_ap = vo_ap
> + self.vi_ap = vi_ap
> + self.be_ap = be_ap
> + self.bk_ap = bk_ap
>
> def _as_tuple(self):
> return (self.vo_c, self.vi_c, self.be_c, self.bk_c,
> --
> 2.11.0
>
_______________________________________________
wireless-regdb mailing list
wireless-regdb@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/wireless-regdb
next prev parent reply other threads:[~2018-10-24 14:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-06 16:02 [PATCH] wireless-regdb: remove dependency to python attr Hauke Mehrtens
2018-10-24 14:07 ` Seth Forshee [this message]
2018-10-24 14:07 ` [wireless-regdb] " Seth Forshee
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=20181024140743.GC8750@ubuntu-xps13 \
--to=seth.forshee@canonical.com \
--cc=haim.dreyfuss@intel.com \
--cc=hauke@hauke-m.de \
--cc=linux-wireless@vger.kernel.org \
--cc=wireless-regdb@lists.infradead.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.