Avoid DeprecationWarnings in the tests.

collective · Apr 20, 2012 · 7ed4eef · 7ed4eef
1 parent fee906d
commit 7ed4eef
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/Products/Poi/browser/notifications.py b/Products/Poi/browser/notifications.py
@@ -84,7 +84,6 @@ class NewIssueMail(BasePoiMail):
     plain_index = ViewPageTemplateFile(
         'templates/poi_email_new_issue_plain.pt')
 
-    # XXX memoize?
     def options(self):
         context = aq_inner(self.context)
         portal = getSite()

diff --git a/Products/Poi/tests/browser.txt b/Products/Poi/tests/browser.txt
@@ -6,7 +6,10 @@ Tracker
 
 We start a test browser::
 
-    >>> from Products.Five.testbrowser import Browser
+    >>> try:
+    ...     from Testing.testbrowser import Browser
+    ... except ImportError:
+    ...     from Products.Five.testbrowser import Browser
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Accept-Language', 'en-US')

diff --git a/Products/Poi/tests/test_browser.py b/Products/Poi/tests/test_browser.py
@@ -1,6 +1,6 @@
 import unittest
 
-from zope.testing import doctest
+import doctest
 from Testing.ZopeTestCase import FunctionalDocFileSuite as Suite
 
 from Products.Poi.tests.ptc import PoiFunctionalTestCase

diff --git a/Products/Poi/tests/test_migration.py b/Products/Poi/tests/test_migration.py
@@ -1,6 +1,6 @@
 import unittest
 
-from zope.testing import doctest
+import doctest
 from Testing.ZopeTestCase import ZopeDocFileSuite as Suite
 
 from Products.Poi.tests.ptc import PoiMigrationTestCase

diff --git a/Products/Poi/tests/test_unit.py b/Products/Poi/tests/test_unit.py
@@ -1,20 +1,19 @@
 import unittest
 
-from zope.testing import doctest
-from zope.testing import doctestunit
+import doctest
 
 OPTIONFLAGS = (doctest.ELLIPSIS |
                doctest.NORMALIZE_WHITESPACE)
 
 
 def test_suite():
     return unittest.TestSuite([
-        doctestunit.DocTestSuite(module='Products.Poi.browser.response',
+        doctest.DocTestSuite(module='Products.Poi.browser.response',
                                  optionflags=OPTIONFLAGS),
-        doctestunit.DocFileSuite('responses.txt',
+        doctest.DocFileSuite('responses.txt',
                                  package='Products.Poi.tests',
                                  optionflags=OPTIONFLAGS),
-        doctestunit.DocFileSuite('linkdetection.txt',
+        doctest.DocFileSuite('linkdetection.txt',
                                  package='Products.Poi.tests',
                                  optionflags=OPTIONFLAGS),
         ])