Merge branch 'py3k'

19 files changed, 176 insertions, 137 deletions

diff --git a/src/lib/Bcfg2Py3Incompat.py b/src/lib/Bcfg2Py3Incompat.py
new file mode 100644
index 000000000..6b66e72b0
--- /dev/null
+++ b/src/lib/Bcfg2Py3Incompat.py
@@ -0,0 +1,2 @@
+def fprint(s, f):
+    print(s, file=f)
diff --git a/src/lib/Bcfg2Py3k.py b/src/lib/Bcfg2Py3k.py
index 0f5321a41..c9e48a49b 100644
--- a/src/lib/Bcfg2Py3k.py
+++ b/src/lib/Bcfg2Py3k.py
@@ -1,3 +1,5 @@
+import sys
+
 try:
     from email.Utils import formatdate
 except ImportError:
@@ -5,7 +7,7 @@ except ImportError:
 
 # urllib imports
 try:
-    from urlparse import urljoin
+    from urlparse import urljoin, urlparse
     from urllib2 import HTTPBasicAuthHandler
     from urllib2 import HTTPPasswordMgrWithDefaultRealm
     from urllib2 import build_opener
@@ -13,7 +15,7 @@ try:
     from urllib import urlopen
     from urllib2 import HTTPError
 except ImportError:
-    from urllib.parse import urljoin
+    from urllib.parse import urljoin, urlparse
     from urllib.request import HTTPBasicAuthHandler
     from urllib.request import HTTPPasswordMgrWithDefaultRealm
     from urllib.request import build_opener
@@ -37,10 +39,43 @@ except ImportError:
     import pickle as cPickle
 
 try:
-    from Queue import Queue
-    from Queue import Empty
-    from Queue import Full
+    from Queue import Queue, Empty, Full
+except ImportError:
+    from queue import Queue, Empty, Full
+
+# xmlrpc imports
+try:
+    import xmlrpclib, SimpleXMLRPCServer
+except ImportError:
+    import xmlrpc.client as xmlrpclib
+    import xmlrpc.server as SimpleXMLRPCServer
+
+# socketserver import
+try:
+    import SocketServer
+except ImportError:
+    import socketserver as SocketServer
+
+# httplib imports
+try:
+    import httplib
 except ImportError:
-    from queue import Queue
-    from queue import Empty
-    from queue import Full
+    import http.client as httplib
+
+# print to file compatibility
+def u_str(string):
+    if sys.hexversion >= 0x03000000:
+        return string
+    else:
+        return unicode(string)
+
+"""
+In order to use the new syntax for printing to a file, we need to do
+a conditional import because there is a syntax incompatibility between
+the two versions of python.
+"""
+if sys.hexversion >= 0x03000000:
+    from Bcfg2.Bcfg2Py3Incompat import fprint
+else:
+    def fprint(s, f):
+        print >> f, s
diff --git a/src/lib/Client/Tools/__init__.py b/src/lib/Client/Tools/__init__.py
index 6a934fe52..88609c2f6 100644
--- a/src/lib/Client/Tools/__init__.py
+++ b/src/lib/Client/Tools/__init__.py
@@ -4,9 +4,9 @@ import warnings
 warnings.filterwarnings("ignore", "The popen2 module is deprecated.*",
                         DeprecationWarning)
 import os
-import popen2
 import stat
 import sys
+from subprocess import Popen, PIPE
 import time
 
 import Bcfg2.Client.XML
@@ -25,26 +25,6 @@ class toolInstantiationError(Exception):
     pass
 
 
-class readonlypipe(popen2.Popen4):
-    """This pipe sets up stdin --> /dev/null."""
-
-    def __init__(self, cmd, bufsize=-1):
-        popen2._cleanup()
-        c2pread, c2pwrite = os.pipe()
-        null = open('/dev/null', 'w+')
-        self.pid = os.fork()
-        if self.pid == 0:
-            # Child
-            os.dup2(null.fileno(), sys.__stdin__.fileno())
-            #os.dup2(p2cread, 0)
-            os.dup2(c2pwrite, 1)
-            os.dup2(c2pwrite, 2)
-            self._run_child(cmd)
-        os.close(c2pwrite)
-        self.fromchild = os.fdopen(c2pread, 'r', bufsize)
-        popen2._active.append(self)
-
-
 class executor:
     """This class runs stuff for us"""
 
