Merge branch 'bcfg2-1.3.5-python2.4-compat' of https://github.com/fennm/bcfg2 into maint

3 files changed, 7 insertions, 6 deletions

diff --git a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
index 0bb3111ae..98226dc4e 100644
--- a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
+++ b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
@@ -367,10 +367,11 @@ class DjangoORM(StorageBase):
         """Import the data into the backend"""
 
         try:
-            self._import_interaction(interaction)
-        except:
-            self.logger.error("Failed to import interaction: %s" %
-                    traceback.format_exc().splitlines()[-1])
+            try:
+                self._import_interaction(interaction)
+            except:
+                self.logger.error("Failed to import interaction: %s" %
+                        traceback.format_exc().splitlines()[-1])
         finally:
             self.logger.debug("%s: Closing database connection" %
                               self.__class__.__name__)
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 44ba0fee8..f60b68f45 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -78,7 +78,7 @@ def close_db_connection(func):
         if self._database_available:  # pylint: disable=W0212
             from django import db
             self.logger.debug("%s: Closing database connection" %
-                              threading.current_thread().name)
+                              threading.current_thread().getName())
             db.close_connection()
         return rv
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py
index 48be1ac26..5d846b4bb 100644
--- a/src/lib/Bcfg2/Server/Plugins/Probes.py
+++ b/src/lib/Bcfg2/Server/Plugins/Probes.py
@@ -9,7 +9,7 @@ import operator
 import lxml.etree
 import Bcfg2.Server
 import Bcfg2.Server.Plugin
-from Bcfg2.Compat import unicode  # pylint: disable=W0622
+from Bcfg2.Compat import any, unicode  # pylint: disable=W0622
 
 try:
     from django.db import models