Import repository constants from utils; use them in 410 check; update test name and override comment

Signed-off-by: Aditya Saky <[email protected]>

Author: adityasaky

tests/test_upload.py

@@ -18,6 +18,7 @@
 from twine.commands import upload
 from twine import package, cli, exceptions
 import twine
+from twine.utils import DEFAULT_REPOSITORY, TEST_REPOSITORY
 
 import helpers
 
@@ -27,8 +28,6 @@
 NEW_SDIST_FIXTURE = 'tests/fixtures/twine-1.6.5.tar.gz'
 NEW_WHEEL_FIXTURE = 'tests/fixtures/twine-1.6.5-py2.py3-none-any.whl'
 NEW_RELEASE_URL = 'https://pypi.org/project/twine/1.6.5/'
-DEFAULT_REPOSITORY = "https://upload.pypi.org/legacy/"
-TEST_REPOSITORY = "https://test.pypi.org/legacy/"
 
 
 def test_successful_upload(make_settings, capsys):
@@ -289,10 +288,10 @@ def none_upload(*args, **settings_kwargs):
     assert "/foo/bar.crt" == upload_settings.cacert
 
 
-def test_check_status_code(make_settings, capsys):
+def test_check_status_code_for_wrong_repo_url(make_settings, capsys):
     upload_settings = make_settings()
 
-    # override default upload_settings
+    # override defaults to use incorrect URL
     upload_settings.repository_config['repository'] = \
         "https://upload.pypi.org"
 

twine/commands/upload.py

@@ -18,14 +18,11 @@
 from twine.package import PackageFile
 from twine import exceptions
 from twine import settings
+from twine.utils import DEFAULT_REPOSITORY, TEST_REPOSITORY
 
 from requests.exceptions import HTTPError
 
 
-DEFAULT_REPOSITORY = "https://upload.pypi.org/legacy/"
-TEST_REPOSITORY = "https://test.pypi.org/legacy/"
-
-
 def skip_upload(response, skip_existing, package):
     filename = package.basefilename
     msg_400 = (
@@ -67,8 +64,8 @@ def check_status_code(response, verbose):
               "testpypi.python.org). You've received a 410 error response. "
               "Uploading to those sites is deprecated. The new sites are "
               "pypi.org and test.pypi.org. Try using "
-              "https://upload.pypi.org/legacy/ "
-              "(or https://test.pypi.org/legacy/) to upload your packages "
+              f"{DEFAULT_REPOSITORY} "
+              f"(or {TEST_REPOSITORY}) to upload your packages "
               "instead. These are the default URLs for Twine now. More at "
               "https://packaging.python.org/guides/migrating-to-pypi-org/ ")
     elif response.status_code == 405 and "pypi.org" in response.url: