Merge pull request pypa#249 from pypa/bug/220

sigmavirus24 · web-flow · commit ceb83faf04b2 · 2017-05-21T20:14:37.000-05:00
Fix --skip-existing with a new package upload
diff --git a/tests/test_repository.py b/tests/test_repository.py
@@ -11,8 +11,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import requests
+
 from twine import repository
 
+import pretend
+
 
 def test_gpg_signature_structure_is_preserved():
     data = {
@@ -90,3 +94,48 @@ def test_make_user_agent_string():
     assert 'requests-toolbelt/' in user_agent
     assert 'pkginfo/' in user_agent
     assert 'setuptools/' in user_agent
+
+
+def response_with(**kwattrs):
+    resp = requests.Response()
+    for attr, value in kwattrs.items():
+        if hasattr(resp, attr):
+            setattr(resp, attr, value)
+
+    return resp
+
+
+def test_package_is_uploaded_404s():
+    repo = repository.Repository(
+        repository_url='https://pypi.python.org/pypi',
+        username='username',
+        password='password',
+    )
+    repo.session = pretend.stub(
+        get=lambda url, headers: response_with(status_code=404)
+    )
+    package = pretend.stub(
+        safe_name='fake',
+        metadata=pretend.stub(version='2.12.0'),
+    )
+
+    assert repo.package_is_uploaded(package) is False
+
+
+def test_package_is_uploaded_200s_with_no_releases():
+    repo = repository.Repository(
+        repository_url='https://pypi.python.org/pypi',
+        username='username',
+        password='password',
+    )
+    repo.session = pretend.stub(
+        get=lambda url, headers: response_with(status_code=200,
+                                               _content=b'{"releases": {}}',
+                                               _content_consumed=True),
+    )
+    package = pretend.stub(
+        safe_name='fake',
+        metadata=pretend.stub(version='2.12.0'),
+    )
+
+    assert repo.package_is_uploaded(package) is False
diff --git a/twine/repository.py b/twine/repository.py
@@ -188,7 +188,10 @@ def package_is_uploaded(self, package, bypass_cache=False):
                                                     url=LEGACY_PYPI)
             headers = {'Accept': 'application/json'}
             response = self.session.get(url, headers=headers)
-            releases = response.json()['releases']
+            if response.status_code == 200:
+                releases = response.json()['releases']
+            else:
+                releases = {}
             self._releases_json_data[safe_name] = releases
 
         packages = releases.get(package.metadata.version, [])
