Skip to content

Commit

Permalink
stop messing with distutils's internal just to copy directory (#3364)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jackenmen authored and Michael H committed Jan 14, 2020
1 parent b646c2f commit 2be4080
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions redbot/cogs/downloader/installable.py
@@ -1,7 +1,7 @@
from __future__ import annotations

import json
import distutils.dir_util
import functools
import shutil
from enum import IntEnum
from pathlib import Path
Expand Down Expand Up @@ -127,15 +127,13 @@ async def copy_to(self, target_dir: Path) -> bool:
if self._location.is_file():
copy_func = shutil.copy2
else:
# clear copy_tree's cache to make sure missing directories are created (GH-2690)
distutils.dir_util._path_created = {}
copy_func = distutils.dir_util.copy_tree
copy_func = functools.partial(shutil.copytree, dirs_exist_ok=True)

# noinspection PyBroadException
try:
copy_func(src=str(self._location), dst=str(target_dir / self._location.stem))
except: # noqa: E722
log.exception("Error occurred when copying path: {}".format(self._location))
log.exception("Error occurred when copying path: %s", self._location)
return False
return True

Expand Down

0 comments on commit 2be4080

Please sign in to comment.