GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-11-04 08:57:25 +01:00
Code Issues Projects Releases Wiki Activity

ircs2s_common: use conf.validate() instead of assertion in validate_server_conf() (#485)

Browse Source 
Closes #472.
This commit is contained in:
Mitchell Cooper 2017-07-12 17:17:41 -04:00 committed by James Lu
parent c92bb1e33b
commit 87fe7693b0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
protocols/ircs2s_common.py
View File

@ -8,7 +8,7 @@ from collections import defaultdict
from pylinkirc.classes import IRCNetwork, ProtocolError
from pylinkirc.log import log
from pylinkirc import utils
from pylinkirc import utils, conf
class IRCCommonProtocol(IRCNetwork):
@ -26,10 +26,14 @@ class IRCCommonProtocol(IRCNetwork):
def validate_server_conf(self):
"""Validates that the server block given contains the required keys."""
for k in self.conf_keys:
assert k in self.serverdata, "Missing option %r in server block for network %s." % (k, self.name)
conf.validate(k in self.serverdata,
"Missing option %r in server block for network %s."
% (k, self.name))
port = self.serverdata['port']
assert type(port) == int and 0 < port < 65535, "Invalid port %r for network %s" % (port, self.name)
conf.validate(type(port) == int and 0 < port < 65535,
"Invalid port %r for network %s"
% (port, self.name))
# TODO: these wrappers really need to be standardized
def _get_SID(self, sname):