public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-im/err/, net-im/err/files/
@ 2020-08-11 11:28 Sergey Popov
  0 siblings, 0 replies; 4+ messages in thread
From: Sergey Popov @ 2020-08-11 11:28 UTC (permalink / raw
  To: gentoo-commits

commit:     523f33030115633b29ff950cc76361eb4dc23ce1
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 11:24:49 2020 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 11:27:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=523f3303

net-im/err: version bump

Set supported Python version to 3.7
Migrate away from vulnerable sleekxmpp to slixmpp
Update HOMEPAGE and metadata

Closes: https://bugs.gentoo.org/show_bug.cgi?id=725664
Closes: https://bugs.gentoo.org/show_bug.cgi?id=735830
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 net-im/err/Manifest                      |   1 +
 net-im/err/err-6.1.4.ebuild              |  91 +++++++++++++++
 net-im/err/files/err-6.1.4-slixmpp.patch | 190 +++++++++++++++++++++++++++++++
 net-im/err/metadata.xml                  |   6 +-
 4 files changed, 283 insertions(+), 5 deletions(-)

diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index 62697aaabee..fa2c1a0b636 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1 +1,2 @@
 DIST errbot-5.2.0.tar.gz 189305 BLAKE2B 96e275ee2a70fcab217f4a91c855192d8536cc177e0cafe08c8f55e17a09c06913c07e50473f87ea29e4537cd6389907615eba86d44756962ed59a87498be398 SHA512 d879e9da6647d697ead0a5f72fe83cf33614201863a9a62bc62c90d7ac0478e1e0902438c6f053d2ea56c940d68b136bbfa497175fb11647913bd7f139220aec
+DIST errbot-6.1.4.tar.gz 207370 BLAKE2B 187e87cc36393f85c1405a29d332d703cdd2ac9d9c6b50178ff7382bc5feb620b69a77dc21ce8144fc24045f11067865c7273118fc25ec1ad9afb93d6ccc635e SHA512 60cc8f070e2420e4ef5f0124eb6d03b3cf01c44e148ebb8b92f5b504eb6968c754fd82771da9528daab62c9e9f4d6ef97ab1063f1093163208521b26e36b2f2d

diff --git a/net-im/err/err-6.1.4.ebuild b/net-im/err/err-6.1.4.ebuild
new file mode 100644
index 00000000000..65c20b5d54f
--- /dev/null
+++ b/net-im/err/err-6.1.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+MY_PN="errbot"
+MY_P="${MY_PN}-${PV}"
+
+inherit distutils-r1 user
+
+DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable"
+HOMEPAGE="https://errbot.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="irc +xmpp"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/ansi[${PYTHON_USEDEP}]
+	dev-python/bottle[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/daemonize[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.19.16[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	<dev-python/markdown-3.0[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/webtest[${PYTHON_USEDEP}]
+	dev-python/yapsy[${PYTHON_USEDEP}]
+	irc? (
+		dev-python/irc[${PYTHON_USEDEP}]
+	)
+	xmpp? (
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/slixmpp[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-slixmpp.patch" )
+
+S="${WORKDIR}/${MY_P}"
+
+# NOTES:
+# 1. Support for BOT_SENTRY option is missing, cause
+#    we do not have apropriate packages in portage yet
+# 2. Currently only XMPP is supported(IRC still untested)
+# 3. Internal web server is temporarily removed (rocket-err from requires.txt)
+# 4. pygments-markdown-lexer dependency(needed only for debugging?) is temporarily removed (pygments-markdown-lexer from requires.txt)
+
+pkg_setup() {
+	ebegin "Creating err group and user"
+	enewgroup 'err'
+	enewuser 'err' -1 -1 -1 'err'
+	eend ${?}
+}
+
+python_prepare_all() {
+	sed -i \
+		-e '/rocket-errbot/d' \
+		-e 's/dnspython3/dnspython/' \
+		-e '/pygments-markdown-lexer/d' \
+		setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}"/errd.initd.2 errd
+	newconfd "${FILESDIR}"/errd.confd errd
+
+	dodir /etc/${PN}
+	keepdir /var/lib/${PN}
+	keepdir /var/log/${PN}
+	fowners -R err:err /var/lib/${PN}
+	fowners -R err:err /var/log/${PN}
+
+	insinto /etc/${PN}
+	newins errbot/config-template.py config.py
+}

diff --git a/net-im/err/files/err-6.1.4-slixmpp.patch b/net-im/err/files/err-6.1.4-slixmpp.patch
new file mode 100644
index 00000000000..ccccc171f23
--- /dev/null
+++ b/net-im/err/files/err-6.1.4-slixmpp.patch
@@ -0,0 +1,190 @@
+From e68c539c727c7275665a198fc7a217a3c1ad3be2 Mon Sep 17 00:00:00 2001
+From: Birger Schacht <1143280+bisco2@users.noreply.github.com>
+Date: Sat, 11 Jul 2020 11:20:53 +0000
+Subject: [PATCH] Replace sleekxmpp with slixmpp (#1430)
+
+* Start moving to slixmpp
+
+* Pass a default value for ssl_version to the XMPPConnection
+---
+ .../plugin_development/backend_specifics.rst  |  6 +--
+ errbot/backends/xmpp.py                       | 49 +++++++++----------
+ setup.py                                      |  4 +-
+
+diff --git a/errbot/backends/xmpp.py b/errbot/backends/xmpp.py
+index 08f49340..e27c2893 100644
+--- a/errbot/backends/xmpp.py
++++ b/errbot/backends/xmpp.py
+@@ -2,7 +2,6 @@
+ import sys
+ from functools import lru_cache
+ 
+-from threading import Thread
+ from time import sleep
+ 
+ from errbot.backends.base import Message, Room, Presence, RoomNotJoinedError, Identifier, RoomOccupant, Person
+@@ -13,10 +12,10 @@
+ log = logging.getLogger(__name__)
+ 
+ try:
+-    from sleekxmpp import ClientXMPP
+-    from sleekxmpp.xmlstream import resolver, cert
+-    from sleekxmpp import JID
+-    from sleekxmpp.exceptions import IqError
++    from slixmpp import ClientXMPP
++    from slixmpp.xmlstream import resolver, cert
++    from slixmpp import JID
++    from slixmpp.exceptions import IqError
+ 
+ except ImportError:
+     log.exception("Could not start the XMPP backend")
+@@ -114,15 +113,10 @@ def join(self, username=None, password=None):
+         :meth:`create` on it first.
+         """
+         room = str(self)
+-        self.xep0045.joinMUC(room, username, password=password, wait=True)
++        self.xep0045.join_muc(room, username, password=password, wait=True)
+         self._bot.conn.add_event_handler(f'muc::{room}::got_online', self._bot.user_joined_chat)
+         self._bot.conn.add_event_handler(f'muc::{room}::got_offline', self._bot.user_left_chat)
+-        # Room configuration can only be done once a MUC presence stanza
+-        # has been received from the server. This HAS to take place in a
+-        # separate thread because of how SleekXMPP processes these stanzas.
+-        t = Thread(target=self.configure)
+-        t.setDaemon(True)
+-        t.start()
++        self.configure()
+         self._bot.callback_room_joined(self)
+         log.info('Joined room %s.', room)
+ 
+@@ -137,7 +131,7 @@ def leave(self, reason=None):
+             reason = ""
+         room = str(self)
+         try:
+-            self.xep0045.leaveMUC(room=room, nick=self.xep0045.ourNicks[room], msg=reason)
++            self.xep0045.leave_muc(room=room, nick=self.xep0045.ourNicks[room], msg=reason)
+ 
+             self._bot.conn.del_event_handler(f'muc::{room}::got_online', self._bot.user_joined_chat)
+             self._bot.conn.del_event_handler(f'muc::{room}::got_offline', self._bot.user_left_chat)
+@@ -148,7 +142,7 @@ def leave(self, reason=None):
+ 
+     def create(self):
+         """
+-        Not supported on this back-end (SleekXMPP doesn't support it).
++        Not supported on this back-end (Slixmpp doesn't support it).
+         Will join the room to ensure it exists, instead.
+         """
+         logging.warning(
+@@ -186,7 +180,7 @@ def joined(self):
+         :getter:
+             Returns `True` if the room has been joined, `False` otherwise.
+         """
+-        return str(self) in self.xep0045.getJoinedRooms()
++        return str(self) in self.xep0045.get_joined_rooms()
+ 
+     @property
+     def topic(self):
+@@ -214,7 +208,7 @@ def topic(self, topic):
+         :param topic:
+             The topic to set.
+         """
+-        # Not supported by SleekXMPP at the moment :(
++        # Not supported by Slixmpp at the moment :(
+         raise NotImplementedError("Setting the topic is not supported on this back-end.")
+ 
+     @property
+@@ -261,16 +255,16 @@ def configure(self):
+         affiliation = None
+         while affiliation is None:
+             sleep(0.5)
+-            affiliation = self.xep0045.getJidProperty(
++            affiliation = self.xep0045.get_jid_property(
+                 room=room,
+-                nick=self.xep0045.ourNicks[room],
+-                jidProperty='affiliation'
++                nick=self.xep0045.our_nicks[room],
++                jid_property='affiliation'
+             )
+ 
+         if affiliation == "owner":
+             log.debug('Configuring room %s: we have owner affiliation.', room)
+-            form = self.xep0045.getRoomConfig(room)
+-            self.xep0045.configureRoom(room, form)
++            form = yield from self.xep0045.get_room_config(room)
++            self.xep0045.configure_room(room, form)
+         else:
+             log.debug("Not configuring room %s: we don't have owner affiliation (affiliation=%s)", room, affiliation)
+ 
+@@ -291,7 +285,7 @@ def real_jid(self):
+         Will only work if the errbot is moderator in the MUC or it is not anonymous.
+         """
+         room_jid = self._node + '@' + self._domain
+-        jid = JID(self._room.xep0045.getJidProperty(room_jid, self.resource, 'jid'))
++        jid = JID(self._room.xep0045.get_jid_property(room_jid, self.resource, 'jid'))
+         return jid.bare
+ 
+     @property
+@@ -303,7 +297,8 @@ def room(self):
+ 
+ class XMPPConnection(object):
+     def __init__(self, jid, password, feature=None, keepalive=None,
+-                 ca_cert=None, server=None, use_ipv6=None, bot=None):
++                 ca_cert=None, server=None, use_ipv6=None, bot=None,
++                 ssl_version=None):
+         if feature is None:
+             feature = {}
+         self._bot = bot
+@@ -317,7 +312,7 @@ def __init__(self, jid, password, feature=None, keepalive=None,
+         self.client.register_plugin('xep_0249')  # XMPP direct MUC invites
+ 
+         if keepalive is not None:
+-            self.client.whitespace_keepalive = True  # Just in case SleekXMPP's default changes to False in the future
++            self.client.whitespace_keepalive = True  # Just in case Slixmpp's default changes to False in the future
+             self.client.whitespace_keepalive_interval = keepalive
+ 
+         if use_ipv6 is not None:
+@@ -348,7 +343,7 @@ def disconnect(self):
+         self.connected = False
+ 
+     def serve_forever(self):
+-        self.client.process(block=True)
++        self.client.process()
+ 
+     def add_event_handler(self, name, cb):
+         self.client.add_event_handler(name, cb)
+@@ -447,7 +442,7 @@ def incoming_message(self, xmppmsg):
+             msg.to = self._build_person(xmppmsg['to'].full)
+ 
+         msg.nick = xmppmsg['mucnick']
+-        msg.delayed = bool(xmppmsg['delay']._get_attr('stamp'))  # this is a bug in sleekxmpp it should be ['from']
++        msg.delayed = bool(xmppmsg['delay']._get_attr('stamp'))  # this is a bug in slixmpp it should be ['from']
+         self.callback_message(msg)
+ 
+     def _idd_from_event(self, event):
+@@ -582,7 +577,7 @@ def rooms(self):
+             A list of :class:`~errbot.backends.base.XMPPMUCRoom` instances.
+         """
+         xep0045 = self.conn.client.plugin['xep_0045']
+-        return [XMPPRoom(room, self) for room in xep0045.getJoinedRooms()]
++        return [XMPPRoom(room, self) for room in xep0045.get_joined_rooms()]
+ 
+     def query_room(self, room):
+         """
+diff --git a/setup.py b/setup.py
+index 3d0c09f8..4a3c1ea1 100755
+--- a/setup.py
++++ b/setup.py
+@@ -105,12 +105,12 @@ def read(fname, encoding='ascii'):
+         },
+         extras_require={
+             'graphic': ['PySide', ],
+-            'hipchat': ['hypchat', 'sleekxmpp', 'pyasn1', 'pyasn1-modules'],
++            'hipchat': ['hypchat', 'slixmpp', 'pyasn1', 'pyasn1-modules'],
+             'IRC': ['irc', ],
+             'slack': ['slackclient>=1.0.5,<2.0', ],
+             'slack-rtm': ['slackclient>=2.0', ],
+             'telegram': ['python-telegram-bot', ],
+-            'XMPP': ['sleekxmpp', 'pyasn1', 'pyasn1-modules'],
++            'XMPP': ['slixmpp', 'pyasn1', 'pyasn1-modules'],
+             ':python_version<"3.7"': ['dataclasses'],  # backward compatibility for 3.3->3.6 for dataclasses
+             ':sys_platform!="win32"': ['daemonize'],
+         },

diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml
index 21914ed5cfe..f1f4f68229d 100644
--- a/net-im/err/metadata.xml
+++ b/net-im/err/metadata.xml
@@ -9,11 +9,7 @@
 		<flag name="irc">Pull optional dependencies, needed for IRC backend</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">gbin/err</remote-id>
-		<maintainer status="active">
-			<email>gbin@gootz.net</email>
-			<name>Guillaume BINET</name>
-		</maintainer>
+		<remote-id type="github">errbotio/errbot</remote-id>
 		<remote-id type="pypi">err</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/err/, net-im/err/files/
@ 2021-02-26 14:26 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-02-26 14:26 UTC (permalink / raw
  To: gentoo-commits

commit:     284bb3c18946ef782e1bd25ac763fb1aa532283a
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Feb 25 17:57:18 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 14:26:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284bb3c1

net-im/err: Remove old

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-im/err/Manifest                      |   1 -
 net-im/err/err-6.1.4.ebuild              |  91 ---------------
 net-im/err/files/err-6.1.4-slixmpp.patch | 190 -------------------------------
 3 files changed, 282 deletions(-)

diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index 9b09a0caeaa..96da875a11a 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1,2 +1 @@
 DIST err-6.1.7.tar.gz 1359383 BLAKE2B 400bbf4a4180f74993a4414dc55f07a69b34b04277fecd073bd860df9dcd5da4873949df766c0c2f6b7a43b4e87153d0aa77b0abaf95bf9702d76c3c7b290abe SHA512 cd0dadc5ff380c71631bae7711bdba7345046fbe14e369c8efa8eed98752b9ea03f6e4fa3171df257a9d76686c610e28fac5f39f7e8e107348a5746e4354694b
-DIST errbot-6.1.4.tar.gz 207370 BLAKE2B 187e87cc36393f85c1405a29d332d703cdd2ac9d9c6b50178ff7382bc5feb620b69a77dc21ce8144fc24045f11067865c7273118fc25ec1ad9afb93d6ccc635e SHA512 60cc8f070e2420e4ef5f0124eb6d03b3cf01c44e148ebb8b92f5b504eb6968c754fd82771da9528daab62c9e9f4d6ef97ab1063f1093163208521b26e36b2f2d

diff --git a/net-im/err/err-6.1.4.ebuild b/net-im/err/err-6.1.4.ebuild
deleted file mode 100644
index 65c20b5d54f..00000000000
--- a/net-im/err/err-6.1.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-MY_PN="errbot"
-MY_P="${MY_PN}-${PV}"
-
-inherit distutils-r1 user
-
-DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable"
-HOMEPAGE="https://errbot.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="irc +xmpp"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/ansi[${PYTHON_USEDEP}]
-	dev-python/bottle[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/daemonize[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.19.16[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/webtest[${PYTHON_USEDEP}]
-	dev-python/yapsy[${PYTHON_USEDEP}]
-	irc? (
-		dev-python/irc[${PYTHON_USEDEP}]
-	)
-	xmpp? (
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/slixmpp[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-slixmpp.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-# NOTES:
-# 1. Support for BOT_SENTRY option is missing, cause
-#    we do not have apropriate packages in portage yet
-# 2. Currently only XMPP is supported(IRC still untested)
-# 3. Internal web server is temporarily removed (rocket-err from requires.txt)
-# 4. pygments-markdown-lexer dependency(needed only for debugging?) is temporarily removed (pygments-markdown-lexer from requires.txt)
-
-pkg_setup() {
-	ebegin "Creating err group and user"
-	enewgroup 'err'
-	enewuser 'err' -1 -1 -1 'err'
-	eend ${?}
-}
-
-python_prepare_all() {
-	sed -i \
-		-e '/rocket-errbot/d' \
-		-e 's/dnspython3/dnspython/' \
-		-e '/pygments-markdown-lexer/d' \
-		setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}"/errd.initd.2 errd
-	newconfd "${FILESDIR}"/errd.confd errd
-
-	dodir /etc/${PN}
-	keepdir /var/lib/${PN}
-	keepdir /var/log/${PN}
-	fowners -R err:err /var/lib/${PN}
-	fowners -R err:err /var/log/${PN}
-
-	insinto /etc/${PN}
-	newins errbot/config-template.py config.py
-}

diff --git a/net-im/err/files/err-6.1.4-slixmpp.patch b/net-im/err/files/err-6.1.4-slixmpp.patch
deleted file mode 100644
index ccccc171f23..00000000000
--- a/net-im/err/files/err-6.1.4-slixmpp.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From e68c539c727c7275665a198fc7a217a3c1ad3be2 Mon Sep 17 00:00:00 2001
-From: Birger Schacht <1143280+bisco2@users.noreply.github.com>
-Date: Sat, 11 Jul 2020 11:20:53 +0000
-Subject: [PATCH] Replace sleekxmpp with slixmpp (#1430)
-
-* Start moving to slixmpp
-
-* Pass a default value for ssl_version to the XMPPConnection
----
- .../plugin_development/backend_specifics.rst  |  6 +--
- errbot/backends/xmpp.py                       | 49 +++++++++----------
- setup.py                                      |  4 +-
-
-diff --git a/errbot/backends/xmpp.py b/errbot/backends/xmpp.py
-index 08f49340..e27c2893 100644
---- a/errbot/backends/xmpp.py
-+++ b/errbot/backends/xmpp.py
-@@ -2,7 +2,6 @@
- import sys
- from functools import lru_cache
- 
--from threading import Thread
- from time import sleep
- 
- from errbot.backends.base import Message, Room, Presence, RoomNotJoinedError, Identifier, RoomOccupant, Person
-@@ -13,10 +12,10 @@
- log = logging.getLogger(__name__)
- 
- try:
--    from sleekxmpp import ClientXMPP
--    from sleekxmpp.xmlstream import resolver, cert
--    from sleekxmpp import JID
--    from sleekxmpp.exceptions import IqError
-+    from slixmpp import ClientXMPP
-+    from slixmpp.xmlstream import resolver, cert
-+    from slixmpp import JID
-+    from slixmpp.exceptions import IqError
- 
- except ImportError:
-     log.exception("Could not start the XMPP backend")
-@@ -114,15 +113,10 @@ def join(self, username=None, password=None):
-         :meth:`create` on it first.
-         """
-         room = str(self)
--        self.xep0045.joinMUC(room, username, password=password, wait=True)
-+        self.xep0045.join_muc(room, username, password=password, wait=True)
-         self._bot.conn.add_event_handler(f'muc::{room}::got_online', self._bot.user_joined_chat)
-         self._bot.conn.add_event_handler(f'muc::{room}::got_offline', self._bot.user_left_chat)
--        # Room configuration can only be done once a MUC presence stanza
--        # has been received from the server. This HAS to take place in a
--        # separate thread because of how SleekXMPP processes these stanzas.
--        t = Thread(target=self.configure)
--        t.setDaemon(True)
--        t.start()
-+        self.configure()
-         self._bot.callback_room_joined(self)
-         log.info('Joined room %s.', room)
- 
-@@ -137,7 +131,7 @@ def leave(self, reason=None):
-             reason = ""
-         room = str(self)
-         try:
--            self.xep0045.leaveMUC(room=room, nick=self.xep0045.ourNicks[room], msg=reason)
-+            self.xep0045.leave_muc(room=room, nick=self.xep0045.ourNicks[room], msg=reason)
- 
-             self._bot.conn.del_event_handler(f'muc::{room}::got_online', self._bot.user_joined_chat)
-             self._bot.conn.del_event_handler(f'muc::{room}::got_offline', self._bot.user_left_chat)
-@@ -148,7 +142,7 @@ def leave(self, reason=None):
- 
-     def create(self):
-         """
--        Not supported on this back-end (SleekXMPP doesn't support it).
-+        Not supported on this back-end (Slixmpp doesn't support it).
-         Will join the room to ensure it exists, instead.
-         """
-         logging.warning(
-@@ -186,7 +180,7 @@ def joined(self):
-         :getter:
-             Returns `True` if the room has been joined, `False` otherwise.
-         """
--        return str(self) in self.xep0045.getJoinedRooms()
-+        return str(self) in self.xep0045.get_joined_rooms()
- 
-     @property
-     def topic(self):
-@@ -214,7 +208,7 @@ def topic(self, topic):
-         :param topic:
-             The topic to set.
-         """
--        # Not supported by SleekXMPP at the moment :(
-+        # Not supported by Slixmpp at the moment :(
-         raise NotImplementedError("Setting the topic is not supported on this back-end.")
- 
-     @property
-@@ -261,16 +255,16 @@ def configure(self):
-         affiliation = None
-         while affiliation is None:
-             sleep(0.5)
--            affiliation = self.xep0045.getJidProperty(
-+            affiliation = self.xep0045.get_jid_property(
-                 room=room,
--                nick=self.xep0045.ourNicks[room],
--                jidProperty='affiliation'
-+                nick=self.xep0045.our_nicks[room],
-+                jid_property='affiliation'
-             )
- 
-         if affiliation == "owner":
-             log.debug('Configuring room %s: we have owner affiliation.', room)
--            form = self.xep0045.getRoomConfig(room)
--            self.xep0045.configureRoom(room, form)
-+            form = yield from self.xep0045.get_room_config(room)
-+            self.xep0045.configure_room(room, form)
-         else:
-             log.debug("Not configuring room %s: we don't have owner affiliation (affiliation=%s)", room, affiliation)
- 
-@@ -291,7 +285,7 @@ def real_jid(self):
-         Will only work if the errbot is moderator in the MUC or it is not anonymous.
-         """
-         room_jid = self._node + '@' + self._domain
--        jid = JID(self._room.xep0045.getJidProperty(room_jid, self.resource, 'jid'))
-+        jid = JID(self._room.xep0045.get_jid_property(room_jid, self.resource, 'jid'))
-         return jid.bare
- 
-     @property
-@@ -303,7 +297,8 @@ def room(self):
- 
- class XMPPConnection(object):
-     def __init__(self, jid, password, feature=None, keepalive=None,
--                 ca_cert=None, server=None, use_ipv6=None, bot=None):
-+                 ca_cert=None, server=None, use_ipv6=None, bot=None,
-+                 ssl_version=None):
-         if feature is None:
-             feature = {}
-         self._bot = bot
-@@ -317,7 +312,7 @@ def __init__(self, jid, password, feature=None, keepalive=None,
-         self.client.register_plugin('xep_0249')  # XMPP direct MUC invites
- 
-         if keepalive is not None:
--            self.client.whitespace_keepalive = True  # Just in case SleekXMPP's default changes to False in the future
-+            self.client.whitespace_keepalive = True  # Just in case Slixmpp's default changes to False in the future
-             self.client.whitespace_keepalive_interval = keepalive
- 
-         if use_ipv6 is not None:
-@@ -348,7 +343,7 @@ def disconnect(self):
-         self.connected = False
- 
-     def serve_forever(self):
--        self.client.process(block=True)
-+        self.client.process()
- 
-     def add_event_handler(self, name, cb):
-         self.client.add_event_handler(name, cb)
-@@ -447,7 +442,7 @@ def incoming_message(self, xmppmsg):
-             msg.to = self._build_person(xmppmsg['to'].full)
- 
-         msg.nick = xmppmsg['mucnick']
--        msg.delayed = bool(xmppmsg['delay']._get_attr('stamp'))  # this is a bug in sleekxmpp it should be ['from']
-+        msg.delayed = bool(xmppmsg['delay']._get_attr('stamp'))  # this is a bug in slixmpp it should be ['from']
-         self.callback_message(msg)
- 
-     def _idd_from_event(self, event):
-@@ -582,7 +577,7 @@ def rooms(self):
-             A list of :class:`~errbot.backends.base.XMPPMUCRoom` instances.
-         """
-         xep0045 = self.conn.client.plugin['xep_0045']
--        return [XMPPRoom(room, self) for room in xep0045.getJoinedRooms()]
-+        return [XMPPRoom(room, self) for room in xep0045.get_joined_rooms()]
- 
-     def query_room(self, room):
-         """
-diff --git a/setup.py b/setup.py
-index 3d0c09f8..4a3c1ea1 100755
---- a/setup.py
-+++ b/setup.py
-@@ -105,12 +105,12 @@ def read(fname, encoding='ascii'):
-         },
-         extras_require={
-             'graphic': ['PySide', ],
--            'hipchat': ['hypchat', 'sleekxmpp', 'pyasn1', 'pyasn1-modules'],
-+            'hipchat': ['hypchat', 'slixmpp', 'pyasn1', 'pyasn1-modules'],
-             'IRC': ['irc', ],
-             'slack': ['slackclient>=1.0.5,<2.0', ],
-             'slack-rtm': ['slackclient>=2.0', ],
-             'telegram': ['python-telegram-bot', ],
--            'XMPP': ['sleekxmpp', 'pyasn1', 'pyasn1-modules'],
-+            'XMPP': ['slixmpp', 'pyasn1', 'pyasn1-modules'],
-             ':python_version<"3.7"': ['dataclasses'],  # backward compatibility for 3.3->3.6 for dataclasses
-             ':sys_platform!="win32"': ['daemonize'],
-         },


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/err/, net-im/err/files/
@ 2022-04-23  7:32 Joonas Niilola
  0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2022-04-23  7:32 UTC (permalink / raw
  To: gentoo-commits

commit:     503e89d0bc5fe1ecbf6822bd3f8a388497c5b1e4
Author:     Yu Gu <guyu2876 <AT> gmail <DOT> com>
AuthorDate: Sat Apr 23 06:58:54 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 07:32:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=503e89d0

net-im/err: revbump to 6.1.8-r1 to fix a bug

Remove unsupport argument reconnection_interval from irc backend.

Signed-off-by: Yu Gu <guyu2876 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25161
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-im/err/err-6.1.8-r1.ebuild         | 93 ++++++++++++++++++++++++++++++++++
 net-im/err/files/fix-irc-backend.patch | 18 +++++++
 2 files changed, 111 insertions(+)

diff --git a/net-im/err/err-6.1.8-r1.ebuild b/net-im/err/err-6.1.8-r1.ebuild
new file mode 100644
index 000000000000..11312c0984ea
--- /dev/null
+++ b/net-im/err/err-6.1.8-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+MY_PN="errbot"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable"
+HOMEPAGE="https://errbot.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/errbotio/errbot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES="${FILESDIR}/fix-irc-backend.patch"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="irc +xmpp"
+
+DEPEND="
+	acct-group/err
+	acct-user/err"
+RDEPEND="${DEPEND}
+	dev-python/ansi[${PYTHON_USEDEP}]
+	dev-python/bottle[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/daemonize[${PYTHON_USEDEP}]
+	dev-python/deepmerge[${PYTHON_USEDEP}]
+	dev-python/dulwich[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/webtest[${PYTHON_USEDEP}]
+	irc? (
+		dev-python/irc[${PYTHON_USEDEP}]
+	)
+	xmpp? (
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/slixmpp[${PYTHON_USEDEP}]
+	)"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/pygments-markdown-lexer/d' setup.py || die
+
+	# NameError: name 'slack' is not defined
+	rm tests/backend_tests/slack_test.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		tests/commands_test.py::test_plugin_cycle
+		tests/commands_test.py::test_broken_plugin
+		tests/commands_test.py::test_backup
+		tests/plugin_management_test.py::test_check_dependencies_requi
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}"/errd.initd.2 errd
+	newconfd "${FILESDIR}"/errd.confd errd
+
+	dodir /etc/${PN}
+	keepdir /var/lib/${PN}
+	keepdir /var/log/${PN}
+	fowners -R err:err /var/lib/${PN}
+	fowners -R err:err /var/log/${PN}
+
+	insinto /etc/${PN}
+	newins errbot/config-template.py config.py
+}
+
+pkg_postinst() {
+	elog "For more backends (Hipchat, Slact, Telegram) support, use pip"
+}

diff --git a/net-im/err/files/fix-irc-backend.patch b/net-im/err/files/fix-irc-backend.patch
new file mode 100644
index 000000000000..0874e7352bc1
--- /dev/null
+++ b/net-im/err/files/fix-irc-backend.patch
@@ -0,0 +1,18 @@
+From 34df1dd98a7ce3a17c22081fadb427827b431d7f Mon Sep 17 00:00:00 2001
+From: Carlos <nzlosh@yahoo.com>
+Date: Fri, 22 Apr 2022 23:45:44 +0200
+Subject: [PATCH] Fixes #1566 remove unsupport argument reconnection_interval
+ from irc backend.
+
+diff --git a/errbot/backends/irc.py b/errbot/backends/irc.py
+index 95a8757d4..9f7e75b29 100644
+--- a/errbot/backends/irc.py
++++ b/errbot/backends/irc.py
+@@ -377,7 +377,6 @@ def __init__(
+             [(server, port, password)],
+             nickname,
+             username,
+-            reconnection_interval=reconnect_on_disconnect,
+         )
+ 
+     def connect(self, *args, **kwargs) -> None:


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/err/, net-im/err/files/
@ 2023-03-08 13:43 Joonas Niilola
  0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2023-03-08 13:43 UTC (permalink / raw
  To: gentoo-commits

commit:     7646f9ed71ae9e81bba91815ea7e1965bc6f4438
Author:     Yu Gu <guyu2876 <AT> gmail <DOT> com>
AuthorDate: Sun Feb 26 12:38:03 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Mar  8 13:43:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7646f9ed

net-im/err: drop old

Signed-off-by: Yu Gu <guyu2876 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29806
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-im/err/Manifest                              |  2 -
 net-im/err/err-6.1.7.ebuild                      | 87 ----------------------
 net-im/err/err-6.1.8-r1.ebuild                   | 93 ------------------------
 net-im/err/files/err-6.1.8-fix-irc-backend.patch | 18 -----
 4 files changed, 200 deletions(-)

diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index 8acdb8c9e6ba..56c41525b4c0 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1,3 +1 @@
-DIST err-6.1.7.tar.gz 1359383 BLAKE2B 400bbf4a4180f74993a4414dc55f07a69b34b04277fecd073bd860df9dcd5da4873949df766c0c2f6b7a43b4e87153d0aa77b0abaf95bf9702d76c3c7b290abe SHA512 cd0dadc5ff380c71631bae7711bdba7345046fbe14e369c8efa8eed98752b9ea03f6e4fa3171df257a9d76686c610e28fac5f39f7e8e107348a5746e4354694b
-DIST err-6.1.8.tar.gz 1609310 BLAKE2B e3682bfccd548c92160322287a17e26448322abd3956d464b393f333c0cc521d6d5183dab799d280603995a4508a2eb300fefb9c6159da6ed1c550247fa375d9 SHA512 5413f667ee4e121134b791f0dc8fd709ecbd9093a237b9637d282f41458c40076615ffc9167cfa95f297ae416c38b16ded8ae97aece55a81d88dc46b324ec851
 DIST err-6.1.9.tar.gz 1554146 BLAKE2B 62a715d57c213b8d68c40afad92c14d26ff23fdce1df6b489be23817d33d8bc01c7c400ca7360546abc880b4a7e6205f92a3787cabfce3e14500ef8918a4b010 SHA512 cc8f7a00bc9bd7680d978b4c2e6c9ac78f32e0a99796cc9933802206b2c2998caf060d474aca374d8102923bf8eb64f69a01846c5761b13a8624641796893c9b

diff --git a/net-im/err/err-6.1.7.ebuild b/net-im/err/err-6.1.7.ebuild
deleted file mode 100644
index f214822c7eef..000000000000
--- a/net-im/err/err-6.1.7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-MY_PN="errbot"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable"
-HOMEPAGE="https://errbot.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/errbotio/errbot/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="irc +xmpp"
-
-DEPEND="
-	acct-group/err
-	acct-user/err"
-RDEPEND="${DEPEND}
-	dev-python/ansi[${PYTHON_USEDEP}]
-	dev-python/bottle[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/daemonize[${PYTHON_USEDEP}]
-	dev-python/deepmerge[${PYTHON_USEDEP}]
-	dev-python/dulwich[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/webtest[${PYTHON_USEDEP}]
-	irc? (
-		dev-python/irc[${PYTHON_USEDEP}]
-	)
-	xmpp? (
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/slixmpp[${PYTHON_USEDEP}]
-	)"
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/pygments-markdown-lexer/d' setup.py || die
-
-	# NameError: name 'slack' is not defined
-	rm tests/backend_tests/slack_test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		--deselect tests/commands_test.py::test_plugin_cycle
-		--deselect tests/commands_test.py::test_broken_plugin
-		--deselect tests/commands_test.py::test_backup
-		--deselect tests/plugin_management_test.py::test_check_dependencies_requi
-	)
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}"/errd.initd.2 errd
-	newconfd "${FILESDIR}"/errd.confd errd
-
-	dodir /etc/${PN}
-	keepdir /var/lib/${PN}
-	keepdir /var/log/${PN}
-	fowners -R err:err /var/lib/${PN}
-	fowners -R err:err /var/log/${PN}
-
-	insinto /etc/${PN}
-	newins errbot/config-template.py config.py
-}

diff --git a/net-im/err/err-6.1.8-r1.ebuild b/net-im/err/err-6.1.8-r1.ebuild
deleted file mode 100644
index 420f3ad28dc1..000000000000
--- a/net-im/err/err-6.1.8-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-MY_PN="errbot"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable"
-HOMEPAGE="https://errbot.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/errbotio/errbot/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES="${FILESDIR}/err-6.1.8-fix-irc-backend.patch"
-
-KEYWORDS="~amd64 ~riscv"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="irc +xmpp"
-
-DEPEND="
-	acct-group/err
-	acct-user/err"
-RDEPEND="${DEPEND}
-	dev-python/ansi[${PYTHON_USEDEP}]
-	dev-python/bottle[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/daemonize[${PYTHON_USEDEP}]
-	dev-python/deepmerge[${PYTHON_USEDEP}]
-	dev-python/dulwich[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/webtest[${PYTHON_USEDEP}]
-	irc? (
-		dev-python/irc[${PYTHON_USEDEP}]
-	)
-	xmpp? (
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/slixmpp[${PYTHON_USEDEP}]
-	)"
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/pygments-markdown-lexer/d' setup.py || die
-
-	# NameError: name 'slack' is not defined
-	rm tests/backend_tests/slack_test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		tests/commands_test.py::test_plugin_cycle
-		tests/commands_test.py::test_broken_plugin
-		tests/commands_test.py::test_backup
-		tests/plugin_management_test.py::test_check_dependencies_requi
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}"/errd.initd.2 errd
-	newconfd "${FILESDIR}"/errd.confd errd
-
-	dodir /etc/${PN}
-	keepdir /var/lib/${PN}
-	keepdir /var/log/${PN}
-	fowners -R err:err /var/lib/${PN}
-	fowners -R err:err /var/log/${PN}
-
-	insinto /etc/${PN}
-	newins errbot/config-template.py config.py
-}
-
-pkg_postinst() {
-	elog "For more backends (Hipchat, Slact, Telegram) support, use pip"
-}

diff --git a/net-im/err/files/err-6.1.8-fix-irc-backend.patch b/net-im/err/files/err-6.1.8-fix-irc-backend.patch
deleted file mode 100644
index 0874e7352bc1..000000000000
--- a/net-im/err/files/err-6.1.8-fix-irc-backend.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 34df1dd98a7ce3a17c22081fadb427827b431d7f Mon Sep 17 00:00:00 2001
-From: Carlos <nzlosh@yahoo.com>
-Date: Fri, 22 Apr 2022 23:45:44 +0200
-Subject: [PATCH] Fixes #1566 remove unsupport argument reconnection_interval
- from irc backend.
-
-diff --git a/errbot/backends/irc.py b/errbot/backends/irc.py
-index 95a8757d4..9f7e75b29 100644
---- a/errbot/backends/irc.py
-+++ b/errbot/backends/irc.py
-@@ -377,7 +377,6 @@ def __init__(
-             [(server, port, password)],
-             nickname,
-             username,
--            reconnection_interval=reconnect_on_disconnect,
-         )
- 
-     def connect(self, *args, **kwargs) -> None:


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-03-08 13:43 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-23  7:32 [gentoo-commits] repo/gentoo:master commit in: net-im/err/, net-im/err/files/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2023-03-08 13:43 Joonas Niilola
2021-02-26 14:26 Sam James
2020-08-11 11:28 Sergey Popov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox