Merge pull request #53 from plone/thet-rmzopesitehooks

Replace deprecated zope.site.hooks import with zope.component.hooks.
plone · Feb 23, 2016 · 4ef388f · 4ef388f
2 parents 1d90faf + 3b031f6
commit 4ef388f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,6 +10,9 @@ New:
 
 Fixes:
 
+- Replace deprecated ``zope.site.hooks`` import with ``zope.component.hooks``.
+  [thet]
+
 - Fix tinymce pattern-options merging to be compatible with change in
   p.a.widgets and p.a.z3cform.
   [alecm]

diff --git a/Products/Archetypes/fieldproperty.py b/Products/Archetypes/fieldproperty.py
@@ -2,11 +2,9 @@
 """
 
 from DateTime import DateTime
-from datetime import datetime
+from zope.component.hooks import getSite
 from zope.datetime import parseDatetimetz
 
-from zope.site.hooks import getSite
-
 
 class ATFieldProperty(object):
     """Field properties based on Archetypes schema

diff --git a/Products/Archetypes/tests/traversal.txt b/Products/Archetypes/tests/traversal.txt
@@ -177,7 +177,7 @@ We need to do some site magic, or our we end up with the SimpleView class
 being persisted in the local component registry. We really shouldn't do
 ZCML registrations in function tests.
 
-  >>> from zope.site.hooks import getSite, setSite
+  >>> from zope.component.hooks import getSite, setSite
   >>> site = getSite()
 
   >>> setSite(None)

diff --git a/setup.py b/setup.py
@@ -46,7 +46,6 @@
           'zope.lifecycleevent',
           'zope.publisher',
           'zope.schema',
-          'zope.site',
           'zope.tal',
           'zope.viewlet',
           'Products.CMFCore',
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,9 @@ New: @@
     Fixes:
+    - Replace deprecated ``zope.site.hooks`` import with ``zope.component.hooks``.
+      [thet]
     - Fix tinymce pattern-options merging to be compatible with change in
       p.a.widgets and p.a.z3cform.
       [alecm]
@@ Expand Down @@