* [Buildroot] [PATCH v1] utils/check-package: warn about utf-8 characters in .mk files
@ 2019-05-08 17:34 Peter Seiderer
2019-05-10 8:10 ` Titouan Christophe
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Peter Seiderer @ 2019-05-08 17:34 UTC (permalink / raw)
To: buildroot
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Note: is_ascii taken from one of the stackoverflow suggestions ([1])
[1] https://stackoverflow.com/questions/196345/how-to-check-if-a-string-in-python-is-in-ascii
---
utils/checkpackagelib/lib.py | 13 +++++++++++++
utils/checkpackagelib/lib_mk.py | 1 +
2 files changed, 14 insertions(+)
diff --git a/utils/checkpackagelib/lib.py b/utils/checkpackagelib/lib.py
index 6afe1aabce..c65a2ed939 100644
--- a/utils/checkpackagelib/lib.py
+++ b/utils/checkpackagelib/lib.py
@@ -52,3 +52,16 @@ class TrailingSpace(_CheckFunction):
return ["{}:{}: line contains trailing whitespace"
.format(self.filename, lineno),
text]
+
+class Utf8Characters(_CheckFunction):
+ def is_ascii(self, s):
+ try:
+ return all(ord(c) < 128 for c in s)
+ except TypeError:
+ return False
+
+ def check_line(self, lineno, text):
+ if not self.is_ascii(text):
+ return ["{}:{}: line contains UTF-8 characters"
+ .format(self.filename, lineno),
+ text]
diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
index 00efeb7fb2..9e9a045776 100644
--- a/utils/checkpackagelib/lib_mk.py
+++ b/utils/checkpackagelib/lib_mk.py
@@ -11,6 +11,7 @@ from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401
from checkpackagelib.lib import EmptyLastLine # noqa: F401
from checkpackagelib.lib import NewlineAtEof # noqa: F401
from checkpackagelib.lib import TrailingSpace # noqa: F401
+from checkpackagelib.lib import Utf8Characters # noqa: F401
# used in more than one check
start_conditional = ["ifdef", "ifeq", "ifndef", "ifneq"]
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH v1] utils/check-package: warn about utf-8 characters in .mk files
2019-05-08 17:34 [Buildroot] [PATCH v1] utils/check-package: warn about utf-8 characters in .mk files Peter Seiderer
@ 2019-05-10 8:10 ` Titouan Christophe
2019-05-18 21:36 ` Thomas Petazzoni
2019-05-19 9:41 ` Yann E. MORIN
2 siblings, 0 replies; 5+ messages in thread
From: Titouan Christophe @ 2019-05-10 8:10 UTC (permalink / raw)
To: buildroot
Hi all,
Works as expected with both Py2 and Py3
On 5/8/19 7:34 PM, Peter Seiderer wrote:
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Tested-by: Titouan Christophe <titouan.christophe@railnova.eu>
> ---
> Note: is_ascii taken from one of the stackoverflow suggestions ([1])
>
> [1] https://stackoverflow.com/questions/196345/how-to-check-if-a-string-in-python-is-in-ascii
> ---
> utils/checkpackagelib/lib.py | 13 +++++++++++++
> utils/checkpackagelib/lib_mk.py | 1 +
> 2 files changed, 14 insertions(+)
>
> diff --git a/utils/checkpackagelib/lib.py b/utils/checkpackagelib/lib.py
> index 6afe1aabce..c65a2ed939 100644
> --- a/utils/checkpackagelib/lib.py
> +++ b/utils/checkpackagelib/lib.py
> @@ -52,3 +52,16 @@ class TrailingSpace(_CheckFunction):
> return ["{}:{}: line contains trailing whitespace"
> .format(self.filename, lineno),
> text]
> +
> +class Utf8Characters(_CheckFunction):
> + def is_ascii(self, s):
> + try:
> + return all(ord(c) < 128 for c in s)
> + except TypeError:
> + return False
> +
> + def check_line(self, lineno, text):
> + if not self.is_ascii(text):
> + return ["{}:{}: line contains UTF-8 characters"
> + .format(self.filename, lineno),
> + text]
> diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
> index 00efeb7fb2..9e9a045776 100644
> --- a/utils/checkpackagelib/lib_mk.py
> +++ b/utils/checkpackagelib/lib_mk.py
> @@ -11,6 +11,7 @@ from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401
> from checkpackagelib.lib import EmptyLastLine # noqa: F401
> from checkpackagelib.lib import NewlineAtEof # noqa: F401
> from checkpackagelib.lib import TrailingSpace # noqa: F401
> +from checkpackagelib.lib import Utf8Characters # noqa: F401
>
> # used in more than one check
> start_conditional = ["ifdef", "ifeq", "ifndef", "ifneq"]
> --
> 2.21.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [PATCH v1] utils/check-package: warn about utf-8 characters in .mk files
2019-05-08 17:34 [Buildroot] [PATCH v1] utils/check-package: warn about utf-8 characters in .mk files Peter Seiderer
2019-05-10 8:10 ` Titouan Christophe
@ 2019-05-18 21:36 ` Thomas Petazzoni
2019-05-19 9:41 ` Yann E. MORIN
2 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2019-05-18 21:36 UTC (permalink / raw)
To: buildroot
On Wed, 8 May 2019 19:34:27 +0200
Peter Seiderer <ps.report@gmx.net> wrote:
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Note: is_ascii taken from one of the stackoverflow suggestions ([1])
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v1] utils/check-package: warn about utf-8 characters in .mk files
2019-05-08 17:34 [Buildroot] [PATCH v1] utils/check-package: warn about utf-8 characters in .mk files Peter Seiderer
2019-05-10 8:10 ` Titouan Christophe
2019-05-18 21:36 ` Thomas Petazzoni
@ 2019-05-19 9:41 ` Yann E. MORIN
2019-05-19 21:19 ` Peter Seiderer
2 siblings, 1 reply; 5+ messages in thread
From: Yann E. MORIN @ 2019-05-19 9:41 UTC (permalink / raw)
To: buildroot
Peter, All,
On 2019-05-08 19:34 +0200, Peter Seiderer spake thusly:
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Note: is_ascii taken from one of the stackoverflow suggestions ([1])
>
> [1] https://stackoverflow.com/questions/196345/how-to-check-if-a-string-in-python-is-in-ascii
> ---
> utils/checkpackagelib/lib.py | 13 +++++++++++++
> utils/checkpackagelib/lib_mk.py | 1 +
> 2 files changed, 14 insertions(+)
>
> diff --git a/utils/checkpackagelib/lib.py b/utils/checkpackagelib/lib.py
> index 6afe1aabce..c65a2ed939 100644
> --- a/utils/checkpackagelib/lib.py
> +++ b/utils/checkpackagelib/lib.py
> @@ -52,3 +52,16 @@ class TrailingSpace(_CheckFunction):
> return ["{}:{}: line contains trailing whitespace"
> .format(self.filename, lineno),
> text]
> +
> +class Utf8Characters(_CheckFunction):
This breaks flake8:
utils/checkpackagelib/lib.py:56:1: E302 expected 2 blank lines, found 1
Regards,
Yann E. MORIN.
> + def is_ascii(self, s):
> + try:
> + return all(ord(c) < 128 for c in s)
> + except TypeError:
> + return False
> +
> + def check_line(self, lineno, text):
> + if not self.is_ascii(text):
> + return ["{}:{}: line contains UTF-8 characters"
> + .format(self.filename, lineno),
> + text]
> diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
> index 00efeb7fb2..9e9a045776 100644
> --- a/utils/checkpackagelib/lib_mk.py
> +++ b/utils/checkpackagelib/lib_mk.py
> @@ -11,6 +11,7 @@ from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401
> from checkpackagelib.lib import EmptyLastLine # noqa: F401
> from checkpackagelib.lib import NewlineAtEof # noqa: F401
> from checkpackagelib.lib import TrailingSpace # noqa: F401
> +from checkpackagelib.lib import Utf8Characters # noqa: F401
>
> # used in more than one check
> start_conditional = ["ifdef", "ifeq", "ifndef", "ifneq"]
> --
> 2.21.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [PATCH v1] utils/check-package: warn about utf-8 characters in .mk files
2019-05-19 9:41 ` Yann E. MORIN
@ 2019-05-19 21:19 ` Peter Seiderer
0 siblings, 0 replies; 5+ messages in thread
From: Peter Seiderer @ 2019-05-19 21:19 UTC (permalink / raw)
To: buildroot
Hello Yann,
On Sun, 19 May 2019 11:41:25 +0200, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> Peter, All,
>
> On 2019-05-08 19:34 +0200, Peter Seiderer spake thusly:
> > Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> > ---
> > Note: is_ascii taken from one of the stackoverflow suggestions ([1])
> >
> > [1] https://stackoverflow.com/questions/196345/how-to-check-if-a-string-in-python-is-in-ascii
> > ---
> > utils/checkpackagelib/lib.py | 13 +++++++++++++
> > utils/checkpackagelib/lib_mk.py | 1 +
> > 2 files changed, 14 insertions(+)
> >
> > diff --git a/utils/checkpackagelib/lib.py b/utils/checkpackagelib/lib.py
> > index 6afe1aabce..c65a2ed939 100644
> > --- a/utils/checkpackagelib/lib.py
> > +++ b/utils/checkpackagelib/lib.py
> > @@ -52,3 +52,16 @@ class TrailingSpace(_CheckFunction):
> > return ["{}:{}: line contains trailing whitespace"
> > .format(self.filename, lineno),
> > text]
> > +
> > +class Utf8Characters(_CheckFunction):
>
> This breaks flake8:
>
> utils/checkpackagelib/lib.py:56:1: E302 expected 2 blank lines, found 1
Sorry, introduced due to my poor python formatting skills..., patch to fix
it just send out...
Regards,
Peter
>
> Regards,
> Yann E. MORIN.
>
> > + def is_ascii(self, s):
> > + try:
> > + return all(ord(c) < 128 for c in s)
> > + except TypeError:
> > + return False
> > +
> > + def check_line(self, lineno, text):
> > + if not self.is_ascii(text):
> > + return ["{}:{}: line contains UTF-8 characters"
> > + .format(self.filename, lineno),
> > + text]
> > diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
> > index 00efeb7fb2..9e9a045776 100644
> > --- a/utils/checkpackagelib/lib_mk.py
> > +++ b/utils/checkpackagelib/lib_mk.py
> > @@ -11,6 +11,7 @@ from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401
> > from checkpackagelib.lib import EmptyLastLine # noqa: F401
> > from checkpackagelib.lib import NewlineAtEof # noqa: F401
> > from checkpackagelib.lib import TrailingSpace # noqa: F401
> > +from checkpackagelib.lib import Utf8Characters # noqa: F401
> >
> > # used in more than one check
> > start_conditional = ["ifdef", "ifeq", "ifndef", "ifneq"]
> > --
> > 2.21.0
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-05-19 21:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-08 17:34 [Buildroot] [PATCH v1] utils/check-package: warn about utf-8 characters in .mk files Peter Seiderer
2019-05-10 8:10 ` Titouan Christophe
2019-05-18 21:36 ` Thomas Petazzoni
2019-05-19 9:41 ` Yann E. MORIN
2019-05-19 21:19 ` Peter Seiderer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox