From 2ea5d9629034b969fefa8b1c6798d2919536a3b1 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Tue, 17 May 2016 17:35:44 -0700 Subject: [PATCH] Channels don't need "welcome" anymore --- src/wormhole/server/rendezvous.py | 5 ++--- src/wormhole/test/test_server.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/wormhole/server/rendezvous.py b/src/wormhole/server/rendezvous.py index 691d06e..2072812 100644 --- a/src/wormhole/server/rendezvous.py +++ b/src/wormhole/server/rendezvous.py @@ -16,8 +16,7 @@ CLAIM = u"_claim" RELEASE = u"_release" class Channel: - def __init__(self, app, db, welcome, blur_usage, log_requests, - appid, channelid): + def __init__(self, app, db, blur_usage, log_requests, appid, channelid): self._app = app self._db = db self._blur_usage = blur_usage @@ -237,7 +236,7 @@ class AppNamespace: if not channelid in self._channels: if self._log_requests: log.msg("spawning #%s for appid %s" % (channelid, self._appid)) - self._channels[channelid] = Channel(self, self._db, self._welcome, + self._channels[channelid] = Channel(self, self._db, self._blur_usage, self._log_requests, self._appid, channelid) diff --git a/src/wormhole/test/test_server.py b/src/wormhole/test/test_server.py index 8fa709c..e98f4d1 100644 --- a/src/wormhole/test/test_server.py +++ b/src/wormhole/test/test_server.py @@ -466,7 +466,7 @@ class WebSocketAPI(ServerBase, unittest.TestCase): class Summary(unittest.TestCase): def test_summarize(self): - c = rendezvous.Channel(None, None, None, None, False, None, None) + c = rendezvous.Channel(None, None, None, False, None, None) A = rendezvous.CLAIM D = rendezvous.RELEASE