GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-01 01:09:22 +01:00
Code Issues Projects Releases Wiki Activity

classes: migrate self.proto calls to self

Browse Source
This commit is contained in:
James Lu 2017-06-25 01:45:16 -07:00
parent d0209f720a
commit eef7a73ce9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
classes.py
View File

@ -198,7 +198,7 @@ class PyLinkNetworkCore(utils.DeprecatedAttributesObject, utils.CamelCaseToSnake
if 'ts' not in parsed_args: if 'ts' not in parsed_args:
parsed_args['ts'] = int(time.time()) parsed_args['ts'] = int(time.time())
hook_cmd = command hook_cmd = command
hook_map = self.proto.hook_map hook_map = self.hook_map
# If the hook name is present in the protocol module's hook_map, then we # If the hook name is present in the protocol module's hook_map, then we
# should set the hook name to the name that points to instead. # should set the hook name to the name that points to instead.
@ -249,10 +249,10 @@ class PyLinkNetworkCore(utils.DeprecatedAttributesObject, utils.CamelCaseToSnake
source = source or self.pseudoclient.uid source = source or self.pseudoclient.uid
if notice: if notice:
self.proto.notice(source, target, text) self.notice(source, target, text)
cmd = 'PYLINK_SELF_NOTICE' cmd = 'PYLINK_SELF_NOTICE'
else: else:
self.proto.message(source, target, text) self.message(source, target, text)
cmd = 'PYLINK_SELF_PRIVMSG' cmd = 'PYLINK_SELF_PRIVMSG'
if loopback: if loopback:
@ -324,7 +324,7 @@ class PyLinkNetworkCore(utils.DeprecatedAttributesObject, utils.CamelCaseToSnake
"""Sends a command to the protocol module.""" """Sends a command to the protocol module."""
log.debug("(%s) <- %s", self.name, line) log.debug("(%s) <- %s", self.name, line)
try: try:
hook_args = self.proto.handle_events(line) hook_args = self.handle_events(line)
except Exception: except Exception:
log.exception('(%s) Caught error in handle_events, disconnecting!', self.name) log.exception('(%s) Caught error in handle_events, disconnecting!', self.name)
log.error('(%s) The offending line was: <- %s', self.name, line) log.error('(%s) The offending line was: <- %s', self.name, line)
@ -346,7 +346,7 @@ class PyLinkNetworkCore(utils.DeprecatedAttributesObject, utils.CamelCaseToSnake
self.init_vars() self.init_vars()
try: try:
self.proto.validateServerConf() self.validateServerConf()
except AssertionError as e: except AssertionError as e:
log.exception("(%s) Configuration error: %s", self.name, e) log.exception("(%s) Configuration error: %s", self.name, e)
raise raise
@ -439,7 +439,7 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
def to_lower(self, text): def to_lower(self, text):
"""Returns a lowercase representation of text based on the IRC object's """Returns a lowercase representation of text based on the IRC object's
casemapping (rfc1459 or ascii).""" casemapping (rfc1459 or ascii)."""
if self.proto.casemapping == 'rfc1459': if self.casemapping == 'rfc1459':
text = text.replace('{', '[') text = text.replace('{', '[')
text = text.replace('}', ']') text = text.replace('}', ']')
text = text.replace('|', '\\') text = text.replace('|', '\\')
@ -969,7 +969,7 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
range. range.
""" """
# Get the corresponding casemapping value used by ircmatch. # Get the corresponding casemapping value used by ircmatch.
if self.proto.casemapping == 'rfc1459': if self.casemapping == 'rfc1459':
casemapping = 0 casemapping = 0
else: else:
casemapping = 1 casemapping = 1
@ -1132,7 +1132,7 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
class IRCNetwork(PyLinkNetworkCoreWithUtils): class IRCNetwork(PyLinkNetworkCoreWithUtils):
def schedule_ping(self): def schedule_ping(self):
"""Schedules periodic pings in a loop.""" """Schedules periodic pings in a loop."""
self.proto.ping() self.ping()
self.pingTimer = threading.Timer(self.pingfreq, self.schedule_ping) self.pingTimer = threading.Timer(self.pingfreq, self.schedule_ping)
self.pingTimer.daemon = True self.pingTimer.daemon = True