瀏覽代碼

package/python-paho-mqtt: fix merge from next

In master, we backported a patch from upstream, to fix running on python
3.10. But at the same time, on next, we bumped the version, where that
change was present.

Now, next has been merged back into master, and the patch obviously does
not apply anymore.

Remove the patch, it is no longer needed.

Fixes:
    http://autobuild.buildroot.net/results/b76/b76b1ab80bdf1b7731731f2f561c5b64e9716513/
    http://autobuild.buildroot.net/results/f9e/f9e07621d345a9bca0be1b0a53bdb21e363d2e90/
    ...

Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
Cc: Marcus Hoffmann <marcus.hoffmann@othermo.de>
Cc: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Yann E. MORIN 2 年之前
父節點
當前提交
1616816e13
共有 1 個文件被更改,包括 0 次插入37 次删除
  1. 0 37
      package/python-paho-mqtt/0001-fix-publish-for-python-3-10.patch

+ 0 - 37
package/python-paho-mqtt/0001-fix-publish-for-python-3-10.patch

@@ -1,37 +0,0 @@
-From e1c45570f61f9d6b28f8604c8a8cd6dd94f959ed Mon Sep 17 00:00:00 2001
-From: Brishen Hawkins <brishen.hawkins@gmail.com>
-Date: Tue, 9 Jun 2020 00:18:39 -0600
-Subject: [PATCH] Fix for Python 3.9 moving Iterable to collections.abc
-
-Signed-off-by: Brishen Hawkins <brishen.hawkins@gmail.com>
-
-Backported from: e1c45570f61f9d6b28f8604c8a8cd6dd94f959ed
-Signed-off-by: Marcus Hoffmann <marcus.hoffmann@othermo.de>
----
- src/paho/mqtt/publish.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/paho/mqtt/publish.py b/src/paho/mqtt/publish.py
-index f9f1986e..dcb34ff1 100644
---- a/src/paho/mqtt/publish.py
-+++ b/src/paho/mqtt/publish.py
-@@ -21,6 +21,10 @@
- from __future__ import absolute_import
- 
- import collections
-+try:
-+    from collections.abc import Iterable
-+except ImportError:
-+    from collections import Iterable
- 
- from . import client as paho
- from .. import mqtt
-@@ -124,7 +128,7 @@ def multiple(msgs, hostname="localhost", port=1883, client_id="", keepalive=60,
-     proxy_args: a dictionary that will be given to the client.
-     """
- 
--    if not isinstance(msgs, collections.Iterable):
-+    if not isinstance(msgs, Iterable):
-         raise TypeError('msgs must be an iterable')
- 
-     client = paho.Client(client_id=client_id, userdata=collections.deque(msgs),