]> granicus.if.org Git - python/commit
Merged revisions 87430 via svnmerge from
authorR. David Murray <rdmurray@bitdance.com>
Tue, 21 Dec 2010 21:57:54 +0000 (21:57 +0000)
committerR. David Murray <rdmurray@bitdance.com>
Tue, 21 Dec 2010 21:57:54 +0000 (21:57 +0000)
commit30f9c8c68459466813a438a3511b5c9a8ba0d9a5
tree10a0e40e41992105f51eb98abd96181fa497cff2
parent6cfc5124f2a615922d32ac19a319ffab8edaad0f
Merged revisions 87430 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87430 | r.david.murray | 2010-12-21 16:53:37 -0500 (Tue, 21 Dec 2010) | 9 lines

  #4871: check that zipfile password is bytes, and give useful error message.

  Previously passing a string in as the password would fail either with
  an assertion error or a TypeError with a confusing error message.
  Note that a string can't be accepted since zipfile has no way to
  guess what encoding should be used to turn it into bytes.

  Patch by Victor Stinner.
........
Lib/test/test_zipfile.py
Lib/zipfile.py
Misc/NEWS