[apparmor] [patch] utils: remove pep 0420 breakage
Steve Beattie
steve at nxnw.org
Mon Sep 15 17:32:41 UTC 2014
Due to wanting to support additional external apparmor python modules,
both real [0] and hypothetical (e.g. gui prototypes), as part of
the python utils merge, some namespace packaging bits were added
to apparmor/__init__.py, based on the (not very clear) advice given
in python's pep 0420 [1]. However, a side effect of this is that it
causes system installed versions of python modules to be used over
paths specified via PYTHONPATH [2], which breaks our in-tree tests
when the system versions of the python modules are out of date with
respect to the in-tree version.
It seems based on testing, however, that carrying this code snippet
is no longer necessary to have external modules be found. Thus,
the following patch drops it.
[0] e.g. https://launchpad.net/click-apparmor
[1] http://www.python.org/dev/peps/pep-0420/
[2] a python upstream discussion about this occurred at
https://mail.python.org/pipermail/distutils-sig/2014-March/024049.html
Signed-off-by: Steve Beattie <steve at nxnw.org>
---
utils/apparmor/__init__.py | 1 -
1 file changed, 1 deletion(-)
Index: b/utils/apparmor/__init__.py
===================================================================
--- a/utils/apparmor/__init__.py
+++ b/utils/apparmor/__init__.py
@@ -7,4 +7,3 @@
# License published by the Free Software Foundation.
#
# ------------------------------------------------------------------
-__import__('pkg_resources').declare_namespace(__name__)
--
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140915/e7130cb6/attachment.pgp>
More information about the AppArmor
mailing list