Merge pull request pypa#251 from pypa/bug/206

sigmavirus24 · web-flow · commit 540081e9534c · 2017-05-22T16:47:58.000-05:00
Fix weirdness with --repository-url
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -19,6 +19,9 @@ Changelog
   * Fix ``--skip-existing`` when used to upload a package for the first time.
     See also :bug:`220`
 
+  * Fix precedence of ``--repository-url`` over ``--repository``. See also
+    :bug:`206`
+
 * :release:`1.8.1 <2016-08-09>`
 
   * Check if a package exists if the URL is one of:
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -121,6 +121,8 @@ def test_get_repository_config_missing(tmpdir):
     }
     assert (utils.get_repository_from_config(pypirc, 'foo', repository_url) ==
             exp)
+    assert (utils.get_repository_from_config(pypirc, 'pypi', repository_url) ==
+            exp)
     exp = {
             "repository": utils.DEFAULT_REPOSITORY,
             "username": None,
diff --git a/twine/utils.py b/twine/utils.py
@@ -104,17 +104,17 @@ def get_config(path="~/.pypirc"):
 
 def get_repository_from_config(config_file, repository, repository_url=None):
     # Get our config from the .pypirc file
+    if repository_url and "://" in repository_url:
+        # assume that the repository is actually an URL and just sent
+        # them a dummy with the repo set
+        return {
+            "repository": repository_url,
+            "username": None,
+            "password": None,
+        }
     try:
         return get_config(config_file)[repository]
     except KeyError:
-        if repository_url and "://" in repository_url:
-            # assume that the repsoitory is actually an URL and just sent
-            # them a dummy with the repo set
-            return {
-                "repository": repository_url,
-                "username": None,
-                "password": None,
-            }
         msg = (
             "Missing '{repo}' section from the configuration file\n"
             "or not a complete URL in --repository.\n"

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,8 @@ def test_get_repository_config_missing(tmpdir):`
`121`	`121`	`}`
`122`	`122`	`assert (utils.get_repository_from_config(pypirc, 'foo', repository_url) ==`
`123`	`123`	`exp)`
	`124`	`+ assert (utils.get_repository_from_config(pypirc, 'pypi', repository_url) ==`
	`125`	`+ exp)`
`124`	`126`	`exp = {`
`125`	`127`	`"repository": utils.DEFAULT_REPOSITORY,`
`126`	`128`	`"username": None,`