/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/xml5.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml5.py
16
16
 
17
17
from __future__ import absolute_import
18
18
 
19
 
from .. import (
 
19
from bzrlib import (
20
20
    cache_utf8,
21
21
    errors,
22
 
    )
23
 
from . import (
24
22
    inventory,
25
23
    xml6,
26
24
    )
27
 
from .xml_serializer import (
 
25
from bzrlib.xml_serializer import (
28
26
    encode_and_escape,
29
27
    get_utf8_or_ascii,
30
28
    unpack_inventory_entry,
99
97
    def _append_inventory_root(self, append, inv):
100
98
        """Append the inventory root to output."""
101
99
        if inv.root.file_id not in (None, inventory.ROOT_ID):
102
 
            fileid1 = b' file_id="'
 
100
            fileid1 = ' file_id="'
103
101
            fileid2 = encode_and_escape(inv.root.file_id)
104
102
        else:
105
 
            fileid1 = b""
106
 
            fileid2 = b""
 
103
            fileid1 = ""
 
104
            fileid2 = ""
107
105
        if inv.revision_id is not None:
108
 
            revid1 = b' revision_id="'
 
106
            revid1 = ' revision_id="'
109
107
            revid2 = encode_and_escape(inv.revision_id)
110
108
        else:
111
 
            revid1 = b""
112
 
            revid2 = b""
113
 
        append(b'<inventory%s%s format="5"%s%s>\n' % (
 
109
            revid1 = ""
 
110
            revid2 = ""
 
111
        append('<inventory%s%s format="5"%s%s>\n' % (
114
112
            fileid1, fileid2, revid1, revid2))
115
113
 
116
114