Enhancements to python-discuss from the pergamon project

discuss/client.py

@@ -43,7 +43,7 @@ def autoreconnect(self, *args, **kwargs):
 class Client(object):
     """Discuss client."""
 
-    def __init__(self, server, port = 2100, auth = True, timeout = None):
+    def __init__(self, server, port = 2100, auth = True, timeout = None, RPCClient=RPCClient):
         self.rpc = RPCClient(server, port, auth, timeout)
         if auth and self.who_am_i().startswith("???@"):
             raise ProtocolError("Authentication to server failed")
@@ -65,6 +65,17 @@ def who_am_i(self):
         reply = self.rpc.request(request)
         return reply.read_string()
 
+    @autoreconnects
+    def create_mtg(self, location, long_mtg_name, public):
+        request = USPBlock(constants.CREATE_MTG)
+        request.put_string(location)
+        request.put_string(long_mtg_name)
+        request.put_boolean(public)
+        reply = self.rpc.request(request)
+        result = reply.read_long_integer()
+        if result != 0:
+            raise DiscussError(result)
+
     def close(self):
         """Disconnect from the server."""
 
@@ -300,6 +311,15 @@ def set_access(self, principal, modes):
         if result != 0:
             raise DiscussError(result)
 
+    def ensure_access(self, principal, modes):
+        current = self.get_access(principal)
+        self.set_access(principal, current+modes)
+
+    def remove_access(self, principal, modes):
+        current = self.get_access(principal)
+        new_modes = ''.join(c for c in current if not c in modes)
+        self.set_access(principal, new_modes)
+
     @autoreconnects
     def undelete_transaction(self, trn_number):
         """Undelete the transaction by its number."""

discuss/rpc.py

@@ -42,8 +42,10 @@
 #
 
 import errno
+import fcntl
 import socket
 from struct import pack, unpack, calcsize
+import subprocess
 from functools import partial
 
 from . import constants
@@ -314,3 +316,22 @@ def request(self, block):
             raise ProtocolError("Transport-level error")
         return reply
 
+class RPCLocalClient(RPCClient):
+    # Args are for compatibility with the remote RPC; most aren't used
+    def __init__(self, server, port, auth, timeout):
+        # Used as the id field on meeting objects, so copy it in
+        self.server = server
+        # port 2100 is the default port -> use the binary
+        if port == 2100:
+            port = '/usr/sbin/disserve'
+        self.cmd = port
+
+        self.connect()
+        self.make_wrapper()
+
+    def connect(self):
+        pair = socket.socketpair(socket.AF_UNIX, socket.SOCK_STREAM)
+        subprocess.Popen([self.cmd], stdin=pair[1], close_fds=True)
+        pair[1].close()
+        fcntl.fcntl(pair[0].fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC)
+        self.socket = pair[0]