← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2006-01-26 18:33:14 UTC
  • mto: This revision was merged to the branch mainline in revision 1551.
  • Revision ID: john@arbash-meinel.com-20060126183314-bed197fc11d30c17
Changing the exception that sftp.py throws when it can't find paramiko, so that the test suite can handle it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
538
538
                result.extend(self.get_transport_test_permutations(reduce(getattr, 
539
539
                    (module).split('.')[1:],
540
540
                     __import__(module))))
541
 
            except ImportError, e:
542
 
                # This is most likely paramiko failing to be loaded
 
541
            except errors.DependencyNotPresent, e:
 
542
                # Continue even if a dependency prevents us 
 
543
                # from running this test
543
544
                pass
544
545
        return result
545
546