From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id t3LCMg8g027514 for ; Tue, 21 Apr 2015 08:22:42 -0400 Message-ID: <55364103.30004@tresys.com> Date: Tue, 21 Apr 2015 08:22:27 -0400 From: Steve Lawrence Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 To: Petr Lautrbach , Subject: Re: [PATCH] libselinux: selinux.py - use os.walk() instead of os.path.walk() References: <1429616809-5417-1-git-send-email-plautrba@redhat.com> In-Reply-To: <1429616809-5417-1-git-send-email-plautrba@redhat.com> Cc: =?UTF-8?B?TWlybyBIcm9uxI1vaw==?= List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: On 04/21/2015 07:46 AM, Petr Lautrbach wrote: > From: Miro Hrončok > > os.path.walk() function is deprecated and has been removed in Python 3 > > Signed-off-by: Petr Lautrbach Acked-by: Steve Lawrence Thanks! > --- > > A simple fix which allows to use same construction in Python 2 and Python 3. > It's reported and proposed in https://bugzilla.redhat.com/show_bug.cgi?id=1195004 > > > libselinux/src/selinuxswig_python.i | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/libselinux/src/selinuxswig_python.i b/libselinux/src/selinuxswig_python.i > index ae72246..c9a2341 100644 > --- a/libselinux/src/selinuxswig_python.i > +++ b/libselinux/src/selinuxswig_python.i > @@ -31,9 +31,9 @@ def restorecon(path, recursive=False): > lsetfilecon(path, context) > > if recursive: > - os.path.walk(path, lambda arg, dirname, fnames: > - map(restorecon, [os.path.join(dirname, fname) > - for fname in fnames]), None) > + for root, dirs, files in os.walk(path): > + for name in files + dirs: > + restorecon(os.path.join(root, name)) > > def chcon(path, context, recursive=False): > """ Set the SELinux context on a given path """ >