Permalink
Browse files

Do not import Products.kupu. Fixes https://dev.plone.org/ticket/13480

  • Loading branch information...
1 parent 66d5d4f commit 676f43c9c9c56eb686e20a5d0c7319540e7bab3f @danjacka danjacka committed Mar 13, 2013
Showing with 5 additions and 3 deletions.
  1. +3 −0 CHANGES.txt
  2. +2 −3 plone/app/upgrade/__init__.py
View
@@ -7,6 +7,9 @@ Changelog
- Add basic upgrade infrastructure for the Plone 4.4 series.
[davisagli]
+- Do not import Products.kupu. Fixes https://dev.plone.org/ticket/13480
+ [danjacka]
+
1.3rc1 (2013-03-05)
-------------------
@@ -1,3 +1,4 @@
+import pkg_resources
import sys
from zope.interface import implements
from zope.interface.interface import InterfaceClass
@@ -40,8 +41,6 @@ def getNonInstallableProducts(self):
import zope.ramcache.ram
alias_module('zope.app.cache.ram', zope.ramcache.ram)
-try:
- import Products.kupu
-except ImportError:
+if 'products.kupu' not in pkg_resources.working_set.by_key:
import kupu_bbb
alias_module('Products.kupu.plone.plonelibrarytool', kupu_bbb)

0 comments on commit 676f43c

Please sign in to comment.