← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

  • Committer: Aaron Bentley
  • Date: 2007-02-15 20:02:58 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070215200258-w08yzl5tz9wiuxtu
Fix imports

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/shelf_tests.py
 
1
import os.path
1
2
from bzrlib.diff import _patch_header_date
2
3
import bzrlib.tests
3
 
import os.path
4
4
 
5
 
try:
6
 
    from bzrlib.plugins.bzrtools.hunk_selector import (
7
 
        ShelveHunkSelector,
8
 
        UnshelveHunkSelector,
9
 
        )
10
 
    from bzrlib.plugins.bzrtools.errors import NoColor
11
 
except ImportError:
12
 
    from bzrtools.hunk_selector import (
13
 
        ShelveHunkSelector,
14
 
        UnshelveHunkSelector,
15
 
        )
16
 
    from bzrtools.errors import NoColor
 
5
from bzrlib.plugins.bzrtools.hunk_selector import (
 
6
    ShelveHunkSelector,
 
7
    UnshelveHunkSelector,
 
8
    )
 
9
from bzrlib.plugins.bzrtools.errors import NoColor
17
10
 
18
11
 
19
12
class ShelfTests(bzrlib.tests.TestCaseWithTransport):