← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Robert Collins
  • Date: 2006-06-11 10:30:38 UTC
  • mto: (1767.2.2 integration)
  • mto: This revision was merged to the branch mainline in revision 1769.
  • Revision ID: robertc@robertcollins.net-20060611103038-3313df8fec2832d4
Correct bzr diff | less= None clauses in inventory.py to be is not None.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
339
339
        :param inv: Inventory from which the entry was loaded.
340
340
        :param tree: RevisionTree for this entry.
341
341
        """
342
 
        if self.parent_id != None:
 
342
        if self.parent_id is not None:
343
343
            if not inv.has_id(self.parent_id):
344
344
                raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
345
345
                        % (self.parent_id, rev_id))
528
528
 
529
529
    def _check(self, checker, rev_id, tree):
530
530
        """See InventoryEntry._check"""
531
 
        if self.text_sha1 != None or self.text_size != None or self.text_id != None:
 
531
        if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
532
532
            raise BzrCheckError('directory {%s} has text in revision {%s}'
533
533
                                % (self.file_id, rev_id))
534
534
 
617
617
 
618
618
    def detect_changes(self, old_entry):
619
619
        """See InventoryEntry.detect_changes."""
620
 
        assert self.text_sha1 != None
621
 
        assert old_entry.text_sha1 != None
 
620
        assert self.text_sha1 is not None
 
621
        assert old_entry.text_sha1 is not None
622
622
        text_modified = (self.text_sha1 != old_entry.text_sha1)
623
623
        meta_modified = (self.executable != old_entry.executable)
624
624
        return text_modified, meta_modified
715
715
 
716
716
    def _check(self, checker, rev_id, tree):
717
717
        """See InventoryEntry._check"""
718
 
        if self.text_sha1 != None or self.text_size != None or self.text_id != None:
 
718
        if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
719
719
            raise BzrCheckError('symlink {%s} has text in revision {%s}'
720
720
                    % (self.file_id, rev_id))
721
721
        if self.symlink_target is None:
1121
1121
 
1122
1122
    def _iter_file_id_parents(self, file_id):
1123
1123
        """Yield the parents of file_id up to the root."""
1124
 
        while file_id != None:
 
1124
        while file_id is not None:
1125
1125
            try:
1126
1126
                ie = self._byid[file_id]
1127
1127
            except KeyError: