Remove dependency on zope.site.

plone · Apr 24, 2017 · 9d7de45 · 9d7de45
1 parent 913d75c
commit 9d7de45
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,6 +14,9 @@ New features:
 
 Bug fixes:
 
+- Remove dependency on ``zope.site``.
+  [thet]
+
 - Code cleanup.
   [thet]
 

diff --git a/plone/app/users/vocabularies.py b/plone/app/users/vocabularies.py
@@ -11,7 +11,7 @@
 from zope.schema.interfaces import IVocabularyFactory
 from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
-from zope.site.hooks import getSite
+from zope.component.hooks import getSite
 
 
 # Define constants from the Join schema that should be added to the
@@ -70,7 +70,7 @@ class GroupIdVocabulary(object):
 
       >>> from zope.component import queryUtility
       >>> from zope.schema.interfaces import IVocabularyFactory
-      >>> from zope.site.hooks import getSite
+      >>> from zope.component.hooks import getSite
       >>> from Products.CMFCore.utils import getToolByName
 
       >>> groups_tool = getToolByName(getSite(), 'portal_groups')

diff --git a/setup.py b/setup.py
@@ -67,7 +67,6 @@
         'zope.event',
         'zope.interface',
         'zope.schema',
-        'zope.site',
     ],
     entry_points="""
     [z3c.autoinclude.plugin]
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,9 @@ New features: @@
     Bug fixes:
+    - Remove dependency on ``zope.site``.
+      [thet]
     - Code cleanup.
       [thet]
@@ Expand Down @@