@@ -53,30 +33,12 @@ class executor:
 
     def run(self, command):
         """Run a command in a pipe dealing with stdout buffer overloads."""
-        self.logger.debug('> %s' % command)
-
-        runpipe = readonlypipe(command, bufsize=16384)
-        output = []
-        try:  # macosx doesn't like this
-            runpipe.fromchild.flush()
-        except IOError:
-            pass
-        line = runpipe.fromchild.readline()
-        cmdstat = -1
-        while cmdstat == -1:
-            while line:
-                if len(line) > 0:
-                    self.logger.debug('< %s' % line[:-1])
-                    output.append(line[:-1])
-                line = runpipe.fromchild.readline()
-            time.sleep(0.1)
-            cmdstat = runpipe.poll()
-        output += [line[:-1] for line in runpipe.fromchild.readlines() \
-                   if line]
-        # The exit code from the program is in the upper byte of the
-        # value returned by cmdstat. Shift it down for tools looking at
-        # the value.
-        return ((cmdstat >> 8), output)
+        p = Popen(command, shell=True, bufsize=16384,
+                  stdin=PIPE, stdout=PIPE, close_fds=True)
+        output = p.communicate()[0]
+        for line in output.splitlines():
+            self.logger.debug('< %s' % line)
+        return (p.returncode, output.splitlines())
 
 
 class Tool:
diff --git a/src/lib/Component.py b/src/lib/Component.py
index 33b1c9289..88dce906e 100644
--- a/src/lib/Component.py
+++ b/src/lib/Component.py
@@ -11,12 +11,12 @@ import pydoc
 import sys
 import time
 import threading
-import urlparse
-import xmlrpclib
 
 import Bcfg2.Logger
 from Bcfg2.Statistics import Statistics
 from Bcfg2.SSLServer import XMLRPCServer
+# Compatibility import
+from Bcfg2.Bcfg2Py3k import xmlrpclib, urlparse, fprint
 
 logger = logging.getLogger()
 
@@ -56,11 +56,11 @@ def run_component(component_cls, location, daemon, pidfile_name, to_file,
         os.chdir(os.sep)
 
         pidfile = open(pidfile_name or "/dev/null", "w")
-        print >> pidfile, os.getpid()
+        fprint(os.getpid(), pidfile)
         pidfile.close()
 
     component = component_cls(cfile=cfile, **cls_kwargs)
-    up = urlparse.urlparse(location)
+    up = urlparse(location)
     port = tuple(up[1].split(':'))
     port = (port[0], int(port[1]))
     try:
@@ -153,30 +153,31 @@ class Component (object):
         automatic == True.
 
         """
-        for name, func in inspect.getmembers(self, callable):
-            if getattr(func, "automatic", False):
-                need_to_lock = not getattr(func, 'locking', False)
-                if (time.time() - func.automatic_ts) > \
-                   func.automatic_period:
-                    if need_to_lock:
-                        t1 = time.time()
-                        self.lock.acquire()
-                        t2 = time.time()
-                        self.instance_statistics.add_value('component_lock', t2-t1)
-                    try:
-                        mt1 = time.time()
+        for name, func in inspect.getmembers(self):
+            if name == '__call__':
+                if getattr(func, "automatic", False):
+                    need_to_lock = not getattr(func, 'locking', False)
+                    if (time.time() - func.automatic_ts) > \
+                       func.automatic_period:
+                        if need_to_lock:
+                            t1 = time.time()
+                            self.lock.acquire()
+                            t2 = time.time()
+                            self.instance_statistics.add_value('component_lock', t2-t1)
                         try:
-                            func()
-                        except:
-                            self.logger.error("Automatic method %s failed" \
-                                              % (name), exc_info=1)
-                    finally:
-                        mt2 = time.time()
-
-                    if need_to_lock:
-                        self.lock.release()
-                    self.instance_statistics.add_value(name, mt2-mt1)
-                    func.__dict__['automatic_ts'] = time.time()
+                            mt1 = time.time()
+                            try:
+                                func()
+                            except:
+                                self.logger.error("Automatic method %s failed" \
+                                                  % (name), exc_info=1)
+                        finally:
+                            mt2 = time.time()
+
+                        if need_to_lock:
+                            self.lock.release()
+                        self.instance_statistics.add_value(name, mt2-mt1)
+                        func.__dict__['automatic_ts'] = time.time()
 
     def _resolve_exposed_method(self, method_name):
         """Resolve an exposed method.
@@ -209,7 +210,8 @@ class Component (object):
             except NoExposedMethod:
                 self.logger.error("Unknown method %s" % (method))
                 raise xmlrpclib.Fault(7, "Unknown method %s" % method)
-            except Exception, e:
+            except Exception:
+                e = sys.exc_info()[1]
                 if getattr(e, "log", True):
                     self.logger.error(e, exc_info=True)
                 raise xmlrpclib.Fault(getattr(e, "fault_code", 1), str(e))
@@ -233,7 +235,8 @@ class Component (object):
                 self.instance_statistics.add_value(method, method_done - method_start)
         except xmlrpclib.Fault:
             raise
-        except Exception, e:
+        except Exception:
+            e = sys.exc_info()[1]
             if getattr(e, "log", True):
                 self.logger.error(e, exc_info=True)
             raise xmlrpclib.Fault(getattr(e, "fault_code", 1), str(e))
diff --git a/src/lib/Logger.py b/src/lib/Logger.py
index ae73a6d41..b49a7069f 100644
--- a/src/lib/Logger.py
+++ b/src/lib/Logger.py
@@ -10,6 +10,8 @@ import socket
 import struct
 import sys
 import termios
+# Compatibility import
+from Bcfg2.Bcfg2Py3k import fprint
 
 logging.raiseExceptions = 0
 
@@ -116,7 +118,7 @@ class FragmentingSysLogHandler(logging.handlers.SysLogHandler):
     def emit(self, record):
         """Chunk and deliver records."""
         record.name = self.procname
-        if str(record.msg) > 250:
+        if len(record.msg) > 250:
             msgs = []
             error = record.exc_info
             record.exc_info = None
@@ -134,7 +136,7 @@ class FragmentingSysLogHandler(logging.handlers.SysLogHandler):
                                                                 newrec.levelname.lower()),
                                             self.format(newrec))
             try:
