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

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lazy_regex.py
22
22
 
23
23
import re
24
24
 
25
 
from bzrlib import errors
26
 
 
27
25
 
28
26
class LazyRegex(object):
29
27
    """A proxy around a real regex, which won't be compiled until accessed."""
60
58
 
61
59
    def _real_re_compile(self, *args, **kwargs):
62
60
        """Thunk over to the original re.compile"""
63
 
        try:
64
 
            return _real_re_compile(*args, **kwargs)
65
 
        except re.error, e:
66
 
            # raise InvalidPattern instead of re.error as this gives a
67
 
            # cleaner message to the user.
68
 
            raise errors.InvalidPattern('"' + args[0] + '" ' +str(e))
 
61
        return _real_re_compile(*args, **kwargs)
69
62
 
70
63
    def __getattr__(self, attr):
71
64
        """Return a member from the proxied regex object.