← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-11 16:59:43 UTC
  • mfrom: (5779.1.1 importwarning)
  • Revision ID: pqm@pqm.ubuntu.com-20110411165943-g2uhdcy7zz164e4x
(jelmer) Catch ImportWarning as well when checking for modules in features.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
4355
4355
        try:
4356
4356
            self._module = __import__(self.module_name, {}, {}, [''])
4357
4357
            return True
4358
 
        except ImportError:
 
4358
        except (ImportError, ImportWarning):
4359
4359
            return False
4360
4360
 
4361
4361
    @property