Mailman 3 March 2010 - Python-checkins

r79527 - python/branches/release31-maint
by ezio.melotti 31 Mar '10

31 Mar '10

Author: ezio.melotti Date: Wed Mar 31 09:49:39 2010 New Revision: 79527 Log: Blocked revisions 79182 via svnmerge ................ r79182 | georg.brandl | 2010-03-21 11:51:44 +0200 (Sun, 21 Mar 2010) | 9 lines Merged revisions 79179 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79179 | georg.brandl | 2010-03-21 10:37:54 +0100 (So, 21 Mär 2010) | 1 line Mention inefficiency of lists as queues, add link to collections.deque discussion. ........ ................ Modified: python/branches/release31-maint/ (props changed)

1 0

r79526 - in python/branches/release31-maint: Doc/tutorial/datastructures.rst
by ezio.melotti 31 Mar '10

31 Mar '10

Author: ezio.melotti Date: Wed Mar 31 09:48:01 2010 New Revision: 79526 Log: Merged revisions 79525 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r79525 | ezio.melotti | 2010-03-31 10:45:32 +0300 (Wed, 31 Mar 2010) | 9 lines Merged revisions 79522 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79522 | ezio.melotti | 2010-03-31 10:26:24 +0300 (Wed, 31 Mar 2010) | 1 line Revert r79179 and merge r75584 to explain how to implement a queue using collection.deque instead of a list. ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/tutorial/datastructures.rst Modified: python/branches/release31-maint/Doc/tutorial/datastructures.rst ============================================================================== --- python/branches/release31-maint/Doc/tutorial/datastructures.rst (original) +++ python/branches/release31-maint/Doc/tutorial/datastructures.rst Wed Mar 31 09:48:01 2010 @@ -137,21 +137,25 @@ .. sectionauthor:: Ka-Ping Yee <ping(a)lfw.org> +It is also possible to use a list as a queue, where the first element added is +the first element retrieved ("first-in, first-out"); however, lists are not +efficient for this purpose. While appends and pops from the end of list are +fast, doing inserts or pops from the beginning of a list is slow (because all +of the other elements have to be shifted by one). -You can also use a list conveniently as a queue, where the first element added -is the first element retrieved ("first-in, first-out"). To add an item to the -back of the queue, use :meth:`append`. To retrieve an item from the front of -the queue, use :meth:`pop` with ``0`` as the index. For example:: +To implement a queue, use :class:`collections.deque` which was designed to +have fast appends and pops from both ends. For example:: - >>> queue = ["Eric", "John", "Michael"] + >>> from collections import deque + >>> queue = deque(["Eric", "John", "Michael"]) >>> queue.append("Terry") # Terry arrives >>> queue.append("Graham") # Graham arrives - >>> queue.pop(0) + >>> queue.popleft() # The first to arrive now leaves 'Eric' - >>> queue.pop(0) + >>> queue.popleft() # The second to arrive now leaves 'John' - >>> queue - ['Michael', 'Terry', 'Graham'] + >>> queue # Remaining queue in order of arrival + deque(['Michael', 'Terry', 'Graham']) .. _tut-listcomps:

1 0

r79525 - in python/branches/py3k: Doc/tutorial/datastructures.rst
by ezio.melotti 31 Mar '10

31 Mar '10

Author: ezio.melotti Date: Wed Mar 31 09:45:32 2010 New Revision: 79525 Log: Merged revisions 79522 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79522 | ezio.melotti | 2010-03-31 10:26:24 +0300 (Wed, 31 Mar 2010) | 1 line Revert r79179 and merge r75584 to explain how to implement a queue using collection.deque instead of a list. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Doc/tutorial/datastructures.rst Modified: python/branches/py3k/Doc/tutorial/datastructures.rst ============================================================================== --- python/branches/py3k/Doc/tutorial/datastructures.rst (original) +++ python/branches/py3k/Doc/tutorial/datastructures.rst Wed Mar 31 09:45:32 2010 @@ -137,26 +137,25 @@ .. sectionauthor:: Ka-Ping Yee <ping(a)lfw.org> +It is also possible to use a list as a queue, where the first element added is +the first element retrieved ("first-in, first-out"); however, lists are not +efficient for this purpose. While appends and pops from the end of list are +fast, doing inserts or pops from the beginning of a list is slow (because all +of the other elements have to be shifted by one). -You can also use a list conveniently as a queue, where the first element added -is the first element retrieved ("first-in, first-out"). To add an item to the -back of the queue, use :meth:`append`. To retrieve an item from the front of -the queue, use :meth:`pop` with ``0`` as the index. For example:: +To implement a queue, use :class:`collections.deque` which was designed to +have fast appends and pops from both ends. For example:: - >>> queue = ["Eric", "John", "Michael"] + >>> from collections import deque + >>> queue = deque(["Eric", "John", "Michael"]) >>> queue.append("Terry") # Terry arrives >>> queue.append("Graham") # Graham arrives - >>> queue.pop(0) + >>> queue.popleft() # The first to arrive now leaves 'Eric' - >>> queue.pop(0) + >>> queue.popleft() # The second to arrive now leaves 'John' - >>> queue - ['Michael', 'Terry', 'Graham'] - -However, since lists are implemented as an array of elements, they are not the -optimal data structure to use as a queue (the ``pop(0)`` needs to move all -following elements). See :ref:`tut-list-tools` for a look at -:class:`collections.deque`, which is designed to work efficiently as a queue. + >>> queue # Remaining queue in order of arrival + deque(['Michael', 'Terry', 'Graham']) .. _tut-listcomps:

