From 25576cd076d66dfed4bbd98ce1bbb3bc86a6230e Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Tue, 26 Apr 2011 12:13:04 -0500
Subject: Reports: Add full PY3K compatibility

Note that Django still doesn't yet support version 3 so this won't
necessarily work until there is a compatible version of django available
for use.

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 src/lib/Server/Reports/importscript.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/lib/Server/Reports/importscript.py')

diff --git a/src/lib/Server/Reports/importscript.py b/src/lib/Server/Reports/importscript.py
index 86e176394..0766ffa94 100755
--- a/src/lib/Server/Reports/importscript.py
+++ b/src/lib/Server/Reports/importscript.py
@@ -10,7 +10,8 @@ import os
 import sys
 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)
 
@@ -29,11 +30,13 @@ from datetime import datetime
 from time import strptime
 from django.db import connection
 from Bcfg2.Server.Reports.updatefix import update_database
-import ConfigParser
 import logging
 import Bcfg2.Logger
 import platform
 
+# Compatibility imports
+from py3kcompat import ConfigParser
+
 
 def build_reason_kwargs(r_ent):
     binary_file = False
@@ -140,7 +143,8 @@ def load_stats(cdata, sdata, vlevel, logger, quick=False, location=''):
                             rr.save()
                             if vlevel > 0:
                                 logger.info("Created reason: %s" % rr.id)
-                    except Exception, ex:
+                    except Exception:
+                        ex = sys.exc_info()[1]
                         logger.error("Failed to create reason for %s: %s" % (x.get('name'), ex))
                         rr = Reason(current_exists=x.get('current_exists',
                                                          default="True").capitalize() == "True")
@@ -213,7 +217,8 @@ if __name__ == '__main__':
                                                      "stats=",
                                                      "config=",
                                                      "syslog"])
-    except GetoptError, mesg:
+    except GetoptError:
+        mesg = sys.exc_info()[1]
         # print help information and exit:
         print("%s\nUsage:\nimportscript.py [-h] [-v] [-u] [-d] [-S] [-C bcfg2 config file] [-c clients-file] [-s statistics-file]" % (mesg))
         raise SystemExit(2)
-- 
cgit v1.2.3-1-g7c22