← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml4.py

  • Committer: Martin Pool
  • Date: 2008-04-24 07:22:53 UTC
  • mto: This revision was merged to the branch mainline in revision 3415.
  • Revision ID: mbp@sourcefrog.net-20080424072253-opmjij7xfy38w27f
Remove every assert statement from bzrlib!

Depending on the context they are:

 * turned into an explicit if/raise of either AssertionError 
   or something more specific -- particularly where they protect
   programming interfaces, complex invariants, or data file integrity
 * removed, if they're redundant with a later check, not protecting
   a meaningful invariant
 * turned into a selftest method on tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml4.py
50
50
        # for now, leaving them as null in the xml form.  in a future
51
51
        # version it will be implied by nested elements.
52
52
        if ie.parent_id != ROOT_ID:
53
 
            assert isinstance(ie.parent_id, basestring)
54
53
            e.set('parent_id', ie.parent_id)
55
54
 
56
55
        e.tail = '\n'
63
62
 
64
63
        :param revision_id: Ignored parameter used by xml5.
65
64
        """
66
 
        assert elt.tag == 'inventory'
67
65
        root_id = elt.get('file_id') or ROOT_ID
68
66
        inv = Inventory(root_id)
69
67
        for e in elt:
75
73
 
76
74
 
77
75
    def _unpack_entry(self, elt):
78
 
        assert elt.tag == 'entry'
79
 
 
80
76
        ## original format inventories don't have a parent_id for
81
77
        ## nodes in the root directory, but it's cleaner to use one
82
78
        ## internally.
133
129
            for i, parent_id in enumerate(rev.parents):
134
130
                p = SubElement(pelts, 'revision_ref')
135
131
                p.tail = '\n'
136
 
                assert parent_id
137
132
                p.set('revision_id', parent_id)
138
133
                if i < len(rev.parent_sha1s):
139
134
                    p.set('revision_sha1', rev.parent_sha1s[i])
161
156
 
162
157
        if pelts:
163
158
            for p in pelts:
164
 
                assert p.tag == 'revision_ref', \
165
 
                       "bad parent node tag %r" % p.tag
166
159
                rev.parent_ids.append(p.get('revision_id'))
167
160
                rev.parent_sha1s.append(p.get('revision_sha1'))
168
161
            if precursor:
169
162
                # must be consistent
170
163
                prec_parent = rev.parent_ids[0]
171
 
                assert prec_parent == precursor
172
164
        elif precursor:
173
165
            # revisions written prior to 0.0.5 have a single precursor
174
166
            # give as an attribute