diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2018-09-07 21:14:46 +0200 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2018-10-19 00:09:38 +0200 |
| commit | 4d9504e775d89f06b3e7199e076e62ff4fd9d1d2 (patch) | |
| tree | 4187ff04ff2ba7f4e88aab31752aa34b2c8a19b7 /bin | |
| parent | Use loop instead of with_items in examples (#47318) (diff) | |
| download | ansible-4d9504e775d89f06b3e7199e076e62ff4fd9d1d2.tar.xz ansible-4d9504e775d89f06b3e7199e076e62ff4fd9d1d2.zip | |
Remove runtime usage of pkg_resources.
This should provide a startup time speed boost at the expense of making
it harder to get ansible to use newer versions of packages than are
provided by the platform.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ansible | 10 | ||||
| -rwxr-xr-x | bin/ansible-connection | 4 |
2 files changed, 1 insertions, 13 deletions
diff --git a/bin/ansible b/bin/ansible index cc4bfd7a69..cd83e9a413 100755 --- a/bin/ansible +++ b/bin/ansible @@ -22,15 +22,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type __requires__ = ['ansible'] -try: - import pkg_resources -except Exception: - # Use pkg_resources to find the correct versions of libraries and set - # sys.path appropriately when there are multiversion installs. But we - # have code that better expresses the errors in the places where the code - # is actually used (the deps are optional for many code paths) so we don't - # want to fail here. - pass + import os import shutil diff --git a/bin/ansible-connection b/bin/ansible-connection index ac378a4d87..a06adcfc3b 100755 --- a/bin/ansible-connection +++ b/bin/ansible-connection @@ -6,10 +6,6 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type __requires__ = ['ansible'] -try: - import pkg_resources -except Exception: - pass import fcntl import hashlib |