masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #321 from facetoe/setting_util

Browse Source 
Fix bugs in setting_util.py.
This commit is contained in:
enkore 2016-02-14 11:13:46 +01:00
commit cb4ac39345
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
i3pystatus/tools/setting_util.py
View File

@ -13,6 +13,7 @@ import keyring
import i3pystatus import i3pystatus
from i3pystatus import Module, SettingsBase from i3pystatus import Module, SettingsBase
from i3pystatus.core import ClassFinder from i3pystatus.core import ClassFinder
from i3pystatus.core.exceptions import ConfigInvalidModuleError
def signal_handler(signal, frame): def signal_handler(signal, frame):
@ -58,11 +59,12 @@ def get_credential_modules():
for module_name in get_modules(): for module_name in get_modules():
try: try:
module = class_finder.get_module(module_name) module = class_finder.get_module(module_name)
except ImportError: clazz = class_finder.get_class(module)
except (ImportError, ConfigInvalidModuleError):
if verbose: if verbose:
print("ImportError while importing", module_name) print("ImportError while importing", module_name)
continue continue
clazz = class_finder.get_class(module)
members = [m[0] for m in inspect.getmembers(clazz) if not m[0].startswith('_')] members = [m[0] for m in inspect.getmembers(clazz) if not m[0].startswith('_')]
if any([hasattr(clazz, setting) for setting in protected_settings]): if any([hasattr(clazz, setting) for setting in protected_settings]):
credential_modules[clazz.__name__]['credentials'] = list(set(protected_settings) & set(members)) credential_modules[clazz.__name__]['credentials'] = list(set(protected_settings) & set(members))
@ -97,11 +99,11 @@ Options:
if "-l" in sys.argv: if "-l" in sys.argv:
for name, module in credential_modules.items(): for name, module in credential_modules.items():
print(name) print(name)
for credential in enumerate_choices(module["credentials"]): for credential in module['credentials']:
if keyring.get_password("%s.%s" % (module["key"], credential), getpass.getuser()): if keyring.get_password("%s.%s" % (module['key'], credential), getpass.getuser()):
print(" - %s: set" % credential) print(" - %s: set" % credential)
else: else:
print(" (none stored)") print(" - %s: unset" % credential)
return return
choices = list(credential_modules.keys()) choices = list(credential_modules.keys())