← Back to branch summary

~jelmer/bzr/merge-2.2-into-2.3

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Martin Pool
  • Date: 2011-04-15 23:32:43 UTC
  • mfrom: (5050.73.2 2.2)
  • mto: This revision was merged to the branch mainline in revision 5640.
  • Revision ID: mbp@sourcefrog.net-20110415233243-q0lmx1uae6lo2rb2
Use -Wignore::ImportWarning rather than catching it, to restore py2.4 compatibility

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
4341
4341
        try:
4342
4342
            self._module = __import__(self.module_name, {}, {}, [''])
4343
4343
            return True
4344
 
        except (ImportWarning, ImportError):
 
4344
        except ImportError:
4345
4345
            return False
4346
4346
 
4347
4347
    @property