[Python-checkins] r54885 - in python/branches/release25-maint: Lib/tarfile.py Lib/test/test_tarfile.py Misc/NEWS
lars.gustaebel
python-checkins at python.org
Fri Apr 20 16:49:06 CEST 2007
Author: lars.gustaebel
Date: Fri Apr 20 16:49:02 2007
New Revision: 54885
Modified:
python/branches/release25-maint/Lib/tarfile.py
python/branches/release25-maint/Lib/test/test_tarfile.py
python/branches/release25-maint/Misc/NEWS
Log:
Fix directory names to have only one trailing slash.
A regression from rev. 52525.
Modified: python/branches/release25-maint/Lib/tarfile.py
==============================================================================
--- python/branches/release25-maint/Lib/tarfile.py (original)
+++ python/branches/release25-maint/Lib/tarfile.py Fri Apr 20 16:49:02 2007
@@ -1842,7 +1842,7 @@
tarinfo.type = DIRTYPE
# Directory names should have a '/' at the end.
- if tarinfo.isdir():
+ if tarinfo.isdir() and not tarinfo.name.endswith("/"):
tarinfo.name += "/"
self.members.append(tarinfo)
Modified: python/branches/release25-maint/Lib/test/test_tarfile.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_tarfile.py (original)
+++ python/branches/release25-maint/Lib/test/test_tarfile.py Fri Apr 20 16:49:02 2007
@@ -191,6 +191,13 @@
except:
pass
+ def test_dirtype(self):
+ for tarinfo in self.tar:
+ if tarinfo.isdir():
+ self.assert_(tarinfo.name.endswith("/"))
+ self.assert_(not tarinfo.name[:-1].endswith("/"))
+
+
class ReadStreamTest(ReadTest):
sep = "|"
Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS (original)
+++ python/branches/release25-maint/Misc/NEWS Fri Apr 20 16:49:02 2007
@@ -4,6 +4,17 @@
(editors: check NEWS.help for information about editing NEWS using ReST.)
+What's New in Python 2.5.2c1?
+=============================
+
+*Release date: XX-XXX-XXXX*
+
+Library
+-------
+
+- tarfile.py: Fix directory names to have only one trailing slash.
+
+
What's New in Python 2.5.1?
=============================
More information about the Python-checkins
mailing list