[Checkins] SVN: zope.dottedname/trunk/s Remove zope.testing dependency, make 'python setup.py test' work.

[Tres Seaver]

Log message for revision 116336:
  Remove zope.testing dependency, make 'python setup.py test' work.

Changed:
  U   zope.dottedname/trunk/setup.py
  U   zope.dottedname/trunk/src/zope/dottedname/tests.py

-=-
Modified: zope.dottedname/trunk/setup.py
===================================================================
--- zope.dottedname/trunk/setup.py	2010-09-12 15:44:04 UTC (rev 116335)
+++ zope.dottedname/trunk/setup.py	2010-09-12 15:49:36 UTC (rev 116336)
@@ -47,10 +47,8 @@
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['zope'],
-      extras_require = dict(
-          test=['zope.testing'],
-          ),
       install_requires = ['setuptools'],
+      test_suite='zope.dottedname.tests.test_suite',
       include_package_data=True,
       zip_safe = False
       )

Modified: zope.dottedname/trunk/src/zope/dottedname/tests.py
===================================================================
--- zope.dottedname/trunk/src/zope/dottedname/tests.py	2010-09-12 15:44:04 UTC (rev 116335)
+++ zope.dottedname/trunk/src/zope/dottedname/tests.py	2010-09-12 15:49:36 UTC (rev 116336)
@@ -13,18 +13,14 @@
 ##############################################################################
 """test resolution of dotted names
 """
-import os,unittest
-from zope.testing.doctest import DocFileSuite,REPORT_NDIFF,ELLIPSIS
+import unittest
+import doctest
+import os
 
+README = os.path.abspath(os.path.join(os.path.dirname(__file__), 'README.txt'))
+FLAGS = doctest.REPORT_NDIFF | doctest.ELLIPSIS
+
 def test_suite():
     return unittest.TestSuite((
-        DocFileSuite(
-            os.path.abspath(os.path.join(os.path.dirname(__file__), 'README.txt')),
-            optionflags=REPORT_NDIFF|ELLIPSIS,
-            module_relative=False,
-            ),
-        ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
-
+        doctest.DocFileSuite(README, optionflags=FLAGS, module_relative=False),
+    ))