/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/_knit_load_data_py.py

  • Committer: Jelmer Vernooij
  • Date: 2017-02-05 15:38:26 UTC
  • mto: (6621.2.1 py3)
  • mto: This revision was merged to the branch mainline in revision 6624.
  • Revision ID: jelmer@jelmer.uk-20170205153826-rnrd0m3iqoizqvrw
Apply 2to3 except fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_knit_load_data_py.py
52
52
                else:
53
53
                    parent_id = history[int(value)]
54
54
                parents.append(parent_id)
55
 
        except (IndexError, ValueError), e:
 
55
        except (IndexError, ValueError) as e:
56
56
            # The parent could not be decoded to get its parent row. This
57
57
            # at a minimum will cause this row to have wrong parents, or
58
58
            # even to apply a delta to the wrong base and decode
67
67
        version_id = version_id
68
68
        try:
69
69
            pos = int(pos)
70
 
        except ValueError, e:
 
70
        except ValueError as e:
71
71
            raise errors.KnitCorrupt(kndx._filename,
72
72
                                     "invalid position on line %r: %s"
73
73
                                     % (rec, e))
74
74
        try:
75
75
            size = int(size)
76
 
        except ValueError, e:
 
76
        except ValueError as e:
77
77
            raise errors.KnitCorrupt(kndx._filename,
78
78
                                     "invalid size on line %r: %s"
79
79
                                     % (rec, e))