/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 breezy/views.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 12:50:32 UTC
  • mfrom: (6679 work)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610125032-xb5rd5fjskjallos
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/views.py
22
22
  tree.views.lookup_view()
23
23
"""
24
24
 
 
25
from __future__ import absolute_import
25
26
 
26
27
import re
27
28
 
28
 
from bzrlib import (
 
29
from . import (
29
30
    errors,
30
31
    osutils,
31
32
    )
179
180
            try:
180
181
                try:
181
182
                    view_content = self.tree._transport.get_bytes('views')
182
 
                except errors.NoSuchFile, e:
 
183
                except errors.NoSuchFile as e:
183
184
                    self._current, self._views = None, {}
184
185
                else:
185
186
                    keywords, self._views = \
237
238
                    raise ValueError("failed to deserialize views line %s",
238
239
                        text)
239
240
            return keywords, views
240
 
        except ValueError, e:
 
241
        except ValueError as e:
241
242
            raise ValueError("failed to deserialize views content %r: %s"
242
243
                % (view_content, e))
243
244