Skip to content

Commit

Permalink
Replace relative imports with absolute
Browse files Browse the repository at this point in the history
  • Loading branch information
arsenetar committed Jun 1, 2022
1 parent d37197c commit 4482249
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 26 deletions.
10 changes: 5 additions & 5 deletions send2trash/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@

import sys

from .exceptions import TrashPermissionError # noqa: F401
from send2trash.exceptions import TrashPermissionError # noqa: F401

if sys.platform == "darwin":
from .mac import send2trash
from send2trash.mac import send2trash
elif sys.platform == "win32":
from .win import send2trash
from send2trash.win import send2trash
else:
try:
# If we can use gio, let's use it
from .plat_gio import send2trash
from send2trash.plat_gio import send2trash
except ImportError:
# Oh well, let's fallback to our own Freedesktop trash implementation
from .plat_other import send2trash # noqa: F401
from send2trash.plat_other import send2trash # noqa: F401
2 changes: 1 addition & 1 deletion send2trash/exceptions.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import errno
from .compat import PY3
from send2trash.compat import PY3

if PY3:
_permission_error = PermissionError # noqa: F821
Expand Down
6 changes: 3 additions & 3 deletions send2trash/mac/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
macos_ver = tuple(int(part) for part in mac_ver()[0].split("."))
if version_info >= (3, 6) and macos_ver >= (10, 9):
try:
from .modern import send2trash
from send2trash.mac.modern import send2trash
except ImportError:
# Try to fall back to ctypes version, although likely problematic still
from .legacy import send2trash
from send2trash.mac.legacy import send2trash
else:
# Just use the old version otherwise
from .legacy import send2trash # noqa: F401
from send2trash.mac.legacy import send2trash # noqa: F401
4 changes: 2 additions & 2 deletions send2trash/mac/legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
from ctypes import cdll, byref, Structure, c_char, c_char_p
from ctypes.util import find_library

from ..compat import binary_type
from ..util import preprocess_paths
from send2trash.compat import binary_type
from send2trash.util import preprocess_paths

Foundation = cdll.LoadLibrary(find_library("Foundation"))
CoreServices = cdll.LoadLibrary(find_library("CoreServices"))
Expand Down
4 changes: 2 additions & 2 deletions send2trash/mac/modern.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
# http://www.hardcoded.net/licenses/bsd_license

from Foundation import NSFileManager, NSURL
from ..compat import text_type
from ..util import preprocess_paths
from send2trash.compat import text_type
from send2trash.util import preprocess_paths


def check_op_result(op_result):
Expand Down
4 changes: 2 additions & 2 deletions send2trash/plat_gio.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
# http://www.hardcoded.net/licenses/bsd_license

from gi.repository import GObject, Gio
from .exceptions import TrashPermissionError
from .util import preprocess_paths
from send2trash.exceptions import TrashPermissionError
from send2trash.util import preprocess_paths


def send2trash(paths):
Expand Down
6 changes: 3 additions & 3 deletions send2trash/plat_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
# Python 2
from urllib import quote

from .compat import text_type, environb
from .util import preprocess_paths
from .exceptions import TrashPermissionError
from send2trash.compat import text_type, environb
from send2trash.util import preprocess_paths
from send2trash.exceptions import TrashPermissionError

try:
fsencode = os.fsencode # Python 3
Expand Down
6 changes: 3 additions & 3 deletions send2trash/win/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
if int(version().split(".", 1)[0]) >= 6:
try:
# Attempt to use pywin32 to use IFileOperation
from .modern import send2trash
from send2trash.win.modern import send2trash
except ImportError:
# use SHFileOperation as fallback
from .legacy import send2trash
from send2trash.win.legacy import send2trash
else:
# use SHFileOperation as fallback
from .legacy import send2trash # noqa: F401
from send2trash.win.legacy import send2trash # noqa: F401
4 changes: 2 additions & 2 deletions send2trash/win/legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

from __future__ import unicode_literals
import os.path as op
from ..compat import text_type
from ..util import preprocess_paths
from send2trash.compat import text_type
from send2trash.util import preprocess_paths

from ctypes import (
windll,
Expand Down
6 changes: 3 additions & 3 deletions send2trash/win/modern.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

from __future__ import unicode_literals
import os.path as op
from ..compat import text_type
from ..util import preprocess_paths
from send2trash.compat import text_type
from send2trash.util import preprocess_paths
from platform import version
import pythoncom
import pywintypes
from win32com.shell import shell, shellcon
from .IFileOperationProgressSink import create_sink
from send2trash.win.IFileOperationProgressSink import create_sink


def send2trash(paths):
Expand Down

0 comments on commit 4482249

Please sign in to comment.