/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-04-16 01:15:14 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090416011514-jr7gwcqbf0s422i3
* mandos (main): Use builtin "set" type instead of "sets.Set".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
49
49
import re
50
50
import os
51
51
import signal
52
 
from sets import Set
53
52
import subprocess
54
53
import atexit
55
54
import stat
883
882
        interface:      None or a network interface name (string)
884
883
        use_ipv6:       Boolean; to use IPv6 or not
885
884
        ----
886
 
        clients:        Set() of Client objects
 
885
        clients:        set of Client objects
887
886
        gnutls_priority GnuTLS priority string
888
887
        use_dbus:       Boolean; to emit D-Bus signals or not
889
888
    """
1231
1230
    global mandos_dbus_service
1232
1231
    mandos_dbus_service = None
1233
1232
    
1234
 
    clients = Set()
 
1233
    clients = set()
1235
1234
    tcp_server = IPv6_TCPServer((server_settings[u"address"],
1236
1235
                                 server_settings[u"port"]),
1237
1236
                                ClientHandler,
1308
1307
    client_class = Client
1309
1308
    if use_dbus:
1310
1309
        client_class = ClientDBus
1311
 
    clients.update(Set(
 
1310
    clients.update(set(
1312
1311
            client_class(name = section,
1313
1312
                         config= dict(client_config.items(section)))
1314
1313
            for section in client_config.sections()))