~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml7.py

  • Committer: Aaron Bentley
  • Date: 2007-07-25 22:54:16 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2664.
  • Revision ID: abentley@panoramicfeedback.com-20070725225416-ux5bt1v31nxunrkl
remove builtins._merge_helper

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
from bzrlib import (
18
18
    inventory,
28
28
    supported_kinds = set(['file', 'directory', 'symlink', 'tree-reference'])
29
29
    format_num = '7'
30
30
 
31
 
    def _unpack_entry(self, elt, entry_cache=None):
 
31
    def _unpack_entry(self, elt):
32
32
        kind = elt.tag
33
33
        if not kind in self.supported_kinds:
34
34
            raise AssertionError('unsupported entry kind %s' % kind)