Merged wiki.compat into wiki.core.compat

wiki/compat.py

-from django.db import transaction
-
-# Django 1.6 transaction API, required for 1.8+
-
-def nop_decorator(func):
-    return func
-
-# Where these are used in code, both old and new methods for transactions appear
-# to be used, but only one will actually do anything. When only Django 1.8+
-# is supported, transaction_commit_on_success can be deleted.
-try:
-    atomic = transaction.atomic # Does it exist?
-    transaction_commit_on_success = nop_decorator
-except AttributeError:
-    atomic = nop_decorator
-    transaction_commit_on_success = transaction.commit_on_success

wiki/core/compat.py

 """Abstraction layer to deal with Django related changes in order to keep
 compatibility with several Django versions simultaneously."""
 from django import VERSION as DJANGO_VERSION
+from django.db import transaction
 from django.conf import settings as django_settings
+
     
 # Django 1.5+
 if DJANGO_VERSION >= (1,5):
@@ -17,3 +19,18 @@ def get_user_model():
     else:
         from django.contrib.auth.models import User
         return User
+
+
+# Django 1.6 transaction API, required for 1.8+
+def nop_decorator(func):
+    return func
+
+# Where these are used in code, both old and new methods for transactions appear
+# to be used, but only one will actually do anything. When only Django 1.8+
+# is supported, transaction_commit_on_success can be deleted.
+try:
+    atomic = transaction.atomic # Does it exist?
+    transaction_commit_on_success = nop_decorator
+except AttributeError:
+    atomic = nop_decorator
+    transaction_commit_on_success = transaction.commit_on_success

wiki/models/urlpath.py

@@ -15,8 +15,8 @@ from mptt.fields import TreeForeignKey
 from mptt.models import MPTTModel
 
 from wiki import managers
-from wiki.compat import atomic, transaction_commit_on_success
 from wiki.conf import settings
+from wiki.core.compat import atomic, transaction_commit_on_success
 from wiki.core.exceptions import NoRootURL, MultipleRootURLs
 from wiki.models.article import ArticleRevision, ArticleForObject, Article