Merge branch 'py3k'

11 files changed, 61 insertions, 31 deletions

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)