← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-15 11:26:00 UTC
  • mfrom: (5757.7.7 knitpackrepo-6)
  • mto: This revision was merged to the branch mainline in revision 5801.
  • Revision ID: jelmer@samba.org-20110415112600-vrv2431lh3gi6wx2
Merge knitpackrepo-6.

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