From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Mon, 13 Sep 2010 07:50:43 +0000 (+0000)
Subject: Blocked revisions 84081-84082,84363,84467-84469,84485 via svnmerge
X-Git-Tag: v2.7.1rc1~298
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf6f7a08e3dfef4dc4879317dff2a20773f02c3d;p=python

Blocked revisions 84081-84082,84363,84467-84469,84485 via svnmerge

........
  r84081 | florent.xicluna | 2010-08-15 22:16:27 +0200 (dim., 15 août 2010) | 1 line

  Replace the deprecated ConfigParser.readfp() method, and fix the incomplete merge in r82293.
........
  r84082 | florent.xicluna | 2010-08-15 22:21:26 +0200 (dim., 15 août 2010) | 1 line

  Replace readfp() with read_file() in configparser documentation.
........
  r84363 | florent.xicluna | 2010-08-30 16:05:50 +0200 (lun., 30 août 2010) | 1 line

  remove pointless coding cookies
........
  r84467 | florent.xicluna | 2010-09-03 21:52:03 +0200 (ven., 03 sept. 2010) | 1 line

  Use a context manager for some file objects.
........
  r84468 | florent.xicluna | 2010-09-03 21:54:02 +0200 (ven., 03 sept. 2010) | 1 line

  Remove unused import, fix typo and rewrap docstrings.
........
  r84469 | florent.xicluna | 2010-09-03 21:55:26 +0200 (ven., 03 sept. 2010) | 1 line

  Remove redundant context manager.
........
  r84485 | florent.xicluna | 2010-09-04 01:47:32 +0200 (sam., 04 sept. 2010) | 2 lines

  Welcome to the UTF-8 world.
........
---