Changes as suggested in code review.

src/zope/dublincore/browser/metadataedit.py

@@ -20,14 +20,7 @@
 from zope.i18nmessageid import MessageFactory
 
 _ = MessageFactory('zope')
-
-try:
-    unicode
-except NameError:
-    unicode = str  # PY3
-
-
-text_type = type(u'')  #PY3
+text_type = type(u'')  # PY3
 
 
 class MetaDataEdit(object):

src/zope/dublincore/dcsv.py

@@ -26,8 +26,6 @@
     unicode
 except NameError:
     basestring = str  # PY3
-else:
-    basestring = str, unicode   # noqa: F821
 
 
 def encode(items):

src/zope/dublincore/interfaces.py

@@ -233,7 +233,7 @@ class IDCPublishing(Interface):
 
     effective = Datetime(
         title=u'Effective Date',
-        description=u"The date and time that an object should be published. "
+        description=u"The date and time that an object should be published."
     )
 
     expires = Datetime(

src/zope/dublincore/tests/test_dcsv.py

@@ -11,10 +11,11 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Test the Dublib Core Structured Value support functions.
+"""Test the Dublin Core Structured Value support functions.
 """
 from doctest import DocTestSuite
-from zope.dublincore.dcsv import encode, decode  # noqa: F401
+# Imports needed inside the doctests:
+from zope.dublincore.dcsv import encode, decode
 
 
 # TODO still need tests for errors, and createMapping()

src/zope/dublincore/tests/test_zcml.py

@@ -14,11 +14,13 @@
 """ Tests that ZCML can be loaded.
 """
 import unittest
+import zope.component.testing
 
 
 class ZCMLTests(unittest.TestCase):
-    from zope.component.testing import setUp  # noqa: F401
-    from zope.component.testing import tearDown  # noqa: F401
+
+    setUp = zope.component.testing.setUp
+    tearDown = zope.component.testing.tearDown
 
     def test_loadable(self):
         # N.B.:  this test deliberately avoids any "ftesting" / layers