Mercurial > p > roundup > code
diff roundup/mailgw.py @ 7175:357e185752ed
chore: flake8 whitespace fixes
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Sun, 26 Feb 2023 10:40:25 -0500 |
| parents | f918351a0fe6 |
| children | 8e118eb20d86 |
line wrap: on
line diff
--- a/roundup/mailgw.py Sun Feb 26 10:36:36 2023 -0500 +++ b/roundup/mailgw.py Sun Feb 26 10:40:25 2023 -0500 @@ -1329,7 +1329,7 @@ self.arguments = arguments self.default_class = self.arguments.default_class.strip() if not self.default_class: - self.default_class = instance.config ['MAILGW_DEFAULT_CLASS'] + self.default_class = instance.config['MAILGW_DEFAULT_CLASS'] self.props_by_class = {} self.parse_set_value() @@ -1349,7 +1349,7 @@ try: n, r = v.split('=', 1) except ValueError: - errors.append ('"%s" is not of the form "property=value"' % v) + errors.append('"%s" is not of the form "property=value"' % v) break try: classname, rv = n.split('.', 1) @@ -1359,8 +1359,8 @@ r = v if classname not in self.props_by_class: # We can only check later if this is a valid class - self.props_by_class [classname] = [] - self.props_by_class [classname].append (r) + self.props_by_class[classname] = [] + self.props_by_class[classname].append(r) if errors: mailadmin = self.instance.config['ADMIN_EMAIL'] raise MailUsageError(_(""" @@ -1436,7 +1436,7 @@ def get_oauth_tokens(self, oauth_path): if not oauth_path: - oauth_path = self.instance.config ['TRACKER_HOME'] + oauth_path = self.instance.config['TRACKER_HOME'] oauth_path = os.path.join(oauth_path, 'oauth') self.oauth_path = oauth_path with open(os.path.join(oauth_path, 'access_token'), 'r') as f: @@ -1444,7 +1444,7 @@ with open(os.path.join(oauth_path, 'refresh_token'), 'r') as f: self.refresh_token = f.read().strip() - def write_token (self, tokenname): + def write_token(self, tokenname): n = os.path.join(self.oauth_path, tokenname) tmp = n + '.tmp' old = n + '.old' @@ -1464,24 +1464,24 @@ client_secret = f.read().strip() with open(os.path.join(self.oauth_path, 'client_id'), 'r') as f: client_id = f.read().strip() - data = dict \ - ( client_id = client_id - , client_secret = client_secret - , refresh_token = self.refresh_token - , grant_type = 'refresh_token' - ) + data = dict( + client_id = client_id, + client_secret = client_secret, + refresh_token = self.refresh_token, + grant_type = 'refresh_token' + ) session = requests.session() - r = session.post(self.token_endpoint, data = data) + r = session.post(self.token_endpoint, data=data) if not 200 <= r.status_code <= 299: raise RuntimeError('Invalid get result: %s: %s\n %s' - %(r.status_code, r.reason, r.text)) + % (r.status_code, r.reason, r.text)) d = r.json() - if d ['refresh_token'] != self.refresh_token: - self.refresh_token = d ['refresh_token'] - self.write_token ('refresh_token') - if d ['access_token'] != self.access_token: - self.access_token = d ['access_token'] - self.write_token ('access_token') + if d['refresh_token'] != self.refresh_token: + self.refresh_token = d['refresh_token'] + self.write_token('refresh_token') + if d['access_token'] != self.access_token: + self.access_token = d['access_token'] + self.write_token('access_token') def do_imap(self, server, user='', password='', mailbox='', **kw): ''' Do an IMAP connection @@ -1510,12 +1510,12 @@ if kw.get('oauth'): if requests is None: self.logger.error('For OAUTH, the requests library ' - 'must be installed') + 'must be installed') return 1 self.get_oauth_tokens(kw.get('oauth_path')) # The following are mandatory for oauth and are passed by # the command-line handler: - self.token_endpoint = kw ['token_endpoint'] + self.token_endpoint = kw['token_endpoint'] for k in range(2): t = self.access_token s = 'user=%s\1auth=Bearer %s\1\1' % (user, t) @@ -1828,8 +1828,7 @@ return {} for propstring in self.props_by_class[classname]: errors, props = setPropArrayFromString(self, cls, - propstring.strip()) - + propstring.strip()) if errors: mailadmin = self.instance.config['ADMIN_EMAIL']
