[Python-checkins] cpython (merge 3.5 -> default): Issue #20120: Merge with 3.5

[jason.coombs]

https://hg.python.org/cpython/rev/89116bd505cb
changeset:   101225:89116bd505cb
parent:      101222:8f7cb3b171f3
parent:      101224:eae59b6bf133
user:        Jason R. Coombs <jaraco at jaraco.com>
date:        Wed May 04 12:00:32 2016 -0400
summary:
  Issue #20120: Merge with 3.5

files:
  Lib/distutils/config.py |  4 ++--
  Misc/NEWS               |  6 ++++++
  2 files changed, 8 insertions(+), 2 deletions(-)


diff --git a/Lib/distutils/config.py b/Lib/distutils/config.py
--- a/Lib/distutils/config.py
+++ b/Lib/distutils/config.py
@@ -4,7 +4,7 @@
 that uses .pypirc in the distutils.command package.
 """
 import os
-from configparser import ConfigParser
+from configparser import RawConfigParser
 
 from distutils.cmd import Command
 
@@ -53,7 +53,7 @@
             repository = self.repository or self.DEFAULT_REPOSITORY
             realm = self.realm or self.DEFAULT_REALM
 
-            config = ConfigParser()
+            config = RawConfigParser()
             config.read(rc)
             sections = config.sections()
             if 'distutils' in sections:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,12 @@
 Core and Builtins
 -----------------
 
+- Issue #20120: Use RawConfigParser for .pypirc parsing,
+  removing support for interpolation unintentionally added
+  with move to Python 3. Behavior no longer does any
+  interpolation in .pypirc files, matching behavior in Python
+  2.7 and Setuptools 19.0.
+
 - Issue #26249: Memory functions of the :c:func:`PyMem_Malloc` domain
   (:c:data:`PYMEM_DOMAIN_MEM`) now use the :ref:`pymalloc allocator <pymalloc>`
   rather than system :c:func:`malloc`. Applications calling

-- 
Repository URL: https://hg.python.org/cpython