From b7479fa7dc6d87135fb328dbf9ba4bcd81a5db53 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Mon, 11 Nov 2013 21:36:50 +0100
Subject: Fix compatibility with Django 1.6.

---
 src/lib/Bcfg2/Reporting/Compat.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 src/lib/Bcfg2/Reporting/Compat.py

(limited to 'src/lib/Bcfg2/Reporting/Compat.py')

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
-- 
cgit v1.2.3-1-g7c22