From 422cf2b4adaf8a5d69f2baf10becbe341d3ab2a4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 4 May 2016 11:57:32 -0400
Subject: [PATCH] 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.

---
 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
index 382aca8fc12..f0c73731713 100644
--- a/Lib/distutils/config.py
+++ b/Lib/distutils/config.py
@@ -4,7 +4,7 @@ Provides the PyPIRCCommand class, the base class for the command classes
 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 @@ class PyPIRCCommand(Command):
             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
index 86b9789b3a1..2993c663310 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,12 @@ Release date: tba
 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 #26659: Make the builtin slice type support cycle collection.
 
 - Issue #26718: super.__init__ no longer leaks memory if called multiple times.