Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

fix _line() related type hinting issues in IRCServer.py

Browse source
This commit is contained in:
jesopo 2019-10-30 13:46:29 +00:00
parent 02041d99c6
commit 9958c9169d
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/IRCServer.py
View file

@ -37,7 +37,7 @@ class Server(IRCObject.Object):
self._capabilities_waiting = set([]) # type: typing.Set[str] self._capabilities_waiting = set([]) # type: typing.Set[str]
self.agreed_capabilities = set([]) # type: typing.Set[str] self.agreed_capabilities = set([]) # type: typing.Set[str]
self.server_capabilities = {} # type: typing.Dict[str, str] self.server_capabilities = {} # type: typing.Dict[str, str]
self.batches = {} # type: typing.Dict[str, utils.irc.IRCBatch] self.batches = {} # type: typing.Dict[str, IRCLine.IRCBatch]
self.users = {} # type: typing.Dict[str, IRCUser.User] self.users = {} # type: typing.Dict[str, IRCUser.User]
self.new_users = set([]) #type: typing.Set[IRCUser.User] self.new_users = set([]) #type: typing.Set[IRCUser.User]
@ -296,9 +296,10 @@ class Server(IRCObject.Object):
def send_raw(self, line: str): def send_raw(self, line: str):
return self.send(IRCLine.parse_line(line)) return self.send(IRCLine.parse_line(line))
def _line(self, command, args, tags={}): def _line(self, command: str,
return IRCLine.ParsedLine(command, unfiltered_args: typing.Sequence[typing.Optional[str]], tags={}):
[arg for arg in args if not arg == None], tags=tags) args: typing.List[str] = [a for a in unfiltered_args if not a is None]
return IRCLine.ParsedLine(command, args, tags=tags)
def send_user(self, username: str, realname: str def send_user(self, username: str, realname: str
) -> typing.Optional[IRCLine.SentLine]: ) -> typing.Optional[IRCLine.SentLine]:
@ -359,9 +360,9 @@ class Server(IRCObject.Object):
def send_pong(self, token: str) -> typing.Optional[IRCLine.SentLine]: def send_pong(self, token: str) -> typing.Optional[IRCLine.SentLine]:
return self.send(self._line("PONG", [token])) return self.send(self._line("PONG", [token]))
def send_join(self, channel_name: str, key: typing.List[str]=None def send_join(self, channel_name: str, keys: typing.List[str]=None
) -> typing.Optional[IRCLine.SentLine]: ) -> typing.Optional[IRCLine.SentLine]:
return self.send(self._line("JOIN", [channel_name, key])) return self.send(self._line("JOIN", [channel_name]+(keys or [])))
def send_joins(self, channel_names: typing.List[str], def send_joins(self, channel_names: typing.List[str],
keys: typing.List[str]=None): keys: typing.List[str]=None):
return self.send(self._line("JOIN", return self.send(self._line("JOIN",
@ -386,7 +387,10 @@ class Server(IRCObject.Object):
def send_mode(self, target: str, mode: str=None, args: typing.List[str]=None def send_mode(self, target: str, mode: str=None, args: typing.List[str]=None
) -> typing.Optional[IRCLine.SentLine]: ) -> typing.Optional[IRCLine.SentLine]:
return self.send(self._line("MODE", [target, mode]+(args or []))) line_args = [target, mode]
if args:
line_args.extend(args)
return self.send(self._line("MODE", line_args))
def send_topic(self, channel_name: str, topic: str def send_topic(self, channel_name: str, topic: str
) -> typing.Optional[IRCLine.SentLine]: ) -> typing.Optional[IRCLine.SentLine]: