diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-01-23 03:26:36 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-01-23 03:26:36 (GMT) |
| commit | aa069003471ab31c896cec807d7121c6a457aa0e (patch) | |
| tree | 717a52bb9f7fbc44b8e0a923f6daf818d19c8313 /Lib | |
| parent | 83b97306ae902d68baaf55b10d0be2a78150f41f (diff) | |
| download | cpython-aa069003471ab31c896cec807d7121c6a457aa0e.zip cpython-aa069003471ab31c896cec807d7121c6a457aa0e.tar.gz cpython-aa069003471ab31c896cec807d7121c6a457aa0e.tar.bz2 | |
Merged revisions 68750,68776-68777,68811,68842,68859 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68750 | benjamin.peterson | 2009-01-18 16:47:04 -0600 (Sun, 18 Jan 2009) | 1 line
fix encoding cookie case
........
r68776 | benjamin.peterson | 2009-01-19 10:17:54 -0600 (Mon, 19 Jan 2009) | 1 line
move BufferedIOBase into the base class section
........
r68777 | benjamin.peterson | 2009-01-19 10:18:27 -0600 (Mon, 19 Jan 2009) | 1 line
add email address
........
r68811 | benjamin.peterson | 2009-01-20 12:58:27 -0600 (Tue, 20 Jan 2009) | 1 line
fix url
........
r68842 | andrew.kuchling | 2009-01-20 20:16:26 -0600 (Tue, 20 Jan 2009) | 1 line
Markup fixes
........
r68859 | georg.brandl | 2009-01-22 12:29:28 -0600 (Thu, 22 Jan 2009) | 2 lines
Clarify wording.
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/heapq.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/heapq.py b/Lib/heapq.py index 24997bf..192e982 100644 --- a/Lib/heapq.py +++ b/Lib/heapq.py @@ -1,4 +1,4 @@ -# -*- coding: Latin-1 -*- +# -*- coding: latin-1 -*- """Heap queue algorithm (a.k.a. priority queue). |