Index: Lib/test/test_cd.py
===================================================================
--- Lib/test/test_cd.py	(revisione 60620)
+++ Lib/test/test_cd.py	(copia locale)
@@ -1,26 +1,37 @@
-#! /usr/bin/env python
-"""Whimpy test script for the cd module
+"""Whimpy test script for the cd module.
+
+This is a very inobtrusive test for the existence of the cd module and
+all its attributes.  More comprehensive examples can be found in
+Demo/cd and require that you have a CD and a CD ROM drive.
+
    Roger E. Masse
 """
+
 import cd
-from test.test_support import verbose
+import unittest
+from test.test_support import verbose, run_unittest
 
-cdattrs = ['BLOCKSIZE', 'CDROM', 'DATASIZE', 'ERROR', 'NODISC', 'PAUSED', 'PLAYING', 'READY',
-           'STILL', '__doc__', '__name__', 'atime', 'audio', 'catalog', 'control', 'createparser', 'error',
-           'ident', 'index', 'msftoframe', 'open', 'pnum', 'ptime']
 
+class TestCd(unittest.TestCase):
 
-# This is a very inobtrusive test for the existence of the cd module and all its
-# attributes.  More comprehensive examples can be found in Demo/cd and
-# require that you have a CD and a CD ROM drive
-
-def main():
-    # touch all the attributes of cd without doing anything
-    if verbose:
-        print 'Touching cd module attributes...'
-    for attr in cdattrs:
+    def test_touch_attributes(self):
+        # touch all the attributes of cd without doing anything
+        cdattrs = ['BLOCKSIZE', 'CDROM', 'DATASIZE', 'ERROR', 'NODISC',
+                   'PAUSED', 'PLAYING', 'READY', 'STILL', '__doc__',
+                   '__name__', 'atime', 'audio', 'catalog', 'control',
+                   'createparser', 'error', 'ident', 'index', 'msftoframe',
+                   'open', 'pnum', 'ptime'
+                   ]
         if verbose:
-            print 'touching: ', attr
-        getattr(cd, attr)
+            print 'Touching cd module attributes...'
+        for attr in cdattrs:
+            if verbose:
+                print 'touching: ', attr
+            getattr(cd, attr)
 
-main()
+
+def test_main():
+    run_unittest(TestCd)
+
+if __name__ == '__main__':
+    test_main()