]> granicus.if.org Git - python/commitdiff
(merge 3.2) Issue #12451: pydoc.synopsis() now reads the encoding cookie if
authorVictor Stinner <victor.stinner@haypocalc.com>
Thu, 30 Jun 2011 13:58:29 +0000 (15:58 +0200)
committerVictor Stinner <victor.stinner@haypocalc.com>
Thu, 30 Jun 2011 13:58:29 +0000 (15:58 +0200)
available, to read the Python script from the right encoding.

1  2 
Lib/pydoc.py
Lib/test/test_pydoc.py
Misc/NEWS

diff --cc Lib/pydoc.py
Simple merge
Simple merge
diff --cc Misc/NEWS
Simple merge