From: Georg Brandl <georg@python.org>
Date: Sat, 3 Jan 2009 23:56:02 +0000 (+0000)
Subject: Merged revisions 68140,68152 via svnmerge from
X-Git-Tag: v3.0.1~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6aa078692983d886cb5be796bd7080325483c71c;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 68140,68152 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r68140 | hirokazu.yamamoto | 2009-01-01 17:09:52 +0100 (Thu, 01 Jan 2009) | 1 line

  News fix. On py3k, `str' is unicode. should use `bytes'.
........
  r68152 | ronald.oussoren | 2009-01-02 12:48:29 +0100 (Fri, 02 Jan 2009) | 2 lines

  Fix for issue 3433
........
---

diff --git a/Misc/NEWS b/Misc/NEWS
index aacf519007c7..0543a7af2801 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -24,7 +24,7 @@ Core and Builtins
   non-ascii characters in its name could fail with a "SyntaxError: None" error.
 
 - Issue #4797: IOError.filename was not set when _fileio.FileIO failed to open
-  file with `str' filename on Windows.
+  file with `bytes' filename on Windows.
 
 - Issue #3680: Reference cycles created through a dict, set or deque iterator
   did not get collected.