← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lazy_regex.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-04-15 18:09:55 UTC
  • mfrom: (5159.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100415180955-v9jh960r07pva92c
(vila) Merge 2.1 into bzr.dev including fixes for #262450, #373898,
        #498409

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.