Merge pull request #34 from centralniak/feature/djangocms350-compat

fix import issue
piotrkilczuk · Feb 6, 2018 · 0092bca · 0092bca
2 parents a9709a6 + 312d6fd
commit 0092bca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/cmsplugin_gallery/models.py b/cmsplugin_gallery/models.py
@@ -3,7 +3,12 @@
 import threading
 
 from cms.models import CMSPlugin
-from cms.utils import get_cms_setting
+
+try:
+    from cms.utils import get_cms_setting
+except ImportError:
+    from cms.utils.conf import get_cms_setting
+
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from inline_ordering.models import Orderable

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='cmsplugin_gallery',
-    version='0.6.11',
+    version='0.6.12',
     author='Piotr Kilczuk',
     author_email='[email protected]',
     url='http://github.com/centralniak',