[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - updated imports

Yvo Schubbe cvs-admin at zope.org
Mon Apr 2 05:26:34 UTC 2012 

Log message for revision 124861:
  - updated imports

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt
  UU  Products.CMFDefault/trunk/Products/CMFDefault/factory.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/tests/RegistrationTool.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/tests/test_DiscussionReply.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Image.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Portal.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/tests/test_join.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/upgrade/tests/test_syndication_upgrade.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/upgrade/tests/test_upgrade.py
  UU  Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt	2012-04-02 05:24:13 UTC (rev 124860)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt	2012-04-02 05:26:30 UTC (rev 124861)
@@ -3,7 +3,7 @@
 
 Set up site, method alias, user and Document.
 
-    >>> from zope.site.hooks import setSite
+    >>> from zope.component.hooks import setSite
     >>> setSite(app.site)
     >>> ti = app.site.portal_types.Document
     >>> dummy = ti.setMethodAliases({'gethtml': '@@source.html'})

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt	2012-04-02 05:24:13 UTC (rev 124860)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt	2012-04-02 05:26:30 UTC (rev 124861)
@@ -1,11 +1,11 @@
 Form Views
---------------
+----------
 
 Set up user.
 
     >>> uf = app.site.acl_users
     >>> _ignored = uf._doAddUser('mgr', 'mgrpw', ['Manager'], [])
-    >>> from zope.site.hooks import setSite
+    >>> from zope.component.hooks import setSite
     >>> setSite(app.site)
 
 Create the browser object we'll be using.

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt	2012-04-02 05:24:13 UTC (rev 124860)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt	2012-04-02 05:26:30 UTC (rev 124861)
@@ -3,7 +3,7 @@
 
 Set up site, content and user.
 
-    >>> from zope.site.hooks import setSite
+    >>> from zope.component.hooks import setSite
     >>> setSite(app.site)
 
     >>> from Products.CMFDefault.Document import Document

Modified: Products.CMFDefault/trunk/Products/CMFDefault/factory.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/factory.py	2012-04-02 05:24:13 UTC (rev 124860)
+++ Products.CMFDefault/trunk/Products/CMFDefault/factory.py	2012-04-02 05:26:30 UTC (rev 124861)
@@ -11,11 +11,10 @@
 #
 ##############################################################################
 """ Configured site factory implementation.
-
 """
 
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-from zope.site.hooks import setSite
+from zope.component.hooks import setSite
 
 from Products.CMFCore.interfaces import ISiteRoot
 from Products.CMFCore.utils import getToolByName


Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/factory.py
___________________________________________________________________
Deleted: svn:keywords
   - Author Date Id Revision

Modified: Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.txt	2012-04-02 05:24:13 UTC (rev 124860)
+++ Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.txt	2012-04-02 05:26:30 UTC (rev 124861)
@@ -3,7 +3,7 @@
 
 Set site and up user.
 
-    >>> from zope.site.hooks import setSite
+    >>> from zope.component.hooks import setSite
     >>> setSite(app.site)
     >>> uf = app.site.acl_users
     >>> _ignored = uf._doAddUser('mgr', 'mgrpw', ['Manager'], [])

Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/RegistrationTool.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/RegistrationTool.txt	2012-04-02 05:24:13 UTC (rev 124860)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/RegistrationTool.txt	2012-04-02 05:26:30 UTC (rev 124861)
@@ -31,8 +31,8 @@
 
     >>> from zope.component import getSiteManager
     >>> from zope.component import getUtility
+    >>> from zope.component.hooks import setSite
     >>> from zope.globalrequest import setRequest
-    >>> from zope.site.hooks import setSite
     >>> from Products.CMFCore.interfaces import IMembershipTool
     >>> from Products.CMFCore.interfaces import IRegistrationTool
     >>> from Products.MailHost.interfaces import IMailHost
@@ -163,4 +163,3 @@
 
     >>> from zope.globalrequest import clearRequest
     >>> clearRequest()
-    
\ No newline at end of file

Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_DiscussionReply.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_DiscussionReply.py	2012-04-02 05:24:13 UTC (rev 124860)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_DiscussionReply.py	2012-04-02 05:26:30 UTC (rev 124861)
@@ -18,7 +18,7 @@
 
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import getSecurityManager
-from zope.site.hooks import setSite
+from zope.component.hooks import setSite
 
 from Products.CMFDefault.permissions import AccessContentsInformation
 from Products.CMFDefault.permissions import View

Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Image.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Image.py	2012-04-02 05:24:13 UTC (rev 124860)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Image.py	2012-04-02 05:26:30 UTC (rev 124861)
@@ -16,16 +16,16 @@
 import unittest
 from Testing import ZopeTestCase
 
+from cStringIO import StringIO
 from os.path import join as path_join
-from cStringIO import StringIO
 
 import transaction
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.User import UnrestrictedUser
 from App.Common import rfc1123_date
 from zope.component import getSiteManager
+from zope.component.hooks import setSite
 from zope.interface.verify import verifyClass
-from zope.site.hooks import setSite
 from zope.testing.cleanup import cleanUp
 
 from Products.CMFCore.interfaces import ICachingPolicyManager

Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Portal.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Portal.py	2012-04-02 05:24:13 UTC (rev 124860)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Portal.py	2012-04-02 05:26:30 UTC (rev 124861)
@@ -20,7 +20,7 @@
 from AccessControl.User import UnrestrictedUser
 from Acquisition import aq_base
 from zope.component import queryUtility
-from zope.site.hooks import setSite
+from zope.component.hooks import setSite
 
 from Products.CMFDefault.testing import FunctionalLayer
 from Products.CMFDefault.utils import PRODUCTS_CMFUID_INSTALLED

Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_join.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_join.py	2012-04-02 05:24:13 UTC (rev 124860)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_join.py	2012-04-02 05:26:30 UTC (rev 124861)
@@ -16,7 +16,7 @@
 import unittest
 from Testing import ZopeTestCase
 
-from zope.site.hooks import setSite
+from zope.component.hooks import setSite
 
 from Products.CMFDefault.testing import FunctionalLayer
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/tests/test_syndication_upgrade.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/tests/test_syndication_upgrade.py	2012-04-02 05:24:13 UTC (rev 124860)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/tests/test_syndication_upgrade.py	2012-04-02 05:26:30 UTC (rev 124861)
@@ -13,19 +13,19 @@
 """Syndication Upgrade tests.
 """
 
-import datetime
 import unittest
 from Testing import ZopeTestCase
 
 from DateTime.DateTime import DateTime
+from Products.CMFCore.interfaces import ISyndicationTool, IFolderish
 from Products.CMFCore.PortalFolder import PortalFolder
-from Products.CMFCore.interfaces import ISyndicationTool, IFolderish
+from Products.CMFDefault.SyndicationInfo import ISyndicationInfo
+from Products.CMFDefault.SyndicationInfo import SyndicationInfo
+from Products.CMFDefault.SyndicationTool import SyndicationTool
 from Products.CMFDefault.testing import FunctionalLayer
-from Products.CMFDefault.SyndicationInfo import SyndicationInfo, ISyndicationInfo
-from Products.CMFDefault.SyndicationTool import SyndicationTool
-from zope.site.hooks import setSite
+from zope.component import getAdapter
 from zope.component import getSiteManager
-from zope.component import getAdapter
+from zope.component.hooks import setSite
 from zope.testing.cleanup import cleanUp
 
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/tests/test_upgrade.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/tests/test_upgrade.py	2012-04-02 05:24:13 UTC (rev 124860)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/tests/test_upgrade.py	2012-04-02 05:26:30 UTC (rev 124861)
@@ -16,17 +16,18 @@
 import unittest
 from Testing import ZopeTestCase
 
-import transaction
 from os.path import abspath
 from os.path import dirname
 from os.path import join as path_join
 
+import transaction
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.User import UnrestrictedUser
+from zope.component.hooks import setSite
+
 from Products.CMFCore.tests.base.testcase import WarningInterceptor
 from Products.CMFDefault.testing import FunctionalLayer
 from Products.GenericSetup.context import TarballImportContext
-from zope.site.hooks import setSite
 
 here = abspath(dirname(__file__))
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py	2012-04-02 05:24:13 UTC (rev 124860)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py	2012-04-02 05:26:30 UTC (rev 124861)
@@ -11,9 +11,8 @@
 #
 ##############################################################################
 """Upgrade steps to CMFDefault 2.1.
-
-$Id$
 """
+
 import logging
 
 from Acquisition import aq_base
@@ -24,9 +23,9 @@
 from five.localsitemanager.registry import PersistentComponents
 from zope.component import getMultiAdapter
 from zope.component.globalregistry import base
+from zope.component.hooks import setSite
 from zope.component.interfaces import ComponentLookupError
 from zope.dottedname.resolve import resolve
-from zope.site.hooks import setSite
 
 from Products.CMFCore.DirectoryView import _dirreg
 from Products.CMFCore.DirectoryView import _generateKey


Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py
___________________________________________________________________
Deleted: svn:mime-type
   - text/plain
Deleted: svn:keywords
   - Id

More information about the checkins mailing list