[PATCH] make dcerpc python module compatible with pylint in py3

Alexander Bokovoy ab at samba.org
Wed Sep 13 10:13:43 UTC 2017


Attached patch needs to come to 4.7.0 to have Samba python3 bindings
usable with pylint (Python linter). We missed dcerpc/__init__.py file
for py3 environment so it broke FreeIPA CI machinery now that we moved
to Python 3 completely.

Luckily, it is not a code change, just waf part.

I filed https://bugzilla.samba.org/show_bug.cgi?id=13030 for 4.7.0
backport. See details on a reproducer there.

We verified with Fedora builds that it indeed fixes the problem.


-- 
/ Alexander Bokovoy
-------------- next part --------------
>From 71f48e7fac4ea2914f8d2b5be6dc53114a9e71c3 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab at samba.org>
Date: Wed, 13 Sep 2017 11:37:34 +0300
Subject: [PATCH] Install dcerpc/__init__.py for all Python environments

Also fix whitespace. We use tabs, not spaces in Python/waf code.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13030

---
 source4/librpc/wscript_build | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index e341432fa14..a381a65e3fa 100644
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -407,9 +407,10 @@ for env in bld.gen_python_environments():
 		)
 
 if bld.PYTHON_BUILD_IS_ENABLED():
-    bld.SAMBA_SCRIPT('python_dcerpc_init',
-                 pattern='rpc/dcerpc.py',
-                 installdir='python/samba/dcerpc',
-                 installname='__init__.py')
+	for env in bld.gen_python_environments():
+		bld.SAMBA_SCRIPT('python_dcerpc_init',
+			pattern='rpc/dcerpc.py',
+			installdir='python/samba/dcerpc',
+			installname='__init__.py')
 
-    bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/dcerpc', 'rpc/dcerpc.py', destname='__init__.py')
+		bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/dcerpc', 'rpc/dcerpc.py', destname='__init__.py')
-- 
2.13.5



More information about the samba-technical mailing list