7 Commits
1.2.0 ... 1.2.1

Author SHA1 Message Date
FoxMaSk
2c269fba43 v1.2.1 2018-04-18 11:13:57 +02:00
FoxMaSk
07d3840ca6 upd few things 2018-04-18 11:02:56 +02:00
FoxMaSk
43b1602cbb upd few things 2018-04-18 11:01:27 +02:00
FoxMaSk
c6f62a4697 change repo 2018-02-19 09:06:06 +01:00
FoxMaSk
63cd4e80cb Merge pull request #7 from Findus23/exists-auth
add access_token to entries_exists
2018-01-28 17:19:39 +01:00
Lukas Winkler
b7d4abb0d1 add access_token to entries_exists 2018-01-27 22:37:02 +01:00
FoxMaSk
5b3cd028a7 do no exit if a user changed or does not provide the correct host, client_id, client_key, login, pass 2017-09-23 21:18:28 +02:00
5 changed files with 29 additions and 22 deletions

View File

@@ -27,7 +27,7 @@ to get the project, from your virtualenv, do :
.. code:: python
git clone https://github.com/foxmask/wallabag-api/
git clone https://github.com/push-things/wallabag_api/
or
@@ -110,7 +110,7 @@ Creating a post :
this will give you something like this :
.. image:: https://github.com/foxmask/wallabag_api/blob/master/wallabag.png
.. image:: https://github.com/push-things/wallabag_api/blob/master/wallabag.png
Testing :
@@ -124,7 +124,7 @@ Then create a client API like explain here http://doc.wallabag.org/en/v2/develop
this will give you something like this
.. image:: https://github.com/foxmask/wallabag_api/blob/master/wallabag_api_key.png
.. image:: https://github.com/push-things/wallabag_api/blob/master/wallabag_api_key.png
Then replace the client_id / client_secret / login / pass to wallabag_test.py and run

View File

@@ -2,19 +2,21 @@ from setuptools import setup, find_packages
from wallabag_api import __version__ as version
desc = 'Wallabag API to add every pages you want to your Wallabag account'
long_desc = 'Wallabag is a "read it later" service, and that Wallabag API allow you to save web pages ' \
'to your own account'
install_requires = [
'aiohttp==2.2.5',
'aiohttp',
]
setup(
name='wallabag_api',
version=version,
description=desc,
long_description=long_desc,
author='FoxMaSk',
author_email='foxmask@trigger-happy.eu',
url='https://github.com/foxmask/wallabag_api',
download_url="https://github.com/foxmask/wallabag_api/archive/"
"wallabag_api-" + version + ".zip",
url='https://github.com/push-things/wallabag_api',
download_url="https://github.com/push-things/wallabag_api/archive/wallabag_api-" + version + ".zip",
packages=find_packages(),
classifiers=[
'Development Status :: 5 - Production/Stable',

View File

@@ -1,2 +1,2 @@
VERSION = (1, 2, 0) # PEP 386
VERSION = (1, 2, 1) # PEP 386
__version__ = ".".join([str(x) for x in VERSION])

View File

@@ -33,8 +33,8 @@ class Wallabag(object):
client_id='',
client_secret='',
extension='json',
user_agent="WallabagPython/1.3 "
"+https://github.com/foxmask/wallabag-api",
user_agent="WallabagPython/1.2.2 "
" +https://github.com/push-things/wallabag-api",
aio_sess=None):
"""
init variable
@@ -97,10 +97,13 @@ class Wallabag(object):
:param responses: the json response
:return the json data without 'root' node
"""
if responses.status != 200:
raise HttpProcessingError(code=responses.status,
message=await responses.json())
json_data = {}
if responses.status != 200:
err_msg = HttpProcessingError(code=responses.status,
message=await responses.json())
logging.error("Wallabag: aiohttp error {err_msg}".format(
err_msg=err_msg))
else:
try:
json_data = responses.json()
except ClientResponseError as e:
@@ -329,7 +332,8 @@ class Wallabag(object):
:return result
"""
params = {'url': url,
params = {'access_token': self.token,
'url': url,
'urls': urls}
path = '/api/entries/exists.{ext}'.format(ext=self.format)

View File

@@ -109,5 +109,6 @@ class TestWallabag(unittest.TestCase):
self.assertTrue(resp, True)
"""
if __name__ == '__main__':
unittest.main()