py-mastodon: Update to version 1.3.0.

Changes:

Several small bug fixes (Thanks goldensuneur, bowlercaptain, joyeusenoelle)
Improved stream error handling (Thanks codl)
Improvements to streaming:
    Added on_abort() handler to streams
    Added automatic reconnecting
    POTENTIALLY BREAKING CHANGE: Added better error catching to make sure
    streaming functions do not just crash
Mastodon v2.3 compatibility (sorry for the late release)
    only_media parameter in timeline functions
    focus support for media_upload()
    Added media_update()
Mastodon v2.4 compatibility
    Added fields to account_update_credentials()
    WebPush support:
	Added push_subscription(), push_subscription_set(), push_subscription_update(),
	push_subscription_delete()
	Added webpush crypto utilities: push_subscription_generate_keys(),
	push_subscription_decrypt_push()
Added support for pinned toots, an oversight from 2.1.0: status_pin(), status_unpin()
POTENTIALLY BREAKING CHANGE: Changed pagination attributes to not be part of the dict keys
of paginated return values.
Many internal improvements, more tests

3 files changed, 10 insertions, 89 deletions

diff --git a/chat/py-mastodon/Makefile b/chat/py-mastodon/Makefile
index 1ea5ea79551..50737b918db 100644
--- a/chat/py-mastodon/Makefile
+++ b/chat/py-mastodon/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2018/07/31 16:14:29 nia Exp $
+# $NetBSD: Makefile,v 1.6 2018/08/21 17:31:21 nia Exp $
 
-VERSION=	1.2.2
+VERSION=	1.3.0
 DISTNAME=	Mastodon.py-${VERSION}
 PKGNAME=	${PYPKGPREFIX}-mastodon-${VERSION}
 CATEGORIES=	chat www python
@@ -16,10 +16,12 @@ USE_LANGUAGES=	# none
 
 DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-decorator-[0-9]*:../../devel/py-decorator
+DEPENDS+=	${PYPKGPREFIX}-http_ece-[0-9]*:../../www/py-http_ece
 DEPENDS+=	${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
+
+BUILD_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
 TEST_DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 TEST_DEPENDS+=	${PYPKGPREFIX}-contextlib2-[0-9]*:../../devel/py-contextlib2
diff --git a/chat/py-mastodon/distinfo b/chat/py-mastodon/distinfo
index 5648b901a10..063470772e2 100644
--- a/chat/py-mastodon/distinfo
+++ b/chat/py-mastodon/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2018/07/31 21:14:33 nia Exp $
+$NetBSD: distinfo,v 1.4 2018/08/21 17:31:21 nia Exp $
 
-SHA1 (Mastodon.py-1.2.2.tar.gz) = 1589bf3c18e1ae765cd8312a4cb53164d4447d08
-RMD160 (Mastodon.py-1.2.2.tar.gz) = 282216a8179a1f019432943d5039105fc6fa3fd7
-SHA512 (Mastodon.py-1.2.2.tar.gz) = 4e82fec7a53c36a14f27a238ac97a2f71cdfbb10671013d60f3083456209c2916f7a1e22015d33238c017a9f81c46e4703477076d5974cb86816af048b5c5ecf
-Size (Mastodon.py-1.2.2.tar.gz) = 19793 bytes
-SHA1 (patch-mastodon_Mastodon.py) = 31f291e7a96daddd0f06f8b3d8add3508b74de73
+SHA1 (Mastodon.py-1.3.0.tar.gz) = c8a65ed8d6f9a3e2d83c44373c164e737d1ead1a
+RMD160 (Mastodon.py-1.3.0.tar.gz) = a297b75c15619a5f5b72a3ca5f839ecc345016bb
+SHA512 (Mastodon.py-1.3.0.tar.gz) = 67a31e0673d016a65b9d8f37e471efcaf70417159b32bf2985bae4da1da3bb7058535b59cd16089c94d2e7d44069cba9c234244bcd53118535dc0ec03b4d504c
+Size (Mastodon.py-1.3.0.tar.gz) = 816693 bytes
diff --git a/chat/py-mastodon/patches/patch-mastodon_Mastodon.py b/chat/py-mastodon/patches/patch-mastodon_Mastodon.py
deleted file mode 100644
index ecb8a41fb2a..00000000000
--- a/chat/py-mastodon/patches/patch-mastodon_Mastodon.py
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-mastodon_Mastodon.py,v 1.2 2018/07/31 21:14:33 nia Exp $
-
-'async' is a reserved keyword in Python 3.7.
-
---- mastodon/Mastodon.py.orig	2018-01-29 14:20:16.000000000 +0000
-+++ mastodon/Mastodon.py
-@@ -1381,45 +1381,45 @@ class Mastodon:
-     # Streaming
-     ###
-     @api_version("1.1.0", "1.4.2")    
--    def stream_user(self, listener, async=False):
-+    def stream_user(self, listener, run_async=False):
-         """
-         Streams events that are relevant to the authorized user, i.e. home
-         timeline and notifications.
-         """
--        return self.__stream('/api/v1/streaming/user', listener, async=async)
-+        return self.__stream('/api/v1/streaming/user', listener, run_async=run_async)
- 
-     @api_version("1.1.0", "1.4.2")
--    def stream_public(self, listener, async=False):
-+    def stream_public(self, listener, run_async=False):
-         """
-         Streams public events.
-         """
--        return self.__stream('/api/v1/streaming/public', listener, async=async)
-+        return self.__stream('/api/v1/streaming/public', listener, run_async=run_async)
- 
-     @api_version("1.1.0", "1.4.2")
--    def stream_local(self, listener, async=False):
-+    def stream_local(self, listener, run_async=False):
-         """
-         Streams local public events.
-         """
--        return self.__stream('/api/v1/streaming/public/local', listener, async=async)
-+        return self.__stream('/api/v1/streaming/public/local', listener, run_async=run_async)
- 
-     @api_version("1.1.0", "1.4.2")
--    def stream_hashtag(self, tag, listener, async=False):
-+    def stream_hashtag(self, tag, listener, run_async=False):
-         """
-         Stream for all public statuses for the hashtag 'tag' seen by the connected
-         instance.
-         """
-         if tag.startswith("#"):
-             raise MastodonIllegalArgumentError("Tag parameter should omit leading #")
--        return self.__stream("/api/v1/streaming/hashtag?tag={}".format(tag), listener, async=async)
-+        return self.__stream("/api/v1/streaming/hashtag?tag={}".format(tag), listener, run_async=run_async)
- 
-     @api_version("2.1.0", "2.1.0")
--    def stream_list(self, id, listener, async=False):
-+    def stream_list(self, id, listener, run_async=False):
-         """
-         Stream events for the current user, restricted to accounts on the given
-         list. 
-         """
-         id =  self.__unpack_id(id)
--        return self.__stream("/api/v1/streaming/list?list={}".format(id), listener, async=async)
-+        return self.__stream("/api/v1/streaming/list?list={}".format(id), listener, run_async=run_async)
-     
-     ###
-     # Internal helpers, dragons probably
-@@ -1661,7 +1661,7 @@ class Mastodon:
- 
-         return response
- 
--    def __stream(self, endpoint, listener, params={}, async=False):
-+    def __stream(self, endpoint, listener, params={}, run_async=False):
-         """
-         Internal streaming API helper.
- 
-@@ -1720,7 +1720,7 @@ class Mastodon:
- 
-         handle = __stream_handle(connection)
- 
--        if async:
-+        if run_async:
-             t = threading.Thread(args=(), daemon = True, target=handle._threadproc)
-             t.start()
-             return handle