/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: 2011-02-27 17:14:48 UTC
  • mfrom: (463.1.10 mandos-python26)
  • Revision ID: teddy@fukt.bsnet.se-20110227171448-cz13rrjix02t4l8b
Merge from Python 2.6 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
31
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
# 
33
33
 
34
 
from __future__ import division, absolute_import, unicode_literals
 
34
from __future__ import (division, absolute_import, print_function,
 
35
                        unicode_literals)
35
36
 
36
37
import SocketServer as socketserver
37
38
import socket
87
88
logger = logging.Logger('mandos')
88
89
syslogger = (logging.handlers.SysLogHandler
89
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
90
 
              address = "/dev/log"))
 
91
              address = str("/dev/log")))
91
92
syslogger.setFormatter(logging.Formatter
92
93
                       ('Mandos [%(process)d]: %(levelname)s:'
93
94
                        ' %(message)s'))
1408
1409
 
1409
1410
    def add_pipe(self, parent_pipe):
1410
1411
        """Dummy function; override as necessary"""
1411
 
        pass
 
1412
        raise NotImplementedError
1412
1413
 
1413
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1414
1415
                     socketserver.TCPServer, object):
1613
1614
            else:
1614
1615
                raise ValueError("Unknown suffix %r" % suffix)
1615
1616
        except (ValueError, IndexError), e:
1616
 
            raise ValueError(e.message)
 
1617
            raise ValueError(*(e.args))
1617
1618
        timevalue += delta
1618
1619
    return timevalue
1619
1620
 
2037
2038
        sys.exit(1)
2038
2039
    except KeyboardInterrupt:
2039
2040
        if debug:
2040
 
            print >> sys.stderr
 
2041
            print("", file=sys.stderr)
2041
2042
        logger.debug("Server received KeyboardInterrupt")
2042
2043
    logger.debug("Server exiting")
2043
2044
    # Must run before the D-Bus bus name gets deregistered