Merge remote-tracking branch 'remotes/ari3s/absolute_import'

integration_tests/describe_trash_list.py

@@ -2,19 +2,19 @@
 
 import os
 from trashcli.list import ListCmd
-from files import (write_file, require_empty_dir, make_sticky_dir,
+from .files import (write_file, require_empty_dir, make_sticky_dir,
                    make_unsticky_dir, make_unreadable_file, make_empty_file,
                    make_parent_for)
 from nose.tools import istest
 from .output_collector import OutputCollector
-from trashinfo import (
+from .trashinfo import (
         a_trashinfo,
         a_trashinfo_without_date,
         a_trashinfo_without_path,
         a_trashinfo_with_invalid_date)
 from textwrap import dedent
 
-from assert_equals_with_unidiff import assert_equals_with_unidiff
+from .assert_equals_with_unidiff import assert_equals_with_unidiff
 class Setup(object):
     def setUp(self):
         require_empty_dir('XDG_DATA_HOME')

integration_tests/output_collector.py

@@ -1,4 +1,4 @@
-from assert_equals_with_unidiff import assert_equals_with_unidiff
+from .assert_equals_with_unidiff import assert_equals_with_unidiff
 
 class OutputCollector:
     def __init__(self):

integration_tests/test_listing_all_trashinfo_in_a_trashdir.py

@@ -1,7 +1,7 @@
 from trashcli.trash import TrashDirectory
 
-from files import require_empty_dir
-from files import write_file
+from .files import require_empty_dir
+from .files import write_file
 from nose.tools import assert_equals, assert_items_equal
 from mock import Mock
 

integration_tests/test_restore_trash.py

@@ -5,7 +5,7 @@
 from .files import require_empty_dir
 from trashcli.fs import remove_file
 from .output_collector import OutputCollector
-from trashinfo import a_trashinfo
+from .trashinfo import a_trashinfo
 
 @istest
 class describe_restore_trash:

integration_tests/test_trash_empty.py

@@ -7,8 +7,8 @@
 
 from StringIO import StringIO
 import os
-from files import write_file, require_empty_dir, make_dirs, set_sticky_bit
-from files import having_file
+from .files import write_file, require_empty_dir, make_dirs, set_sticky_bit
+from .files import having_file
 from mock import MagicMock
 from trashcli.trash import FileSystemReader
 from trashcli.fs import FileRemover

integration_tests/test_trash_rm.py

@@ -2,9 +2,9 @@
 from mock import Mock, ANY
 from nose.tools import assert_false, assert_raises, assert_equals
 
-from files import require_empty_dir, write_file
+from .files import require_empty_dir, write_file
 from trashcli.rm import RmCmd, ListTrashinfos
-from trashinfo import a_trashinfo_with_path, a_trashinfo_without_path
+from .trashinfo import a_trashinfo_with_path, a_trashinfo_without_path
 from trashcli.trash import ParseError
 
 class TestTrashRm:

integration_tests/test_trash_rm_script.py

@@ -1,7 +1,7 @@
 from nose.tools import istest, assert_equals, assert_in
 import subprocess
 from subprocess import STDOUT, PIPE, check_output, call, Popen
-from assert_equals_with_unidiff import assert_equals_with_unidiff as assert_equals
+from .assert_equals_with_unidiff import assert_equals_with_unidiff as assert_equals
 from textwrap import dedent
 
 from pprint import pprint

trashcli/restore.py

@@ -7,7 +7,7 @@
 from .trash import TrashDirectories
 from .fs import contents_of
 from .trash import backup_file_path_from
-import fs
+from . import fs
 
 def getcwd_as_realpath(): return os.path.realpath(os.curdir)