Merge branch 'master' into devel

README.md

@@ -18,7 +18,7 @@ Dependencies currently include:
 #### Supported IRCds
 
 * InspIRCd 2.0.x - module: `inspircd`
-* charybdis (3.5.x / git master) - module: `ts6`
+* charybdis (3.5.x / git master) - module: `ts6` (**experimental**)
 
 ### Installation
 

plugins/relay.py

@@ -460,8 +460,7 @@ whitelisted_cmodes = {'admin', 'allowinvite', 'autoop', 'ban', 'banexception',
                       'regmoderated', 'secret', 'sslonly',
                       'stripcolor', 'topiclock', 'voice'}
 whitelisted_umodes = {'bot', 'hidechans', 'hideoper', 'invisible', 'oper',
-                      'regdeaf', 'u_stripcolor', 'servprotect', 'u_noctcp',
-                      'wallops'}
+                      'regdeaf', 'u_stripcolor', 'u_noctcp', 'wallops'}
 def relayModes(irc, remoteirc, sender, channel, modes=None):
     remotechan = findRemoteChan(irc, remoteirc, channel)
     log.debug('(%s) Relay mode: remotechan for %s on %s is %s', irc.name, channel, irc.name, remotechan)

protocols/inspircd.py

@@ -476,7 +476,7 @@ def handle_events(irc, data):
     # Each server message looks something like this:
     # :70M FJOIN #chat 1423790411 +AFPfjnt 6:5 7:5 9:5 :v,1SRAAESWE
     # :<sid> <command> <argument1> <argument2> ... :final multi word argument
-    args = data.split()
+    args = data.split(" ")
     if not args:
         # No data??
         return

protocols/ts6.py

@@ -414,7 +414,7 @@ def handle_events(irc, data):
     # TS6 messages:
     # :42X COMMAND arg1 arg2 :final long arg
     # :42XAAAAAA PRIVMSG #somewhere :hello!
-    args = data.split()
+    args = data.split(" ")
     if not args:
         # No data??
         return