particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make grab_session_options to accept dict directly

Browse source 
fixes #663
This commit is contained in:
Yuming Zhu 2017-10-31 15:15:04 +08:00 • committed by Mike McLean
parent debffba85b
commit 14a24abbde
2 changed files with 99 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
koji/__init__.py
View file

@ -2016,7 +2016,8 @@ class VirtualMethod(object):
def grab_session_options(options):
'''Convert optparse options to a dict that ClientSession can handle'''
"""Convert optparse options to a dict that ClientSession can handle;
If options is already a dict, filter out meaningless and None value items"""
s_opts = (
'user',
'password',
@ -2037,8 +2038,10 @@ def grab_session_options(options):
'use_old_ssl',
'no_ssl_verify',
'serverca',
)
)
# cert is omitted for now
if isinstance(options, dict):
return {k: v for k, v in six.iteritems(options) if k in s_opts and v is not None}
ret = {}
for key in s_opts:
if not hasattr(options, key):