← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/upstream_import.py

  • Committer: Aaron Bentley
  • Date: 2011-09-25 01:17:15 UTC
  • mfrom: (776.1.2 fix-bzr.dev-compat)
  • Revision ID: aaron@aaronbentley.com-20110925011715-o1akrv7xjl3e4iys
Fixed compatibility with bzr.dev (jelmer)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/upstream_import.py
26
26
from bzrlib.tests import (
27
27
    TestCaseInTempDir,
28
28
    TestCaseWithTransport,
29
 
    UnicodeFilenameFeature,
30
29
    )
 
30
try:
 
31
    from bzrlib.tests.features import UnicodeFilenameFeature
 
32
except ImportError: # bzr < 2.5
 
33
    from bzrlib.tests import UnicodeFilenameFeature
31
34
 
32
35
 
33
36
def import_tar_broken(tree, tar_input):