Rev 5502: (vila) Unbreak pqm by commenting out the bogus use of doctest +SKIP in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Oct 15 14:10:24 BST 2010
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5502 [merge]
revision-id: pqm at pqm.ubuntu.com-20101015131023-suvvv7l9fmv8fjlj
parent: pqm at pqm.ubuntu.com-20101015113333-auzmqh8gqjkzlgg0
parent: v.ladeuil+lp at free.fr-20101015123500-iyqj7e0r62ie6qfy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-10-15 14:10:23 +0100
message:
(vila) Unbreak pqm by commenting out the bogus use of doctest +SKIP
not supported by python2.4 (Vincent Ladeuil)
modified:
bzrlib/pyutils.py pyutils.py-20100921013316-xm9ajurjifgh7zmd-1
=== modified file 'bzrlib/pyutils.py'
--- a/bzrlib/pyutils.py 2010-10-15 11:15:52 +0000
+++ b/bzrlib/pyutils.py 2010-10-15 12:35:00 +0000
@@ -63,18 +63,18 @@
"""Determine the 'parent' of a given dotted module name and (optional)
member name.
- Typical use is::
-
- >>> parent_mod, parent_member, final_attr = calc_parent_name(
- ... module_name, member_name) # doctest: +SKIP
- >>> parent_obj = get_named_object(parent_mod, parent_member)
- ... # doctest: +SKIP
-
The idea is that ``getattr(parent_obj, final_attr)`` will equal
get_named_object(module_name, member_name).
:return: (module_name, member_name, final_attr) tuple.
"""
+# +SKIP is not recognized by python2.4
+# Typical use is::
+#
+# >>> parent_mod, parent_member, final_attr = calc_parent_name(
+# ... module_name, member_name) # doctest: +SKIP
+# >>> parent_obj = get_named_object(parent_mod, parent_member)
+# ... # doctest: +SKIP
if member_name is not None:
split_name = member_name.rsplit('.', 1)
if len(split_name) == 1:
More information about the bazaar-commits
mailing list