← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test__simple_set.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil, Patch Queue Manager, Jelmer Vernooij
  • Date: 2017-01-17 16:20:41 UTC
  • mfrom: (6619.1.2 trunk)
  • Revision ID: tarmac-20170117162041-oo62uk1qsmgc9j31
Merge 2.7 into trunk including fixes for bugs #1622039, #1644003, #1579093 and #1645017. [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__simple_set.py
21
21
from bzrlib import (
22
22
    tests,
23
23
    )
 
24
from bzrlib.tests import (
 
25
    features,
 
26
    )
24
27
 
25
28
try:
26
29
    from bzrlib import _simple_set_pyx
75
78
 
76
79
# Even though this is an extension, we don't permute the tests for a python
77
80
# version. As the plain python version is just a dict or set
78
 
compiled_simpleset_feature = tests.ModuleAvailableFeature(
 
81
compiled_simpleset_feature = features.ModuleAvailableFeature(
79
82
                                'bzrlib._simple_set_pyx')
80
83
 
81
84