[Zope3-checkins] SVN: zope.testing/trunk/src/zope/testing/testrunner.py Fixed bug in symlink handling.

Jim Fulton jim at zope.com
Thu Jul 7 15:57:22 EDT 2005


Log message for revision 31022:
  Fixed bug in symlink handling.
  

Changed:
  U   zope.testing/trunk/src/zope/testing/testrunner.py

-=-
Modified: zope.testing/trunk/src/zope/testing/testrunner.py
===================================================================
--- zope.testing/trunk/src/zope/testing/testrunner.py	2005-07-07 19:49:42 UTC (rev 31021)
+++ zope.testing/trunk/src/zope/testing/testrunner.py	2005-07-07 19:57:22 UTC (rev 31022)
@@ -642,6 +642,8 @@
 
 
 def walk_with_symlinks(options, dir):
+    # TODO -- really should have test of this that uses symlinks
+    #         this is hard on a number of levels ...
     for dirpath, dirs, files in os.walk(dir):
         dirs.sort()
         files.sort()
@@ -650,8 +652,8 @@
         for d in dirs:
             p = os.path.join(dirpath, d)
             if os.path.islink(p):
-                for dirpath, dirs, files in walk_with_symlinks(options, p):
-                    yield (dirpath, dirs, files)
+                for sdirpath, sdirs, sfiles in walk_with_symlinks(options, p):
+                    yield (sdirpath, sdirs, sfiles)
 
 compiled_sufixes = '.pyc', '.pyo'
 def remove_stale_bytecode(options):



More information about the Zope3-Checkins mailing list