Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: #895: pythonmodule: add all site-packages directories to sys.path #896

Merged
merged 1 commit into from Jun 12, 2023
Merged

Fix: #895: pythonmodule: add all site-packages directories to sys.path #896

merged 1 commit into from Jun 12, 2023

Conversation

socketpair
Copy link
Contributor

  1. Actually, adding all site-packages dir is good. since pythonmodule should be able to import other Python libraries.
  2. everything should work even since Python 2.6, no #ifdef required.

@socketpair
Copy link
Contributor Author

site.getsitepackages() INCLUDE all dirs specified in distutils.sysconfig.get_python_lib(1,0) and in sysconfig.get_path('platlib')

wcawijngaards
wcawijngaards approved these changes Jun 12, 2023
View reviewed changes
Copy link
Member

@wcawijngaards wcawijngaards left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code change seems to be both simpler and better at picking up a list of python site-packages paths. There is also a site.getusersitepackages() directory, but that used to not be added previously. The site module seems to work for python 2.7 and python 3.6 and 3.10.

@wcawijngaards wcawijngaards linked an issue Jun 12, 2023 that may be closed by this pull request
python + sysconfig gives ANOTHER path comparing to distutils #895
Closed
@socketpair
Copy link
Contributor Author

@wcawijngaards what should be done in order to merge ?

@wcawijngaards
Copy link
Member

Waiting for ci, it has finished, so it looks fine to merge.

@wcawijngaards wcawijngaards merged commit 0585b1d into NLnetLabs:master Jun 12, 2023
1 check passed
wcawijngaards added a commit that referenced this pull request Jun 12, 2023
@wcawijngaards
- Merge #896: Fix: #895: pythonmodule: add all site-packages
35885e5 
  directories to sys.path.
@wcawijngaards
Copy link
Member

Thanks for the code contribution for the python integration! Hopefully this works to detect the python plugin install location to make the pythonmod run its python script in unbound and process DNS queries.

jedisct1 added a commit to jedisct1/unbound that referenced this pull request Jul 15, 2023
@jedisct1
Merge remote-tracking branch 'nlnet/master'
00578d0 
* nlnet/master: (43 commits)
  - More clear description of the different auth-zone behaviors on the   man page.
  - Merge NLnetLabs#880 from chipitsine: services/authzone.c: remove redundant   check.
  - Merge NLnetLabs#664 from tilan7763: Add prefetch support for subnet cache   entries. - For NLnetLabs#664: Easier code flow for subnetcache prefetching. - For NLnetLabs#664: Add testcase. - For NLnetLabs#664: Rename subnet_prefetch tests to subnet_global_prefetch to   differentiate from the new subnet prefetch support.
  - For NLnetLabs#664: easier code flow for subnetcache prefetching. - For NLnetLabs#664: add testcase.
  - Skip the 00-lint test. splint is not maintained; it either does not   work or produces false positives. Static analysis is handled in the   clang test.
  - For NLnetLabs#802: Cleanup comments and add RCODE check for CD bit test case.
  - Fix dereference of NULL variable warning in mesh_do_callback.
  - Code cleanup for sldns_str2wire_svcparam_key_lookup.
  - Fix NLnetLabs#906: warning: ‘Py_SetProgramName’ is deprecated.
  - For NLnetLabs#739: minor cleanup for testcases.
  - More fixes for reference counting for python module and clean up   failure code.
  - Fix python modules with multiple scripts, by incrementing reference   counts.
  - Remove warning about unknown cast-function-type warning pragma.
  Add changelog and contrib/README mention for NLnetLabs#903 - Merge NLnetLabs#903: contrib: add yocto compatible init script.
  contrib: add yocto compatible init script
  Changelog for NLnetLabs#887 and NLnetLabs#516
  - Properly handle all return values of worker_check_request during   early EDE code. - Do not check the incoming request more than once.
  - Fix for uncertain unit test for doh buffer size events.
  Changelog note for NLnetLabs#895 - Fix NLnetLabs#895: python + sysconfig gives ANOTHER path comparing to   distutils.
  - Merge NLnetLabs#896: Fix: NLnetLabs#895: pythonmodule: add all site-packages   directories to sys.path.
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wcawijngaards wcawijngaards wcawijngaards approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

python + sysconfig gives ANOTHER path comparing to distutils
2 participants
@socketpair @wcawijngaards