Skip to content

S
setuptools
Commit c471788d authored by idle sign's avatar idle sign Committed by Jason R. Coombs
Browse files
Options

Proper finalization for `read_configuration()`.

parent 35f3d1f3
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 9 deletions
setuptools/config.py
View file @ c471788d
...@@ -38,6 +38,7 @@ def read_configuration( ...@@ -38,6 +38,7 @@ def read_configuration(
current_directory = os.getcwd() current_directory = os.getcwd()
os.chdir(os.path.dirname(filepath)) os.chdir(os.path.dirname(filepath))
try:
dist = Distribution() dist = Distribution()
filenames = dist.find_config_files() if find_others else [] filenames = dist.find_config_files() if find_others else []
...@@ -50,6 +51,7 @@ def read_configuration( ...@@ -50,6 +51,7 @@ def read_configuration(
dist, dist.command_options, dist, dist.command_options,
ignore_option_errors=ignore_option_errors) ignore_option_errors=ignore_option_errors)
finally:
os.chdir(current_directory) os.chdir(current_directory)
return configuration_to_dict(handlers) return configuration_to_dict(handlers)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7