From 12c30c6af37e047925cd6a0a7774f360a786455e Mon Sep 17 00:00:00 2001 From: Olivier Demah Date: Sun, 11 Jun 2017 16:59:48 +0200 Subject: [PATCH 1/2] str to list --- wallabag_api/wallabag.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wallabag_api/wallabag.py b/wallabag_api/wallabag.py index 8f910ac..0f6ef82 100644 --- a/wallabag_api/wallabag.py +++ b/wallabag_api/wallabag.py @@ -183,8 +183,8 @@ class Wallabag(object): """ params = {'access_token': self.token, 'url': url, 'title': title, 'tags': tags, 'starred': starred, 'archive': archive} - if len(tags) > 0 and isinstance(tags, list): - params['tags'] = ', '.join(tags) + if len(tags) > 0 and ',' in tags: + params['tags'] = tags.split(',') path = '/api/entries.{ext}'.format(ext=self.format) return self.query(path, "post", **params) @@ -297,8 +297,8 @@ class Wallabag(object): :return result """ params = {'access_token': self.token, 'tags': []} - if isinstance(tags, list): - params['tags'] = ', '.join(tags) + if len(tags) > 0 and ',' in tags: + params['tags'] = tags.split(',') path = '/api/entries/{entry}/tags.{ext}'.format( entry=entry, ext=self.format) return self.query(path, "post", **params) From fa9c6360a5582c8e852e50227d5b73bafff9d0af Mon Sep 17 00:00:00 2001 From: FoxMaSk Date: Wed, 28 Jun 2017 09:19:04 +0200 Subject: [PATCH 2/2] Update wallabag.py --- wallabag_api/wallabag.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/wallabag_api/wallabag.py b/wallabag_api/wallabag.py index 0f6ef82..6d46cfe 100644 --- a/wallabag_api/wallabag.py +++ b/wallabag_api/wallabag.py @@ -95,9 +95,13 @@ class Wallabag(object): try: json_data = responses.json() except: - for error in json_data['errors']: - error_json = json_data['errors'][error]['content'] - logging.error("Wallabag: {error}".format(error=error_json)) + # sometimes json_data does not return any json() without + # any error. This is due to the grabbing URL which "rejects" + # the URL + if 'errors' in json_data: + for error in json_data['errors']: + error_json = json_data['errors'][error]['content'] + logging.error("Wallabag: {error}".format(error=error_json)) return json_data def __get_attr(self, what, type_attr, value_attr, **kwargs):