1 0

r79524 - python/branches/release26-maint/Doc/tutorial/datastructures.rst
by ezio.melotti 31 Mar '10

31 Mar '10

Author: ezio.melotti Date: Wed Mar 31 09:39:45 2010 New Revision: 79524 Log: Remove paragraph about inefficiency of lists used as queues now that the example uses deque. Modified: python/branches/release26-maint/Doc/tutorial/datastructures.rst Modified: python/branches/release26-maint/Doc/tutorial/datastructures.rst ============================================================================== --- python/branches/release26-maint/Doc/tutorial/datastructures.rst (original) +++ python/branches/release26-maint/Doc/tutorial/datastructures.rst Wed Mar 31 09:39:45 2010 @@ -158,11 +158,6 @@ >>> queue # Remaining queue in order of arrival deque(['Michael', 'Terry', 'Graham']) -However, since lists are implemented as an array of elements, they are not the -optimal data structure to use as a queue (the ``pop(0)`` needs to move all -following elements). See :ref:`tut-list-tools` for a look at -:class:`collections.deque`, which is designed to work efficiently as a queue. - .. _tut-functional:

1 0

r79523 - python/branches/release26-maint
by ezio.melotti 31 Mar '10

31 Mar '10

Author: ezio.melotti Date: Wed Mar 31 09:32:22 2010 New Revision: 79523 Log: Blocked revisions 79522 via svnmerge ........ r79522 | ezio.melotti | 2010-03-31 10:26:24 +0300 (Wed, 31 Mar 2010) | 1 line Revert r79179 and merge r75584 to explain how to implement a queue using collection.deque instead of a list. ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r79522 - python/trunk/Doc/tutorial/datastructures.rst
by ezio.melotti 31 Mar '10

31 Mar '10

Author: ezio.melotti Date: Wed Mar 31 09:26:24 2010 New Revision: 79522 Log: Revert r79179 and merge r75584 to explain how to implement a queue using collection.deque instead of a list. Modified: python/trunk/Doc/tutorial/datastructures.rst Modified: python/trunk/Doc/tutorial/datastructures.rst ============================================================================== --- python/trunk/Doc/tutorial/datastructures.rst (original) +++ python/trunk/Doc/tutorial/datastructures.rst Wed Mar 31 09:26:24 2010 @@ -138,26 +138,25 @@ .. sectionauthor:: Ka-Ping Yee <ping(a)lfw.org> +It is also possible to use a list as a queue, where the first element added is +the first element retrieved ("first-in, first-out"); however, lists are not +efficient for this purpose. While appends and pops from the end of list are +fast, doing inserts or pops from the beginning of a list is slow (because all +of the other elements have to be shifted by one). -You can also use a list conveniently as a queue, where the first element added -is the first element retrieved ("first-in, first-out"). To add an item to the -back of the queue, use :meth:`append`. To retrieve an item from the front of -the queue, use :meth:`pop` with ``0`` as the index. For example:: +To implement a queue, use :class:`collections.deque` which was designed to +have fast appends and pops from both ends. For example:: - >>> queue = ["Eric", "John", "Michael"] + >>> from collections import deque + >>> queue = deque(["Eric", "John", "Michael"]) >>> queue.append("Terry") # Terry arrives >>> queue.append("Graham") # Graham arrives - >>> queue.pop(0) + >>> queue.popleft() # The first to arrive now leaves 'Eric' - >>> queue.pop(0) + >>> queue.popleft() # The second to arrive now leaves 'John' - >>> queue - ['Michael', 'Terry', 'Graham'] - -However, since lists are implemented as an array of elements, they are not the -optimal data structure to use as a queue (the ``pop(0)`` needs to move all -following elements). See :ref:`tut-list-tools` for a look at -:class:`collections.deque`, which is designed to work efficiently as a queue. + >>> queue # Remaining queue in order of arrival + deque(['Michael', 'Terry', 'Graham']) .. _tut-functional:

