Update of /cvsroot/happydoc/HappyDoc/happydoclib
In directory usw-pr-cvs1:/tmp/cvs-serv2247/happydoclib
Modified Files:
path.py
Log Message:
If the prefix and the path passed to removePrefix() match, return an
empty string.
Index: path.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc/happydoclib/path.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** path.py 24 Aug 2002 19:48:25 -0000 1.9
--- path.py 8 Oct 2002 13:03:12 -0000 1.10
***************
*** 142,146 ****
else:
TRACE.write('common prefix (%s)' % common_prefix)
! TRACE.write('does not match specified prefix (%s)' % prefix)
TRACE.writeVar(pathMinusPrefix=path)
--- 142,152 ----
else:
TRACE.write('common prefix (%s)' % common_prefix)
! TRACE.write('does not match specified prefix (%s) for parent dir' % prefix)
!
! common_prefix = commonPrefix(path, prefix)
! TRACE.writeVar(common_prefix=common_prefix)
!
! if common_prefix == prefix:
! path = path[len(common_prefix):]
TRACE.writeVar(pathMinusPrefix=path)
***************
*** 422,425 ****
--- 428,440 ----
expected = 'foo'
actual = removePrefix(os.sep + os.path.join('tmp', 'foo'), os.sep + 'tmp')
+ assert actual == expected, \
+ 'Path modification failed.\n\tExpected "%s",\n\tgot "%s"' \
+ % (expected, actual)
+ return
+
+ def testRemovePrefixMatchFullPath(self):
+ expected = ''
+ path = os.sep + os.path.join('tmp', 'foo')
+ actual = removePrefix(path, path)
assert actual == expected, \
'Path modification failed.\n\tExpected "%s",\n\tgot "%s"' \
|
