Issue #6286: distutils upload command now uses urllib2
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index d306681..8114feb 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -5,7 +5,7 @@
import os
import socket
import platform
-import httplib
+from urllib2 import urlopen, Request, HTTPError
import base64
import urlparse
import cStringIO as StringIO
@@ -62,6 +62,15 @@
self.upload_file(command, pyversion, filename)
def upload_file(self, command, pyversion, filename):
+ # Makes sure the repository URL is compliant
+ schema, netloc, url, params, query, fragments = \
+ urlparse.urlparse(self.repository)
+ if params or query or fragments:
+ raise AssertionError("Incompatible url %s" % self.repository)
+
+ if schema not in ('http', 'https'):
+ raise AssertionError("unsupported schema " + schema)
+
# Sign if requested
if self.sign:
gpg_args = ["gpg", "--detach-sign", "-a", filename]
@@ -153,39 +162,30 @@
self.announce("Submitting %s to %s" % (filename, self.repository), log.INFO)
# build the Request
- # We can't use urllib2 since we need to send the Basic
- # auth right with the first request
- schema, netloc, url, params, query, fragments = \
- urlparse.urlparse(self.repository)
- assert not params and not query and not fragments
- if schema == 'http':
- http = httplib.HTTPConnection(netloc)
- elif schema == 'https':
- http = httplib.HTTPSConnection(netloc)
- else:
- raise AssertionError, "unsupported schema "+schema
+ headers = {'Content-type':
+ 'multipart/form-data; boundary=%s' % boundary,
+ 'Content-length': str(len(body)),
+ 'Authorization': auth}
- data = ''
- loglevel = log.INFO
+ request = Request(self.repository, data=body,
+ headers=headers)
+ # send the data
try:
- http.connect()
- http.putrequest("POST", url)
- http.putheader('Content-type',
- 'multipart/form-data; boundary=%s'%boundary)
- http.putheader('Content-length', str(len(body)))
- http.putheader('Authorization', auth)
- http.endheaders()
- http.send(body)
+ result = urlopen(request)
+ status = result.getcode()
+ reason = result.msg
except socket.error, e:
self.announce(str(e), log.ERROR)
return
+ except HTTPError, e:
+ status = e.code
+ reason = e.msg
- r = http.getresponse()
- if r.status == 200:
- self.announce('Server response (%s): %s' % (r.status, r.reason),
+ if status == 200:
+ self.announce('Server response (%s): %s' % (status, reason),
log.INFO)
else:
- self.announce('Upload failed (%s): %s' % (r.status, r.reason),
+ self.announce('Upload failed (%s): %s' % (status, reason),
log.ERROR)
if self.show_response:
- self.announce('-'*75, r.read(), '-'*75)
+ self.announce('-'*75, result.read(), '-'*75)
diff --git a/Lib/distutils/tests/test_upload.py b/Lib/distutils/tests/test_upload.py
index f57a4a3..bbcd80d 100644
--- a/Lib/distutils/tests/test_upload.py
+++ b/Lib/distutils/tests/test_upload.py
@@ -2,8 +2,8 @@
import sys
import os
import unittest
-import httplib
+from distutils.command import upload as upload_mod
from distutils.command.upload import upload
from distutils.core import Distribution
@@ -19,48 +19,37 @@
[server1]
username:me
"""
-class Response(object):
- def __init__(self, status=200, reason='OK'):
- self.status = status
- self.reason = reason
-class FakeConnection(object):
+class FakeOpen(object):
- def __init__(self):
- self.requests = []
- self.headers = []
- self.body = ''
+ def __init__(self, url):
+ self.url = url
+ if not isinstance(url, str):
+ self.req = url
+ else:
+ self.req = None
+ self.msg = 'OK'
- def __call__(self, netloc):
- return self
+ def getcode(self):
+ return 200
- def connect(self):
- pass
- endheaders = connect
-
- def putrequest(self, method, url):
- self.requests.append((method, url))
-
- def putheader(self, name, value):
- self.headers.append((name, value))
-
- def send(self, body):
- self.body = body
-
- def getresponse(self):
- return Response()
class uploadTestCase(PyPIRCCommandTestCase):
def setUp(self):
super(uploadTestCase, self).setUp()
- self.old_class = httplib.HTTPConnection
- self.conn = httplib.HTTPConnection = FakeConnection()
+ self.old_open = upload_mod.urlopen
+ upload_mod.urlopen = self._urlopen
+ self.last_open = None
def tearDown(self):
- httplib.HTTPConnection = self.old_class
+ upload_mod.urlopen = self.old_open
super(uploadTestCase, self).tearDown()
+ def _urlopen(self, url):
+ self.last_open = FakeOpen(url)
+ return self.last_open
+
def test_finalize_options(self):
# new format
@@ -105,12 +94,13 @@
cmd.run()
# what did we send ?
- headers = dict(self.conn.headers)
+ headers = dict(self.last_open.req.headers)
self.assertEquals(headers['Content-length'], '2086')
self.assert_(headers['Content-type'].startswith('multipart/form-data'))
-
- self.assertEquals(self.conn.requests, [('POST', '/pypi')])
- self.assert_('xxx' in self.conn.body)
+ self.assertEquals(self.last_open.req.get_method(), 'POST')
+ self.assertEquals(self.last_open.req.get_full_url(),
+ 'http://pypi.python.org/pypi')
+ self.assert_('xxx' in self.last_open.req.data)
def test_suite():
return unittest.makeSuite(uploadTestCase)