-                self.socket.send(msg)
+                self.socket.send(msg.encode('ascii'))
             except socket.error:
                 for i in range(10):
                     try:
@@ -229,7 +231,7 @@ def trace_process(**kwargs):
                 filename = filename[:-1]
             name = frame.f_globals["__name__"]
             line = linecache.getline(filename, lineno)
-            print >> log_file, "%s:%s: %s" % (name, lineno, line.rstrip())
+            fprint("%s:%s: %s" % (name, lineno, line.rstrip()), log_file)
         return traceit
 
     sys.settrace(traceit)
diff --git a/src/lib/Options.py b/src/lib/Options.py
index 1973e7091..d5304e696 100644
--- a/src/lib/Options.py
+++ b/src/lib/Options.py
@@ -1,11 +1,12 @@
 """Option parsing library for utilities."""
 __revision__ = '$Revision$'
 
-import ConfigParser
 import getopt
 import os
 import sys
 import Bcfg2.Client.Tools
+# Compatibility imports
+from Bcfg2.Bcfg2Py3k import ConfigParser
 
 def bool_cook(x):
     if x:
@@ -146,7 +147,8 @@ class OptionSet(dict):
             try:
                 opts, args = getopt.getopt(argv, self.buildGetopt(),
                                            self.buildLongGetopt())
-            except getopt.GetoptError, err:
+            except getopt.GetoptError:
+                err = sys.exc_info()[1]
                 self.helpExit(err)
             if '-h' in argv:
                 self.helpExit('', 0)
diff --git a/src/lib/Proxy.py b/src/lib/Proxy.py
index 8b3fcb87c..8a1ad683e 100644
--- a/src/lib/Proxy.py
+++ b/src/lib/Proxy.py
@@ -11,9 +11,6 @@ load_config -- read configuration files
 __revision__ = '$Revision: $'
 
 
-from xmlrpclib import _Method
-
-import httplib
 import logging
 import re
 import socket
@@ -25,7 +22,7 @@ import socket
 try:
     import ssl
     SSL_LIB = 'py26_ssl'
-except ImportError, e:
+except ImportError:
     from M2Crypto import SSL
     import M2Crypto.SSL.Checker
     SSL_LIB = 'm2crypto'
