diff -Nru bzr-xmloutput-0.8.8+bzr160/cmds.py bzr-xmloutput-0.8.8+bzr162/cmds.py --- bzr-xmloutput-0.8.8+bzr160/cmds.py 2011-12-12 15:11:38.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/cmds.py 2012-02-21 10:05:57.000000000 +0000 @@ -163,7 +163,7 @@ if file_id is None: raise bzrlib.errors.NotVersionedError(filename) - file_version = tree.inventory[file_id].revision + file_version = tree.get_file_revision(file_id) # always run with --all and --long options # to get the author of each line annotate_file_xml(branch=branch, rev_id=file_version, diff -Nru bzr-xmloutput-0.8.8+bzr160/debian/changelog bzr-xmloutput-0.8.8+bzr162/debian/changelog --- bzr-xmloutput-0.8.8+bzr160/debian/changelog 2012-03-11 10:20:32.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/debian/changelog 2012-07-25 19:58:34.000000000 +0000 @@ -1,8 +1,30 @@ -bzr-xmloutput (0.8.8+bzr160-2~bazaar1~lucid1) lucid; urgency=low +bzr-xmloutput (0.8.8+bzr162-3~bazaar1~lucid1) lucid; urgency=low * Rebuild in PPA. - -- Max Bowsher <_@maxb.eu> Sun, 11 Mar 2012 10:20:32 +0000 + -- Max Bowsher <_@maxb.eu> Wed, 25 Jul 2012 20:58:34 +0100 + +bzr-xmloutput (0.8.8+bzr162-3) unstable; urgency=low + + * Orphan package. + + -- Jelmer Vernooij Tue, 29 May 2012 00:02:20 +0200 + +bzr-xmloutput (0.8.8+bzr162-2) unstable; urgency=low + + * Add workaround to avoid bzrlib.tree.tree_files, which has disappeared in + bzr 2.6. Closes: #666630 + + -- Jelmer Vernooij Thu, 22 Mar 2012 13:25:18 +0100 + +bzr-xmloutput (0.8.8+bzr162-1) unstable; urgency=low + + * New upstream snapshot. + + Drop all patches, now applied upstream. + * Use machine-parseable copyright file format. + * Bump standards version to 3.9.3 (no changes). + + -- Jelmer Vernooij Wed, 14 Mar 2012 19:49:50 +0100 bzr-xmloutput (0.8.8+bzr160-2) unstable; urgency=low diff -Nru bzr-xmloutput-0.8.8+bzr160/debian/control bzr-xmloutput-0.8.8+bzr162/debian/control --- bzr-xmloutput-0.8.8+bzr160/debian/control 2011-10-02 08:07:10.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/debian/control 2012-05-28 22:02:16.000000000 +0000 @@ -1,15 +1,14 @@ Source: bzr-xmloutput Section: vcs Priority: optional -Maintainer: Debian Bazaar Maintainers -Uploaders: Jelmer Vernooij Homepage: https://launchpad.net/bzr-xmloutput +Maintainer: Debian QA Group Build-Depends-Indep: bzr (>= 1.0), python-bzrlib.tests | bzr (<< 2.4.0~beta1-2) Build-Depends: debhelper (>= 7.0.50~), locales, python (>= 2.6.6-3), python-testtools -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 X-Python-Version: >= 2.4 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-xmloutput/unstable/ diff -Nru bzr-xmloutput-0.8.8+bzr160/debian/copyright bzr-xmloutput-0.8.8+bzr162/debian/copyright --- bzr-xmloutput-0.8.8+bzr160/debian/copyright 2011-10-02 08:07:10.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/debian/copyright 2012-03-14 18:49:21.000000000 +0000 @@ -1,9 +1,9 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=143 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: bzr-xmloutput +Upstream-Contact: Guillermo Gonzalez Debianized-By: Jelmer Vernooij Debianized-Date: Sat Aug 02 05:03:25 CEST 2008 - -It was downloaded from http://launchpad.net/bzr-xmloutput +Source: http://launchpad.net/bzr-xmloutput Files: * Copyright: Copyright (C) 2007-2008 Guillermo Gonzalez @@ -17,13 +17,12 @@ Files: extras/* Copyright: Copyright (C) 2007 Lukáš Lalinský -Copyright: Copyright (C) 2008 Guillermo Gonzalez +Copyright: Copyright (C) 2008 Guillermo Gonzalez Copyright: Copyright (C) 2007 Alexander Belchenko License: GPL-2+ On Debian systems, the full text of the GPL version 2 can be found in /usr/share/common-licenses/GPL-2 -X-Debian-Comment: These files are not installed on Debian, as they are +Comment: These files are not installed on Debian, as they are part of the Windows installer. Files: debian/* diff -Nru bzr-xmloutput-0.8.8+bzr160/debian/patches/01_no_inventory bzr-xmloutput-0.8.8+bzr162/debian/patches/01_no_inventory --- bzr-xmloutput-0.8.8+bzr160/debian/patches/01_no_inventory 2012-02-21 10:27:07.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/debian/patches/01_no_inventory 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -Description: Avoid direct access to inventories (deprecated in bzr 2.6). -Origin: commit, revision id: jelmer@samba.org-20120221100557-dqfwsv5vej9g2l2x -Author: Jelmer Vernooij -Last-Update: 2012-02-21 -Applied-Upstream: no -X-Bzr-Revision-Id: jelmer@samba.org-20120221100557-dqfwsv5vej9g2l2x - -=== modified file 'cmds.py' ---- old/cmds.py 2011-12-12 15:11:38 +0000 -+++ new/cmds.py 2012-02-21 10:05:57 +0000 -@@ -163,7 +163,7 @@ - if file_id is None: - raise bzrlib.errors.NotVersionedError(filename) - -- file_version = tree.inventory[file_id].revision -+ file_version = tree.get_file_revision(file_id) - # always run with --all and --long options - # to get the author of each line - annotate_file_xml(branch=branch, rev_id=file_version, - -=== modified file 'infoxml.py' ---- old/infoxml.py 2011-12-12 15:11:38 +0000 -+++ new/infoxml.py 2012-02-21 10:05:57 +0000 -@@ -216,7 +216,6 @@ - """Show missing revisions in working tree.""" - branch = working.branch - basis = working.basis_tree() -- work_inv = working.inventory - branch_revno, branch_last_revision = branch.last_revision_info() - try: - tree_last_id = working.get_parent_ids()[0] -@@ -233,7 +232,6 @@ - def _show_working_stats_xml(working, outfile): - """Show statistics about a working tree.""" - basis = working.basis_tree() -- work_inv = working.inventory - delta = working.changes_from(basis, want_unchanged=True) - - outfile.write('') -@@ -254,9 +252,8 @@ - outfile.write('%d' % ignore_cnt) - - dir_cnt = 0 -- for file_id in work_inv: -- if (work_inv.get_file_kind(file_id) == 'directory' and -- not work_inv.is_root(file_id)): -+ for path, entry in working.iter_entries_by_dir(): -+ if entry.kind == 'directory' and entry.parent_id is not None: - dir_cnt += 1 - outfile.write('%d' % - (dir_cnt)) - diff -Nru bzr-xmloutput-0.8.8+bzr160/debian/patches/02_elementtree bzr-xmloutput-0.8.8+bzr162/debian/patches/02_elementtree --- bzr-xmloutput-0.8.8+bzr160/debian/patches/02_elementtree 2012-02-21 10:29:00.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/debian/patches/02_elementtree 1970-01-01 00:00:00.000000000 +0000 @@ -1,129 +0,0 @@ -Origin: commit, revision id: jelmer@samba.org-20120221101416-t8d0yp7omic40qqt -Author: Jelmer Vernooij -Description: Use correct elementtree -Last-Update: 2012-02-21 -Applied-Upstream: no -X-Bzr-Revision-Id: jelmer@samba.org-20120221101416-t8d0yp7omic40qqt - -=== modified file 'tests/elementtree_builder.py' ---- old/tests/elementtree_builder.py 2007-11-26 02:21:31 +0000 -+++ new/tests/elementtree_builder.py 2012-02-21 10:14:16 +0000 -@@ -1,7 +1,7 @@ - --from bzrlib.xml_serializer import elementtree as elementtree -+from bzrlib.xml_serializer import elementtree - --ET = elementtree.ElementTree -+ET = elementtree - - class _E(object): - """ This is the E factory, taken from http://effbot.org/zone/element-builder.htm """ - -=== modified file 'tests/test_annotate_xml.py' ---- old/tests/test_annotate_xml.py 2009-09-23 03:29:47 +0000 -+++ new/tests/test_annotate_xml.py 2012-02-21 10:14:16 +0000 -@@ -30,7 +30,7 @@ - - from bzrlib.tests import TestCaseWithTransport - from bzrlib.xml_serializer import elementtree as elementtree --fromstring = elementtree.ElementTree.fromstring -+fromstring = elementtree.fromstring - - class TestXmlAnnotate(TestCaseWithTransport): - -@@ -91,7 +91,8 @@ - self.assertEqualDiff(expected_xml, out) - expected_elementtree = fromstring(expected_xml) - current_elementtree = fromstring(out) -- self.assertEquals(elementtree.ElementTree.tostring(expected_elementtree), elementtree.ElementTree.tostring(current_elementtree)) -+ self.assertEquals(elementtree.tostring(expected_elementtree), -+ elementtree.tostring(current_elementtree)) - - def test_xmlannotate_cmd_show_ids(self): - out, err = self.run_bzr('xmlannotate hello.txt --show-ids') - -=== modified file 'tests/test_log_xml.py' ---- old/tests/test_log_xml.py 2009-09-23 03:29:47 +0000 -+++ new/tests/test_log_xml.py 2012-02-21 10:14:16 +0000 -@@ -26,8 +26,8 @@ - from bzrlib.tests.blackbox import ExternalBase - from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport - from bzrlib.xml_serializer import elementtree as elementtree --fromstring = elementtree.ElementTree.fromstring --elementtree_tostring = elementtree.ElementTree.tostring -+fromstring = elementtree.fromstring -+elementtree_tostring = elementtree.tostring - - class TestLog(ExternalBase): - - -=== modified file 'tests/test_ls_xml.py' ---- old/tests/test_ls_xml.py 2011-10-16 23:56:35 +0000 -+++ new/tests/test_ls_xml.py 2012-02-21 10:14:16 +0000 -@@ -21,7 +21,7 @@ - from bzrlib import ignores - from bzrlib.tests import TestCaseWithTransport - from bzrlib.xml_serializer import elementtree as elementtree --fromstring = elementtree.ElementTree.fromstring -+fromstring = elementtree.fromstring - - - class TestLSXML(TestCaseWithTransport): - -=== modified file 'tests/test_status_xml.py' ---- old/tests/test_status_xml.py 2010-03-26 03:38:04 +0000 -+++ new/tests/test_status_xml.py 2012-02-21 10:14:16 +0000 -@@ -38,13 +38,11 @@ - from bzrlib.osutils import pathjoin - from bzrlib.revisionspec import RevisionSpec - from bzrlib.tests import TestCaseWithTransport, TestSkipped --from bzrlib.workingtree import WorkingTree - from bzrlib.xml_serializer import elementtree as elementtree - - import bzrlib.plugin --from bzrlib.status import show_tree_status --fromstring = elementtree.ElementTree.fromstring --from elementtree_builder import (ET, _E) -+fromstring = elementtree.fromstring -+from elementtree_builder import _E - - ## little hack to load functions from parent module - show_tree_status_xml = None -@@ -322,8 +320,9 @@ - self.assertEquals(result.findall('unknown/file')[0].text, "world.txt") - - result2 = fromstring(self.run_bzr("xmlstatus -r 0..")[0]) -- self.assertEquals(elementtree.ElementTree.tostring(result2), -- elementtree.ElementTree.tostring(result)) -+ self.assertEquals( -+ elementtree.tostring(result2), -+ elementtree.tostring(result)) - - def test_statusxml_versioned(self): - tree = self.make_branch_and_tree('.') -@@ -346,8 +345,9 @@ - self.assert_(len(result.findall('unknown/*')) == 0) - - result2 = fromstring(self.run_bzr("xmlstatus --versioned -r 0..")[0]) -- self.assertEquals(elementtree.ElementTree.tostring(result2), -- elementtree.ElementTree.tostring(result)) -+ self.assertEquals( -+ elementtree.tostring(result2), -+ elementtree.tostring(result)) - - # Not yet implemneted - #def assertStatusContains(self, xpath): - -=== modified file 'tests/test_version_xml.py' ---- old/tests/test_version_xml.py 2011-03-09 22:58:39 +0000 -+++ new/tests/test_version_xml.py 2012-02-21 10:14:16 +0000 -@@ -27,7 +27,7 @@ - ) - - from bzrlib.xml_serializer import elementtree as elementtree --fromstring = elementtree.ElementTree.fromstring -+fromstring = elementtree.fromstring - - from bzrlib.plugins.xmloutput import versionxml - - diff -Nru bzr-xmloutput-0.8.8+bzr160/debian/patches/03_info_controldir bzr-xmloutput-0.8.8+bzr162/debian/patches/03_info_controldir --- bzr-xmloutput-0.8.8+bzr160/debian/patches/03_info_controldir 2012-02-21 10:29:29.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/debian/patches/03_info_controldir 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Origin: commit, revision id: jelmer@samba.org-20120221101857-e77da9mh3ytjrh6f -Author: Jelmer Vernooij -Description: Fix 'bzr xmlinfo' in empty control directories -Last-Update: 2012-02-21 -Applied-Upstream: no -X-Bzr-Revision-Id: jelmer@samba.org-20120221101857-e77da9mh3ytjrh6f - -=== modified file 'infoxml.py' ---- old/infoxml.py 2011-12-12 15:11:38 +0000 -+++ new/infoxml.py 2012-02-21 10:18:57 +0000 -@@ -102,7 +102,7 @@ - verbose = 1 - if verbose is True: - verbose = 2 -- layout = info.describe_layout(repository, branch, working) -+ layout = info.describe_layout(repository, branch, working, control) - formats = info.describe_format(control, repository, - branch, working).split(' or ') - outfile.write('%s' % layout) - diff -Nru bzr-xmloutput-0.8.8+bzr160/debian/patches/04_no_revision_history bzr-xmloutput-0.8.8+bzr162/debian/patches/04_no_revision_history --- bzr-xmloutput-0.8.8+bzr160/debian/patches/04_no_revision_history 2012-02-21 10:26:24.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/debian/patches/04_no_revision_history 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -Description: Avoid deprecated Branch.revision_history(). -Origin: commit, revision id: jelmer@samba.org-20120221102451-9wz5wjb01drb0am4 -Author: Jelmer Vernooij -Last-Update: 2012-02-21 -Applied-Upstream: no -X-Bzr-Revision-Id: jelmer@samba.org-20120221102451-9wz5wjb01drb0am4 - -=== modified file 'tests/test_info_xml.py' ---- old/tests/test_info_xml.py 2011-10-16 23:56:35 +0000 -+++ new/tests/test_info_xml.py 2012-02-21 10:24:51 +0000 -@@ -135,7 +135,7 @@ - self.assertEqualDiff(expected_xml, out) - self.assertEqual('', err) - tree1.commit('commit one') -- rev = branch1.repository.get_revision(branch1.revision_history()[0]) -+ rev = branch1.repository.get_revision(branch1.last_revision()) - datestring_first = osutils.format_date(rev.timestamp, rev.timezone) - - # Branch standalone with push location -@@ -670,7 +670,7 @@ - self.build_tree(['tree/lightcheckout/a']) - tree2.add('a') - tree2.commit('commit one') -- rev = repo.get_revision(branch2.revision_history()[0]) -+ rev = repo.get_revision(branch2.last_revision()) - datestring_first = osutils.format_date(rev.timestamp, rev.timezone) - out, err = self.run_bzr('xmlinfo tree/lightcheckout --verbose') - expected_xml = ''' -@@ -1010,7 +1010,7 @@ - tree1 = branch1.bzrdir.open_workingtree() - tree1.add('a') - tree1.commit('commit one') -- rev = repo.get_revision(branch1.revision_history()[0]) -+ rev = repo.get_revision(branch1.last_revision()) - datestring_first = osutils.format_date(rev.timestamp, rev.timezone) - out, err = self.run_bzr('xmlinfo -v repo/branch1') - expected_xml = ''' - diff -Nru bzr-xmloutput-0.8.8+bzr160/debian/patches/2.6_compat bzr-xmloutput-0.8.8+bzr162/debian/patches/2.6_compat --- bzr-xmloutput-0.8.8+bzr160/debian/patches/2.6_compat 1970-01-01 00:00:00.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/debian/patches/2.6_compat 2012-03-22 12:24:40.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Avoid using removed builtins.tree_files. +Origin: commit, revision id: jelmer@samba.org-20120322122317-s4w1qotbysg7sgxg +Author: Jelmer Vernooij +Last-Update: 2012-03-22 +Applied-Upstream: no +X-Bzr-Revision-Id: jelmer@samba.org-20120322122317-s4w1qotbysg7sgxg + +=== modified file 'cmds.py' +--- old/cmds.py 2012-02-21 10:05:57 +0000 ++++ new/cmds.py 2012-03-22 12:23:17 +0000 +@@ -109,7 +109,8 @@ + @handle_error_xml + def run(self, file_list=None, revision=None, versioned=False, null=False): + from statusxml import show_tree_status_xml +- tree, file_list = builtins.tree_files(file_list) ++ from bzrlib.workingtree import WorkingTree ++ tree, file_list = WorkingTree.open_containing_paths(file_list) + to_file = self.outf + if to_file is None: + to_file = sys.stdout + diff -Nru bzr-xmloutput-0.8.8+bzr160/debian/patches/series bzr-xmloutput-0.8.8+bzr162/debian/patches/series --- bzr-xmloutput-0.8.8+bzr160/debian/patches/series 2012-02-21 10:29:42.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/debian/patches/series 2012-03-22 12:24:49.000000000 +0000 @@ -1,4 +1 @@ -01_no_inventory -02_elementtree -03_info_controldir -04_no_revision_history +2.6_compat diff -Nru bzr-xmloutput-0.8.8+bzr160/infoxml.py bzr-xmloutput-0.8.8+bzr162/infoxml.py --- bzr-xmloutput-0.8.8+bzr160/infoxml.py 2011-12-12 15:11:38.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/infoxml.py 2012-02-21 10:18:57.000000000 +0000 @@ -102,7 +102,7 @@ verbose = 1 if verbose is True: verbose = 2 - layout = info.describe_layout(repository, branch, working) + layout = info.describe_layout(repository, branch, working, control) formats = info.describe_format(control, repository, branch, working).split(' or ') outfile.write('%s' % layout) @@ -216,7 +216,6 @@ """Show missing revisions in working tree.""" branch = working.branch basis = working.basis_tree() - work_inv = working.inventory branch_revno, branch_last_revision = branch.last_revision_info() try: tree_last_id = working.get_parent_ids()[0] @@ -233,7 +232,6 @@ def _show_working_stats_xml(working, outfile): """Show statistics about a working tree.""" basis = working.basis_tree() - work_inv = working.inventory delta = working.changes_from(basis, want_unchanged=True) outfile.write('') @@ -254,9 +252,8 @@ outfile.write('%d' % ignore_cnt) dir_cnt = 0 - for file_id in work_inv: - if (work_inv.get_file_kind(file_id) == 'directory' and - not work_inv.is_root(file_id)): + for path, entry in working.iter_entries_by_dir(): + if entry.kind == 'directory' and entry.parent_id is not None: dir_cnt += 1 outfile.write('%d' % (dir_cnt)) diff -Nru bzr-xmloutput-0.8.8+bzr160/tests/elementtree_builder.py bzr-xmloutput-0.8.8+bzr162/tests/elementtree_builder.py --- bzr-xmloutput-0.8.8+bzr160/tests/elementtree_builder.py 2007-11-26 02:21:31.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/tests/elementtree_builder.py 2012-02-21 10:14:16.000000000 +0000 @@ -1,7 +1,7 @@ -from bzrlib.xml_serializer import elementtree as elementtree +from bzrlib.xml_serializer import elementtree -ET = elementtree.ElementTree +ET = elementtree class _E(object): """ This is the E factory, taken from http://effbot.org/zone/element-builder.htm """ diff -Nru bzr-xmloutput-0.8.8+bzr160/tests/test_annotate_xml.py bzr-xmloutput-0.8.8+bzr162/tests/test_annotate_xml.py --- bzr-xmloutput-0.8.8+bzr160/tests/test_annotate_xml.py 2009-09-23 03:29:47.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/tests/test_annotate_xml.py 2012-02-21 10:14:16.000000000 +0000 @@ -30,7 +30,7 @@ from bzrlib.tests import TestCaseWithTransport from bzrlib.xml_serializer import elementtree as elementtree -fromstring = elementtree.ElementTree.fromstring +fromstring = elementtree.fromstring class TestXmlAnnotate(TestCaseWithTransport): @@ -91,7 +91,8 @@ self.assertEqualDiff(expected_xml, out) expected_elementtree = fromstring(expected_xml) current_elementtree = fromstring(out) - self.assertEquals(elementtree.ElementTree.tostring(expected_elementtree), elementtree.ElementTree.tostring(current_elementtree)) + self.assertEquals(elementtree.tostring(expected_elementtree), + elementtree.tostring(current_elementtree)) def test_xmlannotate_cmd_show_ids(self): out, err = self.run_bzr('xmlannotate hello.txt --show-ids') diff -Nru bzr-xmloutput-0.8.8+bzr160/tests/test_info_xml.py bzr-xmloutput-0.8.8+bzr162/tests/test_info_xml.py --- bzr-xmloutput-0.8.8+bzr160/tests/test_info_xml.py 2011-10-16 23:56:35.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/tests/test_info_xml.py 2012-02-21 10:24:51.000000000 +0000 @@ -135,7 +135,7 @@ self.assertEqualDiff(expected_xml, out) self.assertEqual('', err) tree1.commit('commit one') - rev = branch1.repository.get_revision(branch1.revision_history()[0]) + rev = branch1.repository.get_revision(branch1.last_revision()) datestring_first = osutils.format_date(rev.timestamp, rev.timezone) # Branch standalone with push location @@ -670,7 +670,7 @@ self.build_tree(['tree/lightcheckout/a']) tree2.add('a') tree2.commit('commit one') - rev = repo.get_revision(branch2.revision_history()[0]) + rev = repo.get_revision(branch2.last_revision()) datestring_first = osutils.format_date(rev.timestamp, rev.timezone) out, err = self.run_bzr('xmlinfo tree/lightcheckout --verbose') expected_xml = ''' @@ -1010,7 +1010,7 @@ tree1 = branch1.bzrdir.open_workingtree() tree1.add('a') tree1.commit('commit one') - rev = repo.get_revision(branch1.revision_history()[0]) + rev = repo.get_revision(branch1.last_revision()) datestring_first = osutils.format_date(rev.timestamp, rev.timezone) out, err = self.run_bzr('xmlinfo -v repo/branch1') expected_xml = ''' diff -Nru bzr-xmloutput-0.8.8+bzr160/tests/test_log_xml.py bzr-xmloutput-0.8.8+bzr162/tests/test_log_xml.py --- bzr-xmloutput-0.8.8+bzr160/tests/test_log_xml.py 2009-09-23 03:29:47.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/tests/test_log_xml.py 2012-02-21 10:14:16.000000000 +0000 @@ -26,8 +26,8 @@ from bzrlib.tests.blackbox import ExternalBase from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport from bzrlib.xml_serializer import elementtree as elementtree -fromstring = elementtree.ElementTree.fromstring -elementtree_tostring = elementtree.ElementTree.tostring +fromstring = elementtree.fromstring +elementtree_tostring = elementtree.tostring class TestLog(ExternalBase): diff -Nru bzr-xmloutput-0.8.8+bzr160/tests/test_ls_xml.py bzr-xmloutput-0.8.8+bzr162/tests/test_ls_xml.py --- bzr-xmloutput-0.8.8+bzr160/tests/test_ls_xml.py 2011-10-16 23:56:35.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/tests/test_ls_xml.py 2012-02-21 10:14:16.000000000 +0000 @@ -21,7 +21,7 @@ from bzrlib import ignores from bzrlib.tests import TestCaseWithTransport from bzrlib.xml_serializer import elementtree as elementtree -fromstring = elementtree.ElementTree.fromstring +fromstring = elementtree.fromstring class TestLSXML(TestCaseWithTransport): diff -Nru bzr-xmloutput-0.8.8+bzr160/tests/test_status_xml.py bzr-xmloutput-0.8.8+bzr162/tests/test_status_xml.py --- bzr-xmloutput-0.8.8+bzr160/tests/test_status_xml.py 2010-03-26 03:38:04.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/tests/test_status_xml.py 2012-02-21 10:14:16.000000000 +0000 @@ -38,13 +38,11 @@ from bzrlib.osutils import pathjoin from bzrlib.revisionspec import RevisionSpec from bzrlib.tests import TestCaseWithTransport, TestSkipped -from bzrlib.workingtree import WorkingTree from bzrlib.xml_serializer import elementtree as elementtree import bzrlib.plugin -from bzrlib.status import show_tree_status -fromstring = elementtree.ElementTree.fromstring -from elementtree_builder import (ET, _E) +fromstring = elementtree.fromstring +from elementtree_builder import _E ## little hack to load functions from parent module show_tree_status_xml = None @@ -322,8 +320,9 @@ self.assertEquals(result.findall('unknown/file')[0].text, "world.txt") result2 = fromstring(self.run_bzr("xmlstatus -r 0..")[0]) - self.assertEquals(elementtree.ElementTree.tostring(result2), - elementtree.ElementTree.tostring(result)) + self.assertEquals( + elementtree.tostring(result2), + elementtree.tostring(result)) def test_statusxml_versioned(self): tree = self.make_branch_and_tree('.') @@ -346,8 +345,9 @@ self.assert_(len(result.findall('unknown/*')) == 0) result2 = fromstring(self.run_bzr("xmlstatus --versioned -r 0..")[0]) - self.assertEquals(elementtree.ElementTree.tostring(result2), - elementtree.ElementTree.tostring(result)) + self.assertEquals( + elementtree.tostring(result2), + elementtree.tostring(result)) # Not yet implemneted #def assertStatusContains(self, xpath): diff -Nru bzr-xmloutput-0.8.8+bzr160/tests/test_version_xml.py bzr-xmloutput-0.8.8+bzr162/tests/test_version_xml.py --- bzr-xmloutput-0.8.8+bzr160/tests/test_version_xml.py 2011-03-09 22:58:39.000000000 +0000 +++ bzr-xmloutput-0.8.8+bzr162/tests/test_version_xml.py 2012-02-21 10:14:16.000000000 +0000 @@ -27,7 +27,7 @@ ) from bzrlib.xml_serializer import elementtree as elementtree -fromstring = elementtree.ElementTree.fromstring +fromstring = elementtree.fromstring from bzrlib.plugins.xmloutput import versionxml