Merge pull request #83 from pypa/bug/61

Read deprecated style of PyPI rc files

Author: dstufft

tests/fixtures/deprecated-pypirc

@@ -0,0 +1,6 @@
+[server-login]
+username:testusername
+password:testpassword
+
+[pypi]
+foo:bar

tests/test_utils.py

@@ -96,6 +96,20 @@ def test_get_config_missing(tmpdir):
     }
 
 
+def test_get_config_deprecated_pypirc():
+    tests_dir = os.path.dirname(os.path.abspath(__file__))
+    deprecated_pypirc_path = os.path.join(tests_dir, 'fixtures',
+                                          'deprecated-pypirc')
+
+    assert get_config(deprecated_pypirc_path) == {
+        "pypi": {
+            "repository": DEFAULT_REPOSITORY,
+            "username": 'testusername',
+            "password": 'testpassword',
+        },
+    }
+
+
 @pytest.mark.parametrize(
     ('cli_value', 'config', 'key', 'strategy', 'expected'),
     (

twine/utils.py

@@ -58,6 +58,12 @@ def get_config(path="~/.pypirc"):
 
     config = {}
 
+    defaults = {"username": None, "password": None}
+    if parser.has_section("server-login"):
+        for key in ["username", "password"]:
+            if parser.has_option("server-login", key):
+                defaults[key] = parser.get("server-login", key)
+
     for repository in repositories:
         # Skip this repository if it doesn't exist in the config file
         if not parser.has_section(repository):
@@ -74,6 +80,8 @@ def get_config(path="~/.pypirc"):
         for key in ["username", "repository", "password"]:
             if parser.has_option(repository, key):
                 config[repository][key] = parser.get(repository, key)
+            elif defaults.get(key):
+                config[repository][key] = defaults[key]
 
     return config