@@ -33,8 +30,9 @@ except ImportError, e:
 
 import sys
 import time
-import urlparse
-import xmlrpclib
+
+# Compatibility imports
+from Bcfg2.Bcfg2Py3k import httplib, xmlrpclib, urlparse
 
 version = sys.version_info[:2]
 has_py23 = version >= (2, 3)
@@ -51,7 +49,7 @@ class CertificateError(Exception):
         self.commonName = commonName
 
 
-class RetryMethod(_Method):
+class RetryMethod(xmlrpclib._Method):
     """Method with error handling and retries built in."""
     log = logging.getLogger('xmlrpc')
     max_retries = 4
@@ -59,21 +57,24 @@ class RetryMethod(_Method):
     def __call__(self, *args):
         for retry in range(self.max_retries):
             try:
-                return _Method.__call__(self, *args)
-            except xmlrpclib.ProtocolError, err:
+                return xmlrpclib._Method.__call__(self, *args)
+            except xmlrpclib.ProtocolError:
+                err = sys.exc_info()[1]
                 self.log.error("Server failure: Protocol Error: %s %s" % \
                               (err.errcode, err.errmsg))
                 raise xmlrpclib.Fault(20, "Server Failure")
             except xmlrpclib.Fault:
                 raise
-            except socket.error, err:
+            except socket.error:
+                err = sys.exc_info()[1]
                 if hasattr(err, 'errno') and err.errno == 336265218:
                     self.log.error("SSL Key error")
                     break
                 if retry == 3:
                     self.log.error("Server failure: %s" % err)
                     raise xmlrpclib.Fault(20, err)
-            except CertificateError, ce:
+            except CertificateError:
+                ce = sys.exc_info()[1]
                 self.log.error("Got unallowed commonName %s from server" \
                                % ce.commonName)
                 break
@@ -87,7 +88,7 @@ class RetryMethod(_Method):
         raise xmlrpclib.Fault(20, "Server Failure")
 
 # sorry jon
-xmlrpclib._Method = RetryMethod
+_Method = RetryMethod
 
 
 class SSLHTTPConnection(httplib.HTTPConnection):
@@ -242,7 +243,8 @@ class SSLHTTPConnection(httplib.HTTPConnection):
         try:
             self.sock.connect((hostname, self.port))
             # automatically checks cert matches host
-        except M2Crypto.SSL.Checker.WrongHost, wr:
+        except M2Crypto.SSL.Checker.WrongHost:
+            wr = sys.exc_info()[1]
             raise CertificateError(wr)
 
 
