Remove distutils index-servers from config

Replace RawConfigParser with ConfigParser
Update lookup to use `.sections()` and `.has_section()`

Removes extra entries from tests, since the default fallback will
no longer automatically add them to an empty config.

Signed-off-by: Mike Fiedler <miketheman@gmail.com>

tests/test_utils.py

@@ -61,11 +61,6 @@ def test_get_config_no_distutils(write_config_file):
             "username": "testuser",
             "password": "testpassword",
         },
-        "testpypi": {
-            "repository": utils.TEST_REPOSITORY,
-            "username": None,
-            "password": None,
-        },
     }
 
 
@@ -108,11 +103,6 @@ def test_get_config_missing(config_file):
             "username": None,
             "password": None,
         },
-        "testpypi": {
-            "repository": utils.TEST_REPOSITORY,
-            "username": None,
-            "password": None,
-        },
     }
 
 
@@ -201,11 +191,6 @@ def test_get_config_deprecated_pypirc():
             "username": "testusername",
             "password": "testpassword",
         },
-        "testpypi": {
-            "repository": utils.TEST_REPOSITORY,
-            "username": "testusername",
-            "password": "testpassword",
-        },
     }
 
 

twine/utils.py

@@ -55,7 +55,7 @@ def get_config(path: str) -> Dict[str, RepositoryConfig]:
     pypyi and testpypi.
     """
     realpath = os.path.realpath(os.path.expanduser(path))
-    parser = configparser.RawConfigParser()
+    parser = configparser.ConfigParser()
 
     try:
         with open(realpath) as f:
@@ -75,17 +75,17 @@ def get_config(path: str) -> Dict[str, RepositoryConfig]:
     config: DefaultDict[str, RepositoryConfig]
     config = collections.defaultdict(lambda: defaults.copy())
 
-    index_servers = parser.get(
-        "distutils", "index-servers", fallback="pypi testpypi"
-    ).split()
-
     # Don't require users to manually configure URLs for these repositories
     config["pypi"]["repository"] = DEFAULT_REPOSITORY
-    if "testpypi" in index_servers:
+    if parser.has_section("testpypi"):
         config["testpypi"]["repository"] = TEST_REPOSITORY
 
     # Optional configuration values for individual repositories
-    for repository in index_servers:
+    for repository in parser.sections():
+        if repository == "server-login":
+            # handled by defaults already, don't add an extra key to config
+            continue
+
         for key in [
             "username",
             "repository",