mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 04:15:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Branch merge

Browse source
This commit is contained in:
Éric Araujo 2011-05-01 02:09:37 +02:00
commit a27c8e3746
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/distutils/tests/test_register.py
View file

@ -138,7 +138,7 @@ class RegisterTestCase(PyPIRCCommandTestCase):
# let's see what the server received : we should # let's see what the server received : we should
# have 2 similar requests # have 2 similar requests
self.assertTrue(self.conn.reqs, 2) self.assertEqual(len(self.conn.reqs), 2)
req1 = dict(self.conn.reqs[0].headers) req1 = dict(self.conn.reqs[0].headers)
req2 = dict(self.conn.reqs[1].headers) req2 = dict(self.conn.reqs[1].headers)
self.assertEqual(req2['Content-length'], req1['Content-length']) self.assertEqual(req2['Content-length'], req1['Content-length'])
@ -168,7 +168,7 @@ class RegisterTestCase(PyPIRCCommandTestCase):
del register_module.raw_input del register_module.raw_input
# we should have send a request # we should have send a request
self.assertTrue(self.conn.reqs, 1) self.assertEqual(len(self.conn.reqs), 1)
req = self.conn.reqs[0] req = self.conn.reqs[0]
headers = dict(req.headers) headers = dict(req.headers)
self.assertEqual(headers['Content-length'], '608') self.assertEqual(headers['Content-length'], '608')
@ -186,7 +186,7 @@ class RegisterTestCase(PyPIRCCommandTestCase):
del register_module.raw_input del register_module.raw_input
# we should have send a request # we should have send a request
self.assertTrue(self.conn.reqs, 1) self.assertEqual(len(self.conn.reqs), 1)
req = self.conn.reqs[0] req = self.conn.reqs[0]
headers = dict(req.headers) headers = dict(req.headers)
self.assertEqual(headers['Content-length'], '290') self.assertEqual(headers['Content-length'], '290')

6
Lib/heapq.py
View file

@ -178,7 +178,7 @@ def heappushpop(heap, item):
return item return item
def heapify(x): def heapify(x):
"""Transform list into a heap, in-place, in O(len(heap)) time.""" """Transform list into a heap, in-place, in O(len(x)) time."""
n = len(x) n = len(x)
# Transform bottom-up. The largest index there's any point to looking at # Transform bottom-up. The largest index there's any point to looking at
# is the largest with a child index in-range, so must have 2*i + 1 < n, # is the largest with a child index in-range, so must have 2*i + 1 < n,
@ -368,7 +368,7 @@ def nsmallest(n, iterable, key=None):
return [min(chain(head, it))] return [min(chain(head, it))]
return [min(chain(head, it), key=key)] return [min(chain(head, it), key=key)]
# When n>=size, it's faster to use sort() # When n>=size, it's faster to use sorted()
try: try:
size = len(iterable) size = len(iterable)
except (TypeError, AttributeError): except (TypeError, AttributeError):
@ -406,7 +406,7 @@ def nlargest(n, iterable, key=None):
return [max(chain(head, it))] return [max(chain(head, it))]
return [max(chain(head, it), key=key)] return [max(chain(head, it), key=key)]
# When n>=size, it's faster to use sort() # When n>=size, it's faster to use sorted()
try: try:
size = len(iterable) size = len(iterable)
except (TypeError, AttributeError): except (TypeError, AttributeError):

1
Lib/sysconfig.py
View file

@ -639,7 +639,6 @@ def get_platform():
m = re.search( m = re.search(
r'<key>ProductUserVisibleVersion</key>\s*' + r'<key>ProductUserVisibleVersion</key>\s*' +
r'<string>(.*?)</string>', f.read()) r'<string>(.*?)</string>', f.read())
f.close()
if m is not None: if m is not None:
macrelease = '.'.join(m.group(1).split('.')[:2]) macrelease = '.'.join(m.group(1).split('.')[:2])
# else: fall back to the default behaviour # else: fall back to the default behaviour