Use RawConfigParser instead of SafeConfigParser in PyPIConfig class. …

…Interpolated values are no longer supported. Since backward compatibility could not be retained in either case, prefer the simpler, more direct format. Ref #442.
pypa · Dec 14, 2015 · fbcbb51 · fbcbb51
1 parent 80adba1
commit fbcbb51
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -7,9 +7,8 @@ CHANGES
 19.0
 ----
 
-* Issue #442: Use SafeConfigParser for parsing .pypirc file. Now
-  fields containing the percent symbol (%) must have each percent
-  replaced with two percent symbols (%%).
+* Issue #442: Use RawConfigParser for parsing .pypirc file.
+  Interpolated values are no longer honored in .pypirc files.
 
 ------
 18.8.1

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
@@ -945,14 +945,14 @@ def __iter__(self):
     def __str__(self):
         return '%(username)s:%(password)s' % vars(self)
 
-class PyPIConfig(configparser.SafeConfigParser):
+class PyPIConfig(configparser.RawConfigParser):
 
     def __init__(self):
         """
         Load from ~/.pypirc
         """
         defaults = dict.fromkeys(['username', 'password', 'repository'], '')
-        configparser.SafeConfigParser.__init__(self, defaults)
+        configparser.RawConfigParser.__init__(self, defaults)
 
         rc = os.path.join(os.path.expanduser('~'), '.pypirc')
         if os.path.exists(rc):

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
@@ -216,7 +216,7 @@ def test_percent_in_password(self, tmpdir, monkeypatch):
                 [pypi]
                 repository=https://pypi.python.org
                 username=jaraco
-                password=pity%%
+                password=pity%
             """))
         cfg = setuptools.package_index.PyPIConfig()
         cred = cfg.creds_by_repository['https://pypi.python.org']