@@ -325,7 +327,7 @@ def ComponentProxy(url, user=None, password=None,
     """
 
     if user and password:
-        method, path = urlparse.urlparse(url)[:2]
+        method, path = urlparse(url)[:2]
         newurl = "%s://%s:%s@%s" % (method, user, password, path)
     else:
         newurl = url
diff --git a/src/lib/SSLServer.py b/src/lib/SSLServer.py
index 2395bb84f..a89beabbb 100644
--- a/src/lib/SSLServer.py
+++ b/src/lib/SSLServer.py
@@ -8,10 +8,7 @@ __all__ = [
 
 import os
 import sys
-import xmlrpclib
 import socket
-import SocketServer
-import SimpleXMLRPCServer
 import base64
 import select
 import signal
@@ -19,6 +16,8 @@ import logging
 import ssl
 import threading
 import time
+# Compatibility imports
+from Bcfg2.Bcfg2Py3k import xmlrpclib, SimpleXMLRPCServer, SocketServer
 
 
 class ForkedChild(Exception):
@@ -51,7 +50,8 @@ class XMLRPCDispatcher (SimpleXMLRPCServer.SimpleXMLRPCDispatcher):
             raw_response = xmlrpclib.dumps(response, methodresponse=1,
                                            allow_none=self.allow_none,
                                            encoding=self.encoding)
-        except xmlrpclib.Fault, fault:
+        except xmlrpclib.Fault:
+            fault = sys.exc_info()[1]
             raw_response = xmlrpclib.dumps(fault,
                                            allow_none=self.allow_none,
                                            encoding=self.encoding)
@@ -258,7 +258,8 @@ class XMLRPCRequestHandler (SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
                         # If we hit SSL3_WRITE_PENDING here try to resend.
                         self.wfile.write(response)
                         break
-                    except ssl.SSLError, e:
+                    except ssl.SSLError:
+                        e = sys.exc_info()[1]
                         if str(e).find("SSL3_WRITE_PENDING") < 0:
                             raise
                         self.logger.error("SSL3_WRITE_PENDING")
diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py
index 9771fd10b..e69412a5e 100644
--- a/src/lib/Server/Admin/Init.py
+++ b/src/lib/Server/Admin/Init.py
@@ -138,7 +138,7 @@ def create_key(hostname, keypath, certpath, country, state, location):
                                                                      keypath,
                                                                      certpath))
     subprocess.call((ccstr), shell=True)
-    os.chmod(keypath, stat.S_IRUSR|stat.S_IWUSR)  # 0600
+    os.chmod(keypath, stat.S_IRUSR | stat.S_IWUSR)  # 0600
 
 
 def create_conf(confpath, confdata):
@@ -156,8 +156,9 @@ def create_conf(confpath, confdata):
             return
     try:
         open(confpath, "w").write(confdata)
-        os.chmod(keypath, stat.S_IRUSR|stat.S_IWUSR)  # 0600
-    except Exception, e:
+        os.chmod(keypath, stat.S_IRUSR | stat.S_IWUSR)  # 0600
+    except Exception:
+        e = sys.exc_info()[1]
         print("Error %s occured while trying to write configuration "
               "file to '%s'.\n" %
                (e, confpath))
@@ -381,7 +382,8 @@ class Init(Bcfg2.Server.Admin.Mode):
                                         '', ["Bcfg2.Server.Plugins"])
                     cls = getattr(module, plugin)
                     cls.init_repo(self.repopath)
-                except Exception, e:
+                except Exception:
+                    e = sys.exc_info()[1]
                     print("Plugin setup for %s failed: %s\n"
                           "Check that dependencies are installed?" % (plugin, e))
 
diff --git a/src/lib/Server/Admin/Query.py b/src/lib/Server/Admin/Query.py
index 207b65035..9e1d7cc88 100644
--- a/src/lib/Server/Admin/Query.py
+++ b/src/lib/Server/Admin/Query.py
@@ -26,7 +26,8 @@ class Query(Bcfg2.Server.Admin.Mode):
             self.bcore = Bcfg2.Server.Core.Core(self.get_repo_path(),
                                                 ['Metadata', 'Probes'],
                                                 'foo', False, 'UTF-8')
-        except Bcfg2.Server.Core.CoreInitError, msg:
+        except Bcfg2.Server.Core.CoreInitError:
+            msg = sys.exc_info()[1]
             self.errExit("Core load failed because %s" % msg)
         self.bcore.fam.handle_events_in_interval(1)
         self.meta = self.bcore.metadata
diff --git a/src/lib/Server/Admin/Reports.py b/src/lib/Server/Admin/Reports.py
index ee3a4473f..942477a49 100644
--- a/src/lib/Server/Admin/Reports.py
+++ b/src/lib/Server/Admin/Reports.py
@@ -1,7 +1,6 @@
 '''Admin interface for dynamic reports'''
 import Bcfg2.Logger
 import Bcfg2.Server.Admin
-import ConfigParser
 import datetime
 import os
 import logging
@@ -14,6 +13,9 @@ from Bcfg2.Server.Reports.updatefix import update_database
 from Bcfg2.Server.Reports.utils import *
 from lxml.etree import XML, XMLSyntaxError
 
+# Compatibility import
+from Bcfg2.Bcfg2Py3k import ConfigParser
+
 # FIXME: Remove when server python dep is 2.5 or greater
 if sys.version_info >= (2, 5):
     from hashlib import md5
@@ -26,7 +28,8 @@ import django.core.management
 # FIXME - settings file uses a hardcoded path for /etc/bcfg2.conf
 try:
     import Bcfg2.Server.Reports.settings
-except Exception, e:
+except Exception:
+    e = sys.exc_info()[1]
     sys.stderr.write("Failed to load configuration settings. %s\n" % e)
     sys.exit(1)
 
@@ -185,7 +188,8 @@ class Reports(Bcfg2.Server.Admin.Mode):
         # Currently only reasons are a problem
         try:
             start_count = Reason.objects.count()
-        except Exception, e:
+        except Exception:
+            e = sys.exc_info()[1]
             self.log.error("Failed to load reason objects: %s" % e)
             return
         dup_reasons = []
@@ -216,7 +220,8 @@ class Reports(Bcfg2.Server.Admin.Mode):
             cursor.executemany('update reports_entries_interactions set reason_id=%s where reason_id=%s', batch_update)
             cursor.executemany('delete from reports_reason where id = %s', dup_reasons)
             transaction.set_dirty()
-        except Exception, ex:
+        except Exception:
+            ex = sys.exc_info()[1]
             self.log.error("Failed to delete reasons: %s" % ex)
             raise
 
diff --git a/src/lib/Server/Admin/Snapshots.py b/src/lib/Server/Admin/Snapshots.py
index d58873174..052545b61 100644
--- a/src/lib/Server/Admin/Snapshots.py
+++ b/src/lib/Server/Admin/Snapshots.py
@@ -8,6 +8,8 @@ import Bcfg2.Server.Snapshots
 import Bcfg2.Server.Snapshots.model
 from Bcfg2.Server.Snapshots.model import Snapshot, Client, Metadata, Base, \
      File, Group, Package, Service
+# Compatibility import
+from Bcfg2.Bcfg2Py3k import u_str
 
 class Snapshots(Bcfg2.Server.Admin.Mode):
     __shorthelp__ = "Interact with the Snapshots system"
@@ -71,7 +73,7 @@ class Snapshots(Bcfg2.Server.Admin.Mode):
             session.commit()
         elif args[0] == 'dump':
             client = args[1]
-            snap = Snapshot.get_current(self.session, unicode(client))
+            snap = Snapshot.get_current(self.session, u_str(client))
             if not snap:
                 print("Current snapshot for %s not found" % client)
                 sys.exit(1)
@@ -105,7 +107,7 @@ class Snapshots(Bcfg2.Server.Admin.Mode):
                     print("Usage: bcfg2-admin snapshots -b <client>")
                     return
                 client = args[2]
-                snap = Snapshot.get_current(self.session, unicode(client))
+                snap = Snapshot.get_current(self.session, u_str(client))
                 if not snap:
                     print("Current snapshot for %s not found" % client)
                     sys.exit(1)
@@ -128,7 +130,7 @@ class Snapshots(Bcfg2.Server.Admin.Mode):
             elif '-e' in args[1:]:
                 # Query a single host for extra entries
                 client = args[2]
-                snap = Snapshot.get_current(self.session, unicode(client))
+                snap = Snapshot.get_current(self.session, u_str(client))
                 if not snap:
                     print("Current snapshot for %s not found" % client)
                     sys.exit(1)
diff --git a/src/lib/Server/Admin/Viz.py b/src/lib/Server/Admin/Viz.py
index a77502b5d..f39e6d7a8 100644
--- a/src/lib/Server/Admin/Viz.py
+++ b/src/lib/Server/Admin/Viz.py
@@ -45,7 +45,8 @@ class Viz(Bcfg2.Server.Admin.MetadataCore):
             opts, args = getopt.getopt(args, 'Hbko:',
                                        ['includehosts', 'includebundles',
                                         'includekey', 'outfile='])
-        except getopt.GetoptError, msg:
+        except getopt.GetoptError:
+            msg = sys.exc_info()[1]
             print(msg)
 
         #FIXME: is this for --raw?
diff --git a/src/lib/Server/Admin/Xcmd.py b/src/lib/Server/Admin/Xcmd.py
index e761a5e3d..fd5794f88 100644
--- a/src/lib/Server/Admin/Xcmd.py
+++ b/src/lib/Server/Admin/Xcmd.py
@@ -1,10 +1,12 @@
 import sys
-import xmlrpclib
 
 import Bcfg2.Options
 import Bcfg2.Proxy
 import Bcfg2.Server.Admin
 
+# Compatibility import
+from Bcfg2.Bcfg2Py3k import xmlrpclib
+
 
 class Xcmd(Bcfg2.Server.Admin.Mode):
     __shorthelp__ = ("XML-RPC Command Interface")
@@ -39,7 +41,8 @@ class Xcmd(Bcfg2.Server.Admin.Mode):
             args = tuple(setup['args'][1:])
         try:
             data = getattr(proxy, cmd)(*args)
-        except xmlrpclib.Fault, flt:
+        except xmlrpclib.Fault:
+            flt = sys.exc_info()[1]
             if flt.faultCode == 7:
                 print("Unknown method %s" % cmd)
                 return
diff --git a/src/lib/Server/Admin/__init__.py b/src/lib/Server/Admin/__init__.py
index 411f909ee..8915492a3 100644
--- a/src/lib/Server/Admin/__init__.py
+++ b/src/lib/Server/Admin/__init__.py
@@ -19,13 +19,14 @@ __all__ = [
         'Xcmd'
         ]
 
-import ConfigParser
 import logging
 import lxml.etree
 import sys
 
 import Bcfg2.Server.Core
 import Bcfg2.Options
+# Compatibility import
+from Bcfg2.Bcfg2Py3k import ConfigParser
 
 
 class ModeOperationError(Exception):
@@ -126,7 +127,8 @@ class MetadataCore(Mode):
             self.bcore = Bcfg2.Server.Core.Core(self.get_repo_path(),
                                                 setup['plugins'],
                                                 'foo', 'UTF-8')
-        except Bcfg2.Server.Core.CoreInitError, msg:
+        except Bcfg2.Server.Core.CoreInitError:
+            msg = sys.exc_info()[1]
             self.errExit("Core load failed because %s" % msg)
         self.bcore.fam.handle_events_in_interval(5)
         self.metadata = self.bcore.metadata
diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py
index e82e05a89..ac0a51e23 100644
--- a/src/lib/Server/Core.py
+++ b/src/lib/Server/Core.py
@@ -5,14 +5,18 @@ import atexit
 import logging
 import lxml.etree
 import select
+import sys
 import threading
 import time
-import xmlrpclib
 
 from Bcfg2.Component import Component, exposed
 from Bcfg2.Server.Plugin import PluginInitError, PluginExecutionError
 import Bcfg2.Server.FileMonitor
 import Bcfg2.Server.Plugins.Metadata
+# Compatibility imports
+from Bcfg2.Bcfg2Py3k import xmlrpclib
+if sys.hexversion >= 0x03000000:
+    from functools import reduce
 
 logger = logging.getLogger('Bcfg2.Server.Core')
 
@@ -142,7 +146,7 @@ class Core(Component):
         try:
             mod = getattr(__import__("Bcfg2.Server.Plugins.%s" %
                                 (plugin)).Server.Plugins, plugin)
-        except ImportError, e:
+        except ImportError:
             try:
                 mod = __import__(plugin)
             except:
@@ -177,7 +181,8 @@ class Core(Component):
                         plugin.validate_structures(metadata, data)
                     elif base_cls == Bcfg2.Server.Plugin.GoalValidator:
                         plugin.validate_goals(metadata, data)
-                except Bcfg2.Server.Plugin.ValidationError, err:
+                except Bcfg2.Server.Plugin.ValidationError:
+                    err = sys.exc_info()[1]
                     logger.error("Plugin %s structure validation failed: %s" \
                                  % (plugin.name, err.message))
                     raise
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index 6351a9eb1..cd2b63656 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -18,6 +18,9 @@ import Bcfg2.Options
 # py3k compatibility
 if sys.hexversion >= 0x03000000:
     from functools import reduce
+    from io import FileIO as BUILTIN_FILE_TYPE
+else:
+    BUILTIN_FILE_TYPE = file
 from Bcfg2.Bcfg2Py3k import Queue
 from Bcfg2.Bcfg2Py3k import Empty
 from Bcfg2.Bcfg2Py3k import Full
@@ -346,7 +349,7 @@ class FileBacked(object):
         if event and event.code2str() not in ['exists', 'changed', 'created']:
             return
         try:
-            self.data = file(self.name).read()
+            self.data = BUILTIN_FILE_TYPE(self.name).read()
             self.Index()
         except IOError:
             logger.error("Failed to read file %s" % (self.name))
@@ -577,7 +580,7 @@ class XMLSrc(XMLFileBacked):
     def HandleEvent(self, _=None):
         """Read file upon update."""
         try:
-            data = file(self.name).read()
+            data = BUILTIN_FILE_TYPE(self.name).read()
         except IOError:
             logger.error("Failed to read file %s" % (self.name))
             return
diff --git a/src/lib/Server/Plugins/Packages.py b/src/lib/Server/Plugins/Packages.py
index 1178aadaa..19152074e 100644
--- a/src/lib/Server/Plugins/Packages.py
+++ b/src/lib/Server/Plugins/Packages.py
@@ -17,6 +17,12 @@ from Bcfg2.Bcfg2Py3k import install_opener
 from Bcfg2.Bcfg2Py3k import build_opener
 from Bcfg2.Bcfg2Py3k import urlopen
 
+# py3k compatibility
+if sys.hexversion >= 0x03000000:
+    from io import FileIO as BUILTIN_FILE_TYPE
+else:
+    BUILTIN_FILE_TYPE = file
+
 # FIXME: Remove when server python dep is 2.5 or greater
 if sys.version_info >= (2, 5):
     from hashlib import md5
@@ -177,7 +183,7 @@ class Source(object):
                 logger.error("Packages: Failed to fetch url %s. code=%s" \
                              % (url, h.code))
                 continue
-            file(fname, 'w').write(data)
+            BUILTIN_FILE_TYPE(fname, 'w').write(data)
 
     def applies(self, metadata):
         return len([g for g in self.basegroups if g in metadata.groups]) != 0 and \
@@ -231,13 +237,13 @@ class YUMSource(Source):
         self.file_to_arch = dict()
 
     def save_state(self):
-        cache = file(self.cachefile, 'wb')
+        cache = BUILTIN_FILE_TYPE(self.cachefile, 'wb')
         cPickle.dump((self.packages, self.deps, self.provides,
                       self.filemap, self.url_map), cache, 2)
         cache.close()
 
     def load_state(self):
-        data = file(self.cachefile)
+        data = BUILTIN_FILE_TYPE(self.cachefile)
         (self.packages, self.deps, self.provides, \
          self.filemap, self.url_map) = cPickle.load(data)
 
@@ -378,13 +384,13 @@ class APTSource(Source):
             'components': self.components, 'arches': self.arches, 'groups': self.groups}]
 
     def save_state(self):
-        cache = file(self.cachefile, 'wb')
+        cache = BUILTIN_FILE_TYPE(self.cachefile, 'wb')
         cPickle.dump((self.pkgnames, self.deps, self.provides),
                      cache, 2)
         cache.close()
 
     def load_state(self):
-        data = file(self.cachefile)
+        data = BUILTIN_FILE_TYPE(self.cachefile)
         self.pkgnames, self.deps, self.provides = cPickle.load(data)
 
     def filter_unknown(self, unknown):
@@ -423,7 +429,7 @@ class APTSource(Source):
                 print("Failed to read file %s" % fname)
                 raise
             for line in reader.readlines():
-                words = line.strip().split(':', 1)
+                words = line.strip().split(b':', 1)
                 if words[0] == 'Package':
                     pkgname = words[1].strip().rstrip()
                     self.pkgnames.add(pkgname)
@@ -500,13 +506,13 @@ class PACSource(Source):
             'components': self.components, 'arches': self.arches, 'groups': self.groups}]
 
     def save_state(self):
-        cache = file(self.cachefile, 'wb')
+        cache = BUILTIN_FILE_TYPE(self.cachefile, 'wb')
         cPickle.dump((self.pkgnames, self.deps, self.provides),
                      cache, 2)
         cache.close()
 
     def load_state(self):
-        data = file(self.cachefile)
+        data = BUILTIN_FILE_TYPE(self.cachefile)
         self.pkgnames, self.deps, self.provides = cPickle.load(data)
 
     def filter_unknown(self, unknown):
diff --git a/src/lib/Server/Plugins/TGenshi.py b/src/lib/Server/Plugins/TGenshi.py
index cd268e967..83b60c958 100644
--- a/src/lib/Server/Plugins/TGenshi.py
+++ b/src/lib/Server/Plugins/TGenshi.py
@@ -98,7 +98,7 @@ class TemplateFile:
                     entry.text = textdata
                 else:
                     if entry.get('encoding') == 'base64':
-			# take care of case where file needs base64 encoding
+                        # take care of case where file needs base64 encoding
                         entry.text = binascii.b2a_base64(textdata)
                     else:
                         entry.text = unicode(textdata, self.encoding)