[Checkins] SVN: Products.CMF Prefer imports from newly-blessed location.
Tres Seaver
tseaver at palladion.com
Wed Mar 31 11:19:07 EDT 2010
Log message for revision 110362:
Prefer imports from newly-blessed location.
Changed:
U Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/utils.py
-=-
Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py 2010-03-31 15:18:17 UTC (rev 110361)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py 2010-03-31 15:19:06 UTC (rev 110362)
@@ -17,7 +17,10 @@
import unittest
from Testing import ZopeTestCase
-from Products.Five.schema import Zope2VocabularyRegistry
+try:
+ from Zope2.App.schema import Zope2VocabularyRegistry
+except ImportError: # Zope2 <= 2.12
+ from Products.Five.schema import Zope2VocabularyRegistry
from Products.CMFCalendar.testing import FunctionalLayer
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/utils.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/utils.py 2010-03-31 15:18:17 UTC (rev 110361)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/utils.py 2010-03-31 15:19:06 UTC (rev 110362)
@@ -15,7 +15,10 @@
$Id$
"""
-from Products.Five.schema import Zope2VocabularyRegistry
+try:
+ from Zope2.App.schema import Zope2VocabularyRegistry
+except ImportError: # Zope2 <= 2.12
+ from Products.Five.schema import Zope2VocabularyRegistry
def setupVocabulary(testcase):
More information about the checkins
mailing list