diff --git a/vendor/python-munin/bin/munin-node.py b/vendor/python-munin/bin/munin-node.py
index 34efcd2fa..4f7afde5c 100755
--- a/vendor/python-munin/bin/munin-node.py
+++ b/vendor/python-munin/bin/munin-node.py
@@ -2,7 +2,7 @@
 
 import os
 import socket
-import SocketServer
+import socketserver
 import sys
 import threading
 import time
@@ -29,13 +29,13 @@ def execute_plugin(path, cmd=""):
 
 if os.name == 'posix':
     def become_daemon(our_home_dir='.', out_log='/dev/null',
-                      err_log='/dev/null', umask=022):
+                      err_log='/dev/null', umask=0o22):
         "Robustly turn into a UNIX daemon, running in our_home_dir."
         # First fork
         try:
             if os.fork() > 0:
                 sys.exit(0)     # kill off parent
-        except OSError, e:
+        except OSError as e:
             sys.stderr.write("fork #1 failed: (%d) %s\n" % (e.errno, e.strerror))
             sys.exit(1)
         os.setsid()
@@ -46,7 +46,7 @@ if os.name == 'posix':
         try:
             if os.fork() > 0:
                 os._exit(0)
-        except OSError, e:
+        except OSError as e:
             sys.stderr.write("fork #2 failed: (%d) %s\n" % (e.errno, e.strerror))
             os._exit(1)
 
@@ -59,7 +59,7 @@ if os.name == 'posix':
         # Set custom file descriptors so that they get proper buffering.
         sys.stdout, sys.stderr = so, se
 else:
-    def become_daemon(our_home_dir='.', out_log=None, err_log=None, umask=022):
+    def become_daemon(our_home_dir='.', out_log=None, err_log=None, umask=0o22):
         """
         If we're not running under a POSIX system, just simulate the daemon
         mode by doing redirections and directory changing.
@@ -83,7 +83,7 @@ else:
         def write(self, s):
             pass
 
-class MuninRequestHandler(SocketServer.StreamRequestHandler):
+class MuninRequestHandler(socketserver.StreamRequestHandler):
     def handle(self):
         # self.rfile is a file-like object created by the handler;
         # we can now use e.g. readline() instead of raw recv() calls
@@ -129,7 +129,7 @@ class MuninRequestHandler(SocketServer.StreamRequestHandler):
                 self.wfile.write("# Unknown command. Try list, nodes, config, fetch, version or quit\n")
 
 
-class MuninServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer):
+class MuninServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
     pass
 
 if __name__ == "__main__":
diff --git a/vendor/python-munin/docs/conf.py b/vendor/python-munin/docs/conf.py
index 04814012c..24f55793b 100755
--- a/vendor/python-munin/docs/conf.py
+++ b/vendor/python-munin/docs/conf.py
@@ -43,8 +43,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'python-munin'
-copyright = u'2009, Samuel Stauffer'
+project = 'python-munin'
+copyright = '2009, Samuel Stauffer'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -178,8 +178,8 @@ htmlhelp_basename = 'python-munindoc'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'python-munin.tex', u'python-munin Documentation',
-   u'Samuel Stauffer', 'manual'),
+  ('index', 'python-munin.tex', 'python-munin Documentation',
+   'Samuel Stauffer', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of