Fix compatibility with Django 1.6.

1 files changed, 18 insertions, 0 deletions

diff --git a/src/lib/Bcfg2/Reporting/Compat.py b/src/lib/Bcfg2/Reporting/Compat.py
new file mode 100644
index 000000000..d8f439e22
--- /dev/null
+++ b/src/lib/Bcfg2/Reporting/Compat.py
@@ -0,0 +1,18 @@
+""" Compatibility imports for Django. """
+
+from django import VERSION
+from django.db import transaction
+
+# Django 1.6 deprecated commit_on_success() and introduced atomic() with
+# similar semantics.
+if VERSION[0] == 1 and VERSION[1] < 6:
+    transaction.atomic = transaction.commit_on_success
+
+try:
+    # Django < 1.6
+    from django.conf.urls import defaults
+    django_urls = defaults
+except:
+    # Django > 1.6
+    from django.conf import urls
+    django_urls = urls