/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_diff.py

  • Committer: Jelmer Vernooij
  • Date: 2011-08-27 13:06:14 UTC
  • Revision ID: jelmer@samba.org-20110827130614-oawonzmojgzwbhxc
Support new location of UnicodeFilenameFeature in 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_diff.py
23
23
    errors,
24
24
    tests,
25
25
    )
 
26
try:
 
27
    from bzrlib.tests.features import UnicodeFilenameFeature
 
28
except ImportError: # bzr < 2.5
 
29
    from bzrlib.tests import UnicodeFilenameFeature
26
30
from bzrlib.merge_directive import MergeDirective2
27
31
 
28
32
from bzrlib.plugins.gtk.diff import (
73
77
class TestDiffView(tests.TestCaseWithTransport):
74
78
 
75
79
    def test_unicode(self):
76
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
80
        self.requireFeature(UnicodeFilenameFeature)
77
81
 
78
82
        tree = self.make_branch_and_tree('tree')
79
83
        self.build_tree([u'tree/\u03a9'])