From 9a61e64dfc9635cc7291e64d505ff87efd3ae522 Mon Sep 17 00:00:00 2001 From: James Lu Date: Sat, 16 Jan 2016 16:53:06 -0800 Subject: [PATCH] protocols: squitServer(...) -> squit(...) --- docs/technical/pmodule-spec.md | 2 +- plugins/relay.py | 4 ++-- protocols/inspircd.py | 2 +- protocols/ts6_common.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/technical/pmodule-spec.md b/docs/technical/pmodule-spec.md index 186638f..107ed83 100644 --- a/docs/technical/pmodule-spec.md +++ b/docs/technical/pmodule-spec.md @@ -81,7 +81,7 @@ optional, and defaults to the one we've stored in the channel state if not given - **`spawnServer`**`(self, name, sid=None, uplink=None, desc=None)` - Spawns a server off another PyLink server. `desc` (server description) defaults to the one in the config. `uplink` defaults to the main PyLink server, and `sid` (the server ID) is automatically generated if not given. Sanity checks for server name and SID validity ARE done by the protocol module here. -- **`squitServer`**`(self, source, target, text='No reason given')` - SQUITs a PyLink server. +- **`squit`**`(self, source, target, text='No reason given')` - SQUITs a PyLink server. - **`topicClient`**`(self, source, target, text)` - Sends a topic change from a PyLink client. diff --git a/plugins/relay.py b/plugins/relay.py index 395254c..cd41eb0 100644 --- a/plugins/relay.py +++ b/plugins/relay.py @@ -64,7 +64,7 @@ def die(sourceirc): irc.proto.quit(user, "Relay plugin unloaded.") for server, sobj in irc.servers.copy().items(): if hasattr(sobj, 'remote'): - irc.proto.squitServer(irc.sid, server, text="Relay plugin unloaded.") + irc.proto.squit(irc.sid, server, text="Relay plugin unloaded.") relayservers.clear() relayusers.clear() @@ -1057,7 +1057,7 @@ def handle_disconnect(irc, numeric, command, args): except KeyError: continue else: - ircobj.proto.squitServer(ircobj.sid, rsid, text='Relay network lost connection.') + ircobj.proto.squit(ircobj.sid, rsid, text='Relay network lost connection.') del relayservers[name][irc.name] try: del relayservers[irc.name] diff --git a/protocols/inspircd.py b/protocols/inspircd.py index 3fc1951..79077fe 100644 --- a/protocols/inspircd.py +++ b/protocols/inspircd.py @@ -336,7 +336,7 @@ class InspIRCdProtocol(TS6BaseProtocol): endburstf() return sid - def squitServer(self, source, target, text='No reason given'): + def squit(self, source, target, text='No reason given'): """SQUITs a PyLink server.""" # -> :9PY SQUIT 9PZ :blah, blah self._send(source, 'SQUIT %s :%s' % (target, text)) diff --git a/protocols/ts6_common.py b/protocols/ts6_common.py index c37dae2..cf62722 100644 --- a/protocols/ts6_common.py +++ b/protocols/ts6_common.py @@ -141,7 +141,7 @@ class TS6BaseProtocol(Protocol): self.irc.servers[sid] = IrcServer(uplink, name, internal=True, desc=desc) return sid - def squitServer(self, source, target, text='No reason given'): + def squit(self, source, target, text='No reason given'): """SQUITs a PyLink server.""" # -> SQUIT 9PZ :blah, blah log.debug('source=%s, target=%s', source, target)