1 0

r79521 - in python/branches/release31-maint: Lib/pydoc.py Lib/test/test_pydoc.py
by brian.curtin 31 Mar '10

31 Mar '10

Author: brian.curtin Date: Wed Mar 31 05:22:46 2010 New Revision: 79521 Log: Merged revisions 79520 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r79520 | brian.curtin | 2010-03-30 22:19:28 -0500 (Tue, 30 Mar 2010) | 9 lines Merged revisions 79518 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79518 | brian.curtin | 2010-03-30 22:10:21 -0500 (Tue, 30 Mar 2010) | 2 lines Fix #8225. xml.etree was displaying an incorrect link when viewed in help. ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/pydoc.py python/branches/release31-maint/Lib/test/test_pydoc.py Modified: python/branches/release31-maint/Lib/pydoc.py ============================================================================== --- python/branches/release31-maint/Lib/pydoc.py (original) +++ python/branches/release31-maint/Lib/pydoc.py Wed Mar 31 05:22:46 2010 @@ -349,7 +349,8 @@ 'marshal', 'posix', 'signal', 'sys', '_thread', 'zipimport') or (file.startswith(basedir) and - not file.startswith(os.path.join(basedir, 'site-packages'))))): + not file.startswith(os.path.join(basedir, 'site-packages')))) and + object.__name__ not in ('xml.etree')): if docloc.startswith("http://"): docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__) else: Modified: python/branches/release31-maint/Lib/test/test_pydoc.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_pydoc.py (original) +++ python/branches/release31-maint/Lib/test/test_pydoc.py Wed Mar 31 05:22:46 2010 @@ -8,6 +8,7 @@ import inspect import unittest import test.support +import xml.etree from contextlib import contextmanager from test.support import TESTFN, forget, rmtree, EnvironmentVarGuard @@ -253,6 +254,11 @@ print_diffs(expected_text, result) self.fail("outputs are not equal, see diff above") + def test_issue8225(self): + # Test issue8225 to ensure no doc link appears for xml.etree + result, doc_loc = get_pydoc_text(xml.etree) + self.assertEqual(doc_loc, "", "MODULE DOCS incorrectly includes a link") + def test_not_here(self): missing_module = "test.i_am_not_here" result = str(run_pydoc(missing_module), 'ascii')

1 0

r79520 - in python/branches/py3k: Lib/pydoc.py Lib/test/test_pydoc.py
by brian.curtin 31 Mar '10

31 Mar '10

Author: brian.curtin Date: Wed Mar 31 05:19:28 2010 New Revision: 79520 Log: Merged revisions 79518 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79518 | brian.curtin | 2010-03-30 22:10:21 -0500 (Tue, 30 Mar 2010) | 2 lines Fix #8225. xml.etree was displaying an incorrect link when viewed in help. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/pydoc.py python/branches/py3k/Lib/test/test_pydoc.py Modified: python/branches/py3k/Lib/pydoc.py ============================================================================== --- python/branches/py3k/Lib/pydoc.py (original) +++ python/branches/py3k/Lib/pydoc.py Wed Mar 31 05:19:28 2010 @@ -349,7 +349,8 @@ 'marshal', 'posix', 'signal', 'sys', '_thread', 'zipimport') or (file.startswith(basedir) and - not file.startswith(os.path.join(basedir, 'site-packages'))))): + not file.startswith(os.path.join(basedir, 'site-packages')))) and + object.__name__ not in ('xml.etree')): if docloc.startswith("http://"): docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__) else: Modified: python/branches/py3k/Lib/test/test_pydoc.py ============================================================================== --- python/branches/py3k/Lib/test/test_pydoc.py (original) +++ python/branches/py3k/Lib/test/test_pydoc.py Wed Mar 31 05:19:28 2010 @@ -8,6 +8,7 @@ import inspect import unittest import test.support +import xml.etree from contextlib import contextmanager from test.support import ( TESTFN, forget, rmtree, EnvironmentVarGuard, reap_children) @@ -265,6 +266,11 @@ print_diffs(expected_text, result) self.fail("outputs are not equal, see diff above") + def test_issue8225(self): + # Test issue8225 to ensure no doc link appears for xml.etree + result, doc_loc = get_pydoc_text(xml.etree) + self.assertEqual(doc_loc, "", "MODULE DOCS incorrectly includes a link") + def test_not_here(self): missing_module = "test.i_am_not_here" result = str(run_pydoc(missing_module), 'ascii')

