Starting to implement grapewine support

evennia/server/portal/webclient.py

@@ -37,7 +37,7 @@ class WebSocketClient(WebSocketServerProtocol, Session):
     Implements the server-side of the Websocket connection.
     """
     def __init__(self, *args, **kwargs):
-        super(WebSocketClient, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.protocol_key = "webclient/websocket"
 
     def get_client_session(self):
@@ -167,7 +167,7 @@ class WebSocketClient(WebSocketServerProtocol, Session):
         """
         Data User > Evennia.
 
-        Args::
+        Args:
             text (str): Incoming text.
             kwargs (any): Options from protocol.
 

evennia/server/server.py

@@ -72,6 +72,7 @@ GUEST_ENABLED = settings.GUEST_ENABLED
 WEBSERVER_ENABLED = settings.WEBSERVER_ENABLED and WEBSERVER_PORTS and WEBSERVER_INTERFACES
 IRC_ENABLED = settings.IRC_ENABLED
 RSS_ENABLED = settings.RSS_ENABLED
+GRAPEWINE_ENABLED = settings.GRAPEWINE_ENABLED
 WEBCLIENT_ENABLED = settings.WEBCLIENT_ENABLED
 
 INFO_DICT = {"servername": SERVERNAME, "version": VERSION,
@@ -583,6 +584,10 @@ if RSS_ENABLED:
     # RSS feed channel connections
     ENABLED.append('rss')
 
+if GRAPEWINE_ENABLED:
+    # Grapewine channel connections
+    ENABLED.append('grapewine')
+
 if ENABLED:
     INFO_DICT["irc_rss"] = ", ".join(ENABLED) + " enabled."