[PATCH] python/sepolicy: silence new flake8 warnings

[PATCH] python/sepolicy: silence new flake8 warnings

[Nicolas Iooss]

pyflakes 2.2.0 improved the way format strings are analyzed, which
triggers new warnings in flake8:

    python/sepolicy/sepolicy/manpage.py:1046:23: F999 '...' % ... has
    unused named argument(s): type

    python/sepolicy/sepolicy/manpage.py:1225:23: F999 '...' % ... has
    unused named argument(s): user

Remove the unused arguments in order to silence these warnings.

This fixes failures in Travis-CI such as
https://travis-ci.org/github/SELinuxProject/selinux/jobs/686230518#L5153

Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
---
 python/sepolicy/sepolicy/manpage.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
index 442608191cc8..3e8a3be907e3 100755
--- a/python/sepolicy/sepolicy/manpage.py
+++ b/python/sepolicy/sepolicy/manpage.py
@@ -1074,7 +1074,7 @@ If you wanted to change the default user mapping to use the %(user)s_u user, you
 
 .B semanage login -m -s %(user)s_u __default__
 
-""" % {'desc': self.desc, 'type': self.type, 'user': self.domainname, 'range': self._get_users_range()})
+""" % {'desc': self.desc, 'user': self.domainname, 'range': self._get_users_range()})
 
         if "login_userdomain" in self.attributes and "login_userdomain" in self.all_attributes:
             self.fd.write("""
@@ -1245,7 +1245,7 @@ Execute the following to see the types that the SELinux user %(type)s can execut
 
 .B $ sesearch -A -s %(type)s -c process -p transition
 
-""" % {'user': self.domainname, 'type': self.type})
+""" % {'type': self.type})
 
     def _role_header(self):
         self.fd.write('.TH  "%(user)s_selinux"  "8"  "%(user)s" "mgrepl@redhat.com" "%(user)s SELinux Policy documentation"'
-- 
2.26.2

RE: [PATCH] python/sepolicy: silence new flake8 warnings

[Roberts, William C]

> -----Original Message-----
> From: selinux-owner@vger.kernel.org [mailto:selinux-owner@vger.kernel.org]
> On Behalf Of Nicolas Iooss
> Sent: Tuesday, May 12, 2020 2:30 PM
> To: selinux@vger.kernel.org
> Subject: [PATCH] python/sepolicy: silence new flake8 warnings
> 
> pyflakes 2.2.0 improved the way format strings are analyzed, which triggers new
> warnings in flake8:
> 
>     python/sepolicy/sepolicy/manpage.py:1046:23: F999 '...' % ... has
>     unused named argument(s): type
> 
>     python/sepolicy/sepolicy/manpage.py:1225:23: F999 '...' % ... has
>     unused named argument(s): user
> 
> Remove the unused arguments in order to silence these warnings.
> 
> This fixes failures in Travis-CI such as
> https://travis-ci.org/github/SELinuxProject/selinux/jobs/686230518#L5153
> 
> Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
> ---
>  python/sepolicy/sepolicy/manpage.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/python/sepolicy/sepolicy/manpage.py
> b/python/sepolicy/sepolicy/manpage.py
> index 442608191cc8..3e8a3be907e3 100755
> --- a/python/sepolicy/sepolicy/manpage.py
> +++ b/python/sepolicy/sepolicy/manpage.py
> @@ -1074,7 +1074,7 @@ If you wanted to change the default user mapping to
> use the %(user)s_u user, you
> 
>  .B semanage login -m -s %(user)s_u __default__
> 
> -""" % {'desc': self.desc, 'type': self.type, 'user': self.domainname, 'range':
> self._get_users_range()})
> +""" % {'desc': self.desc, 'user': self.domainname, 'range':
> +self._get_users_range()})
> 
>          if "login_userdomain" in self.attributes and "login_userdomain" in
> self.all_attributes:
>              self.fd.write("""
> @@ -1245,7 +1245,7 @@ Execute the following to see the types that the SELinux
> user %(type)s can execut
> 
>  .B $ sesearch -A -s %(type)s -c process -p transition
> 
> -""" % {'user': self.domainname, 'type': self.type})
> +""" % {'type': self.type})
> 
>      def _role_header(self):
>          self.fd.write('.TH  "%(user)s_selinux"  "8"  "%(user)s" "mgrepl@redhat.com"
> "%(user)s SELinux Policy documentation"'
> --
> 2.26.2

I just hit this issue in the CI, good timing.

Acked-by: William Roberts <william.c.roberts@intel.com>

Re: [PATCH] python/sepolicy: silence new flake8 warnings

[Nicolas Iooss]

On Tue, May 12, 2020 at 9:40 PM Roberts, William C
<william.c.roberts@intel.com> wrote:
>
> > -----Original Message-----
> > From: selinux-owner@vger.kernel.org [mailto:selinux-owner@vger.kernel.org]
> > On Behalf Of Nicolas Iooss
> > Sent: Tuesday, May 12, 2020 2:30 PM
> > To: selinux@vger.kernel.org
> > Subject: [PATCH] python/sepolicy: silence new flake8 warnings
> >
> > pyflakes 2.2.0 improved the way format strings are analyzed, which triggers new
> > warnings in flake8:
> >
> >     python/sepolicy/sepolicy/manpage.py:1046:23: F999 '...' % ... has
> >     unused named argument(s): type
> >
> >     python/sepolicy/sepolicy/manpage.py:1225:23: F999 '...' % ... has
> >     unused named argument(s): user
> >
> > Remove the unused arguments in order to silence these warnings.
> >
> > This fixes failures in Travis-CI such as
> > https://travis-ci.org/github/SELinuxProject/selinux/jobs/686230518#L5153
> >
> > Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
> > ---
> >  python/sepolicy/sepolicy/manpage.py | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/python/sepolicy/sepolicy/manpage.py
> > b/python/sepolicy/sepolicy/manpage.py
> > index 442608191cc8..3e8a3be907e3 100755
> > --- a/python/sepolicy/sepolicy/manpage.py
> > +++ b/python/sepolicy/sepolicy/manpage.py
> > @@ -1074,7 +1074,7 @@ If you wanted to change the default user mapping to
> > use the %(user)s_u user, you
> >
> >  .B semanage login -m -s %(user)s_u __default__
> >
> > -""" % {'desc': self.desc, 'type': self.type, 'user': self.domainname, 'range':
> > self._get_users_range()})
> > +""" % {'desc': self.desc, 'user': self.domainname, 'range':
> > +self._get_users_range()})
> >
> >          if "login_userdomain" in self.attributes and "login_userdomain" in
> > self.all_attributes:
> >              self.fd.write("""
> > @@ -1245,7 +1245,7 @@ Execute the following to see the types that the SELinux
> > user %(type)s can execut
> >
> >  .B $ sesearch -A -s %(type)s -c process -p transition
> >
> > -""" % {'user': self.domainname, 'type': self.type})
> > +""" % {'type': self.type})
> >
> >      def _role_header(self):
> >          self.fd.write('.TH  "%(user)s_selinux"  "8"  "%(user)s" "mgrepl@redhat.com"
> > "%(user)s SELinux Policy documentation"'
> > --
> > 2.26.2
>
> I just hit this issue in the CI, good timing.
>
> Acked-by: William Roberts <william.c.roberts@intel.com>

So did I, while wanting to test the last patches that have been sent
to the mailing list
(https://travis-ci.org/github/fishilico/selinux/builds/686257022). As
the CI worked fine at least 4 days ago, it is a very recent change. I
reproduced it easily on my Arch Linux development system by updating
it, and downgrading python-pyflakes to its previous version (2.1.1)
made the issue disappear. This is why I am sure this is caused by the
latest release of pyflakes.

Cheers,
Nicolas

Re: [PATCH] python/sepolicy: silence new flake8 warnings

[Petr Lautrbach]

[-- Attachment #1: Type: text/plain, Size: 2115 bytes --]

On Tue, May 12, 2020 at 09:29:57PM +0200, Nicolas Iooss wrote:
> pyflakes 2.2.0 improved the way format strings are analyzed, which
> triggers new warnings in flake8:
> 
>     python/sepolicy/sepolicy/manpage.py:1046:23: F999 '...' % ... has
>     unused named argument(s): type
> 
>     python/sepolicy/sepolicy/manpage.py:1225:23: F999 '...' % ... has
>     unused named argument(s): user
> 
> Remove the unused arguments in order to silence these warnings.
> 
> This fixes failures in Travis-CI such as
> https://travis-ci.org/github/SELinuxProject/selinux/jobs/686230518#L5153
> 
> Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
> Acked-by: William Roberts <william.c.roberts@intel.com>

Applied.


> ---
>  python/sepolicy/sepolicy/manpage.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
> index 442608191cc8..3e8a3be907e3 100755
> --- a/python/sepolicy/sepolicy/manpage.py
> +++ b/python/sepolicy/sepolicy/manpage.py
> @@ -1074,7 +1074,7 @@ If you wanted to change the default user mapping to use the %(user)s_u user, you
>  
>  .B semanage login -m -s %(user)s_u __default__
>  
> -""" % {'desc': self.desc, 'type': self.type, 'user': self.domainname, 'range': self._get_users_range()})
> +""" % {'desc': self.desc, 'user': self.domainname, 'range': self._get_users_range()})
>  
>          if "login_userdomain" in self.attributes and "login_userdomain" in self.all_attributes:
>              self.fd.write("""
> @@ -1245,7 +1245,7 @@ Execute the following to see the types that the SELinux user %(type)s can execut
>  
>  .B $ sesearch -A -s %(type)s -c process -p transition
>  
> -""" % {'user': self.domainname, 'type': self.type})
> +""" % {'type': self.type})
>  
>      def _role_header(self):
>          self.fd.write('.TH  "%(user)s_selinux"  "8"  "%(user)s" "mgrepl@redhat.com" "%(user)s SELinux Policy documentation"'

-- 
()  ascii ribbon campaign - against html e-mail 
/\  www.asciiribbon.org   - against proprietary attachments

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]