1 0

r79519 - in python/branches/release26-maint: Lib/pydoc.py Lib/test/test_pydoc.py
by brian.curtin 31 Mar '10

31 Mar '10

Author: brian.curtin Date: Wed Mar 31 05:14:27 2010 New Revision: 79519 Log: Merged revisions 79518 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79518 | brian.curtin | 2010-03-30 22:10:21 -0500 (Tue, 30 Mar 2010) | 2 lines Fix #8225. xml.etree was displaying an incorrect link when viewed in help. ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/pydoc.py python/branches/release26-maint/Lib/test/test_pydoc.py Modified: python/branches/release26-maint/Lib/pydoc.py ============================================================================== --- python/branches/release26-maint/Lib/pydoc.py (original) +++ python/branches/release26-maint/Lib/pydoc.py Wed Mar 31 05:14:27 2010 @@ -356,7 +356,8 @@ 'marshal', 'posix', 'signal', 'sys', 'thread', 'zipimport') or (file.startswith(basedir) and - not file.startswith(os.path.join(basedir, 'site-packages'))))): + not file.startswith(os.path.join(basedir, 'site-packages')))) and + object.__name__ not in ('xml.etree')): if docloc.startswith("http://"): docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__) else: Modified: python/branches/release26-maint/Lib/test/test_pydoc.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_pydoc.py (original) +++ python/branches/release26-maint/Lib/test/test_pydoc.py Wed Mar 31 05:14:27 2010 @@ -7,6 +7,7 @@ import pydoc import inspect import unittest +import xml.etree import test.test_support from contextlib import contextmanager from test.test_support import TESTFN, forget, rmtree, EnvironmentVarGuard @@ -236,6 +237,11 @@ print_diffs(expected_text, result) self.fail("outputs are not equal, see diff above") + def test_issue8225(self): + # Test issue8225 to ensure no doc link appears for xml.etree + result, doc_loc = get_pydoc_text(xml.etree) + self.assertEqual(doc_loc, "", "MODULE DOCS incorrectly includes a link") + def test_not_here(self): missing_module = "test.i_am_not_here" result = run_pydoc(missing_module)

1 0

r79518 - in python/trunk/Lib: pydoc.py test/test_pydoc.py
by brian.curtin 31 Mar '10

31 Mar '10

Author: brian.curtin Date: Wed Mar 31 05:10:21 2010 New Revision: 79518 Log: Fix #8225. xml.etree was displaying an incorrect link when viewed in help. Modified: python/trunk/Lib/pydoc.py python/trunk/Lib/test/test_pydoc.py Modified: python/trunk/Lib/pydoc.py ============================================================================== --- python/trunk/Lib/pydoc.py (original) +++ python/trunk/Lib/pydoc.py Wed Mar 31 05:10:21 2010 @@ -356,7 +356,8 @@ 'marshal', 'posix', 'signal', 'sys', 'thread', 'zipimport') or (file.startswith(basedir) and - not file.startswith(os.path.join(basedir, 'site-packages'))))): + not file.startswith(os.path.join(basedir, 'site-packages')))) and + object.__name__ not in ('xml.etree')): if docloc.startswith("http://"): docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__) else: Modified: python/trunk/Lib/test/test_pydoc.py ============================================================================== --- python/trunk/Lib/test/test_pydoc.py (original) +++ python/trunk/Lib/test/test_pydoc.py Wed Mar 31 05:10:21 2010 @@ -7,6 +7,7 @@ import pydoc import inspect import unittest +import xml.etree import test.test_support from contextlib import contextmanager from test.test_support import ( @@ -244,6 +245,11 @@ print_diffs(expected_text, result) self.fail("outputs are not equal, see diff above") + def test_issue8225(self): + # Test issue8225 to ensure no doc link appears for xml.etree + result, doc_loc = get_pydoc_text(xml.etree) + self.assertEqual(doc_loc, "", "MODULE DOCS incorrectly includes a link") + def test_not_here(self): missing_module = "test.i_am_not_here" result = run_pydoc(missing_module)

1 0