[Checkins] SVN: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/ Shorten examples.

[Uli Fouquet]

Log message for revision 83529:
  Shorten examples.

Changed:
  U   Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/README.txt
  U   Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/tests/test_testsetup.py

-=-
Modified: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/README.txt
===================================================================
--- Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/README.txt	2008-02-05 13:19:36 UTC (rev 83528)
+++ Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/README.txt	2008-02-05 13:26:22 UTC (rev 83529)
@@ -99,14 +99,11 @@
   normally also the number of files involved, but let's check that
   correctly.
 
-  We did setup a function `get_filenames_from_suite` in this testing
-  environment (as a `globs` entry) which determines the paths of all
-  testcases contained in a `TestSuite`::
+  We did setup a function `get_basenames_from_suite` in this testing
+  environment (as a `globs` entry) which determines the basenames of
+  the paths of all testcases contained in a `TestSuite`::
 
-     >>> testfiles = [os.path.basename(x)
-     ...              for x in get_filenames_from_suite(suite)]
-     >>> testfiles.sort()
-     >>> testfiles
+     >>> get_basenames_from_suite(suite)
      ['file1.py', 'file1.rst', 'file1.txt', 'subdirfile.txt']
 
    Ah, okay. There are in fact four files, in which testcases were
@@ -127,10 +124,7 @@
    callable:: 
 
       >>> suite = test_suite()
-      >>> testfiles = [os.path.basename(x) for x in 
-      ...              get_filenames_from_suite(suite)]
-      >>> testfiles.sort()
-      >>> testfiles
+      >>> get_basenames_from_suite(suite)
       ['file1.py', 'file1.txt', 'file1.txt', 'subdirfile.txt',
       'subdirfile.txt']
 
@@ -159,10 +153,7 @@
       ...     ufilter_func=lambda x: False)
 
       >>> suite = test_suite()
-      >>> testfiles = [os.path.basename(x) for x in 
-      ...              get_filenames_from_suite(suite)]
-      >>> testfiles.sort()
-      >>> testfiles
+      >>> get_basenames_from_suite(suite)
       ['file1.py', 'file1.txt', 'subdirfile.txt']
 
     As expected, every .txt file was only registered once. The same
@@ -174,10 +165,7 @@
       ...     ufilter_func=custom_file_filter)
 
       >>> suite = test_suite()
-      >>> testfiles = [os.path.basename(x) for x in 
-      ...              get_filenames_from_suite(suite)]
-      >>> testfiles.sort()
-      >>> testfiles
+      >>> get_basenames_from_suite(suite)
       ['file1.py', 'file1.txt', 'subdirfile.txt']
 
     If you specify both, a `filter_func` and a more specialized
@@ -190,10 +178,7 @@
       ...     filter_func=custom_file_filter)
 
       >>> suite = test_suite()
-      >>> testfiles = [os.path.basename(x) for x in 
-      ...              get_filenames_from_suite(suite)]
-      >>> testfiles.sort()
-      >>> testfiles
+      >>> get_basenames_from_suite(suite)
       ['file1.py', 'file1.txt', 'subdirfile.txt']
 
 

Modified: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/tests/test_testsetup.py
===================================================================
--- Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/tests/test_testsetup.py	2008-02-05 13:19:36 UTC (rev 83528)
+++ Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/tests/test_testsetup.py	2008-02-05 13:26:22 UTC (rev 83529)
@@ -38,6 +38,12 @@
         result.append(filename)
     return result
 
+def get_basenames_from_suite(suite):
+    basenames = [os.path.basename(x) for x in get_filenames_from_suite(suite)]
+    basenames.sort()
+    return basenames
+    
+
 def setUpZope(test):
     zope.component.eventtesting.setUp(test)
 
@@ -62,7 +68,7 @@
             )
         test.globs['this_directory'] = os.path.split(__file__)[0]
         test.globs['testrunner_script'] = __file__
-        test.globs['get_filenames_from_suite'] = get_filenames_from_suite
+        test.globs['get_basenames_from_suite'] = get_basenames_from_suite
 
     def tearDown(test):
         sys.path[:], sys.argv[:] = test.globs['saved-sys-info'][:2]