From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 10 Jun 2010 13:38:26 +0000 (+0000)
Subject: Blocked revisions 81871 via svnmerge
X-Git-Tag: v3.1.3rc1~653
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=078d73532df964f1918e906337aacefb285f5a87;p=python

Blocked revisions 81871 via svnmerge

........
  r81871 | victor.stinner | 2010-06-10 15:36:23 +0200 (jeu., 10 juin 2010) | 4 lines

  Fix r81869: ISO-8859-15 was seen as an alias to ISO-8859-1

  Don't use normalize_encoding() result if it is truncated.
........
---