=== modified file 'TODO'
--- TODO	2012-05-01 20:48:00 +0000
+++ TODO	2012-05-07 19:13:15 +0000
@@ -82,7 +82,7 @@
 ** TODO Secret Service API?
    http://standards.freedesktop.org/secret-service/
 ** TODO [[info:python:What's%20New%20in%20Python%202%206][What's New in Python 2.6]]
-*** Start at [[info:python:PEP%203101%20Advanced%20String%20Formatting][PEP 3101 Advanced String Formatting]]
+*** Continue at [[info:python:Porting%20to%20Python%202%206][Porting to Python 2 6]]
 
 * mandos.xml
 ** Add mandos contact info in manual pages

=== modified file 'mandos'
--- mandos	2012-05-06 17:37:23 +0000
+++ mandos	2012-05-07 19:13:15 +0000
@@ -34,6 +34,8 @@
 from __future__ import (division, absolute_import, print_function,
                         unicode_literals)
 
+from future_builtins import *
+
 import SocketServer as socketserver
 import socket
 import argparse
@@ -1864,8 +1866,7 @@
     def process_request(self, request, address):
         """Start a new process to process the request."""
         proc = multiprocessing.Process(target = self.sub_process_main,
-                                       args = (request,
-                                               address))
+                                       args = (request, address))
         proc.start()
         return proc
 

=== modified file 'mandos-ctl'
--- mandos-ctl	2012-05-05 09:33:27 +0000
+++ mandos-ctl	2012-05-07 19:13:15 +0000
@@ -26,6 +26,8 @@
 from __future__ import (division, absolute_import, print_function,
                         unicode_literals)
 
+from future_builtins import *
+
 import sys
 import dbus
 import argparse

=== modified file 'mandos-monitor'
--- mandos-monitor	2012-05-05 09:33:27 +0000
+++ mandos-monitor	2012-05-07 19:13:15 +0000
@@ -26,6 +26,8 @@
 from __future__ import (division, absolute_import, print_function,
                         unicode_literals)
 
+from future_builtins import *
+
 import sys
 import os
 import signal