Merge pull request #254 from plone/maurits-warnings

Fix DeprecationWarnings.

Author: davisagli

news/4090.bugfix

@@ -0,0 +1 @@
+Fix DeprecationWarnings. [maurits]

plone/app/discussion/browser/configure.zcml

@@ -27,7 +27,7 @@
 
   <browser:page
       name="moderate-comments"
-      for="plone.app.layout.navigation.interfaces.INavigationRoot"
+      for="plone.base.interfaces.INavigationRoot"
       class=".moderation.View"
       permission="plone.app.discussion.ReviewComments"
       layer="..interfaces.IDiscussionLayer"
@@ -44,7 +44,7 @@
 
   <browser:page
       name="bulk-actions"
-      for="plone.app.layout.navigation.interfaces.INavigationRoot"
+      for="plone.base.interfaces.INavigationRoot"
       class=".moderation.BulkActionsView"
       permission="plone.app.discussion.ReviewComments"
       layer="..interfaces.IDiscussionLayer"
@@ -61,7 +61,7 @@
 
   <browser:page
       name="moderate-comments-enabled"
-      for="plone.app.layout.navigation.interfaces.INavigationRoot"
+      for="plone.base.interfaces.INavigationRoot"
       class=".moderation.ModerateCommentsEnabled"
       permission="zope2.View"
       layer="..interfaces.IDiscussionLayer"

plone/app/discussion/tests/functional_test_comment_review_workflow.txt

@@ -17,7 +17,7 @@ Setting up and logging in
 First we have to set up some things and login.
 
     >>> app = layer['app']
-    >>> from plone.testing.z2 import Browser
+    >>> from plone.testing.zope import Browser
     >>> from plone.app.testing import SITE_OWNER_PASSWORD
     >>> from plone.app.testing import TEST_USER_PASSWORD
     >>> browser = Browser(app)

plone/app/discussion/tests/functional_test_comments.rst

@@ -14,7 +14,7 @@ Setting up and log in
 First we have to set up some things and login.
 
     >>> app = layer['app']
-    >>> from plone.testing.z2 import Browser
+    >>> from plone.testing.zope import Browser
     >>> from plone.app.testing import SITE_OWNER_PASSWORD
     >>> from plone.app.testing import TEST_USER_PASSWORD
     >>> browser = Browser(app)