From 7fa5c10787b8c6d5749879cd1caaad534029d805 Mon Sep 17 00:00:00 2001 From: facetoe Date: Fri, 13 Feb 2015 19:38:58 +0800 Subject: [PATCH] Added keyring_backend to the settings tuple. --- i3pystatus/core/netrc_backend.py | 2 -- i3pystatus/github.py | 1 + i3pystatus/mail/imap.py | 1 + i3pystatus/modsde.py | 1 + i3pystatus/pyload.py | 3 ++- i3pystatus/reddit.py | 1 + i3pystatus/whosonlocation.py | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/i3pystatus/core/netrc_backend.py b/i3pystatus/core/netrc_backend.py index 342b2e3..c59ddfa 100644 --- a/i3pystatus/core/netrc_backend.py +++ b/i3pystatus/core/netrc_backend.py @@ -1,6 +1,4 @@ import os - -__author__ = 'facetoe' from keyring.backend import KeyringBackend diff --git a/i3pystatus/github.py b/i3pystatus/github.py index b5196c3..bfcfac8 100644 --- a/i3pystatus/github.py +++ b/i3pystatus/github.py @@ -29,6 +29,7 @@ class Github(IntervalModule): settings = ( ('format', 'format string'), + ('keyring_backend', 'alternative keyring backend for retrieving credentials'), ('unread_marker', 'sets the string that the "unread" formatter shows when there are pending notifications'), ("username", ""), ("password", ""), diff --git a/i3pystatus/mail/imap.py b/i3pystatus/mail/imap.py index 2ae58d9..6f91937 100644 --- a/i3pystatus/mail/imap.py +++ b/i3pystatus/mail/imap.py @@ -16,6 +16,7 @@ class IMAP(Backend): settings = ( "host", "port", "username", "password", + ('keyring_backend', 'alternative keyring backend for retrieving credentials'), "ssl", "mailbox", ) diff --git a/i3pystatus/modsde.py b/i3pystatus/modsde.py index f1eae4f..acb3a2d 100644 --- a/i3pystatus/modsde.py +++ b/i3pystatus/modsde.py @@ -20,6 +20,7 @@ class ModsDeChecker(IntervalModule): settings = ( ("format", """Use {unread} as the formatter for number of unread posts"""), + ('keyring_backend', 'alternative keyring backend for retrieving credentials'), ("offset", """subtract number of posts before output"""), "color", "username", "password" ) diff --git a/i3pystatus/pyload.py b/i3pystatus/pyload.py index 67d77bf..a528eab 100644 --- a/i3pystatus/pyload.py +++ b/i3pystatus/pyload.py @@ -29,7 +29,8 @@ class pyLoad(IntervalModule): "format", "captcha_true", "captcha_false", "download_true", "download_false", - "username", "password" + "username", "password", + ('keyring_backend', 'alternative keyring backend for retrieving credentials'), ) required = ("username", "password") keyring_backend = None diff --git a/i3pystatus/reddit.py b/i3pystatus/reddit.py index 374555e..3535fbd 100644 --- a/i3pystatus/reddit.py +++ b/i3pystatus/reddit.py @@ -35,6 +35,7 @@ class Reddit(IntervalModule): ("format", "Format string used for output."), ("username", "Reddit username."), ("password", "Reddit password."), + ('keyring_backend', 'alternative keyring backend for retrieving credentials'), ("subreddit", "Subreddit to monitor. Uses frontpage if unspecified."), ("sort_by", "'hot', 'new', 'rising', 'controversial', or 'top'."), ("color", "Standard color."), diff --git a/i3pystatus/whosonlocation.py b/i3pystatus/whosonlocation.py index 6147945..e866fc3 100644 --- a/i3pystatus/whosonlocation.py +++ b/i3pystatus/whosonlocation.py @@ -5,7 +5,6 @@ from bs4 import BeautifulSoup class WhosOnLocation(): - email = None password = None session = None @@ -68,6 +67,7 @@ class WOL(IntervalModule): password = None settings = ( + ('keyring_backend', 'alternative keyring backend for retrieving credentials'), 'email', 'password' )