From e5752e394ffca60a9926eaf655d32dc2a77c8465 Mon Sep 17 00:00:00 2001
From: Patrick Lauber <patrick.lauber@divio.ch>
Date: Tue, 7 Jul 2009 23:21:05 +0200
Subject: [PATCH] reversions fixed

---
 cms/plugin_pool.py  |  5 ++---
 example/settings.py | 34 +++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/cms/plugin_pool.py b/cms/plugin_pool.py
index f6b19aae34e..e81dfd34a29 100644
--- a/cms/plugin_pool.py
+++ b/cms/plugin_pool.py
@@ -3,6 +3,7 @@
 from cms import settings as cms_settings
 from cms.plugin_base import CMSPluginBase
 
+
 class PluginPool(object):
     def __init__(self):
         self.plugins = {}
@@ -25,11 +26,9 @@ def register_plugin(self, plugin):
         
         if 'reversion' in settings.INSTALLED_APPS:   
             import reversion
-            import reversion.registration
-            import reversion.revisions  
             try:   
                 reversion.register(plugin.model, follow=["cmsplugin_ptr"])
-            except reversion.revisions.RegistrationError, reversion.registration.RegistrationError:
+            except reversion.revisions.RegistrationError:
                 pass
     
     def get_all_plugins(self, placeholder=None):
diff --git a/example/settings.py b/example/settings.py
index 0f01df0008d..2b4ea1b1fe9 100644
--- a/example/settings.py
+++ b/example/settings.py
@@ -146,23 +146,23 @@
     ('sampleapp.urlstwo', 'Second sample application'),
 )
 
-CMS_PLACEHOLDER_CONF = {                        
-    'right-column': {
-        "plugins": ('FilePlugin','FlashPlugin','LinkPlugin','PicturePlugin','TextPlugin', 'SnippetsPlugin'),
-        "extra_context": {"theme":"16_16"},
-        "name":gettext("right column")
-    },
-    
-    'body': {
-        "extra_context": {"theme":"16_5"},
-        "name":gettext("body"),
-    },
-    'fancy-content': {
-        "plugins": ('TextPlugin', 'LinkPlugin'),
-        "extra_context": {"theme":"16_11"},
-        "name":gettext("fancy content"),
-    },
-}
+#CMS_PLACEHOLDER_CONF = {                        
+#    'right-column': {
+#        "plugins": ('FilePlugin','FlashPlugin','LinkPlugin','PicturePlugin','TextPlugin', 'SnippetsPlugin'),
+#        "extra_context": {"theme":"16_16"},
+#        "name":gettext("right column")
+#    },
+#    
+#    'body': {
+#        "extra_context": {"theme":"16_5"},
+#        "name":gettext("body"),
+#    },
+#    'fancy-content': {
+#        "plugins": ('TextPlugin', 'LinkPlugin'),
+#        "extra_context": {"theme":"16_11"},
+#        "name":gettext("fancy content"),
+#    },
+#}
 
 
 CMS_NAVIGATION_EXTENDERS = (('example.categories.navigation.get_nodes', 'Categories'),)