← 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: 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/upstream_import.py
7
7
 
8
8
from bzrlib import osutils
9
9
from bzrlib.bzrdir import BzrDir
10
 
try:
11
 
    from bzrlib.plugins.bzrtools.upstream_import import (
12
 
        common_directory,
13
 
        import_tar,
14
 
        import_zip,
15
 
        import_dir,
16
 
        top_directory,
17
 
        ZipFileWrapper, 
18
 
    )
19
 
except ImportError:
20
 
    from bzrtools.upstream_import import (
21
 
        common_directory,
22
 
        import_tar,
23
 
        import_zip,
24
 
        import_dir,
25
 
        top_directory,
26
 
        ZipFileWrapper, 
27
 
    )
 
10
from bzrlib.plugins.bzrtools.upstream_import import (
 
11
    common_directory,
 
12
    import_tar,
 
13
    import_zip,
 
14
    import_dir,
 
15
    top_directory,
 
16
    ZipFileWrapper, 
 
17
)
28
18
from bzrlib.tests import TestCaseInTempDir
29
19
 
30
 
 
31
20
class DirFileWriter(object):
32
21
 
33
22
    def __init__(self, fileobj, mode):