Skip to content

Commit 5ebfb6d

Browse files
committed
Merge branch '113-documentation-for-python-package' of github.com:ispras/Futag into 113-documentation-for-python-package
2 parents a7dcffa + db5c4c9 commit 5ebfb6d

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

src/python/futag-package/src/futag/base_generator.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from subprocess import Popen, PIPE
2828
from multiprocessing import Pool
2929
from typing import List
30-
from distutils.dir_util import copy_tree
30+
from shutil import copytree
3131

3232
from futag.sysmsg import *
3333

@@ -2515,8 +2515,8 @@ def compile_targets(self, workers: int = 4, keep_failed: bool = False, extra_par
25152515
((self.succeeded_path /
25162516
dir.parents[1].name)).mkdir(parents=True, exist_ok=True)
25172517
# shutil.move(dir.parents[0].as_posix(), (self.succeeded_path / dir.parents[1].name).as_posix(), copy_function=shutil.copytree)
2518-
copy_tree(dir.parents[0].as_posix(
2519-
), (self.succeeded_path / dir.parents[1].name / dir.parents[0].name).as_posix())
2518+
copytree(dir.parents[0].as_posix(
2519+
), (self.succeeded_path / dir.parents[1].name / dir.parents[0].name).as_posix(), dirs_exist_ok=True)
25202520

25212521
if keep_failed:
25222522
failed_tree = set()
@@ -2535,8 +2535,8 @@ def compile_targets(self, workers: int = 4, keep_failed: bool = False, extra_par
25352535
((self.failed_path /
25362536
dir.parents[1].name)).mkdir(parents=True, exist_ok=True)
25372537
# shutil.move(dir.parents[0].as_posix(), (self.failed_path / dir.parents[1].name).as_posix(), copy_function=shutil.copytree)
2538-
copy_tree(dir.parents[0].as_posix(
2539-
), (self.failed_path / dir.parents[1].name / dir.parents[0].name).as_posix())
2538+
copytree(dir.parents[0].as_posix(
2539+
), (self.failed_path / dir.parents[1].name / dir.parents[0].name).as_posix(), dirs_exist_ok=True)
25402540
else:
25412541
delete_folder(self.failed_path)
25422542
if not keep_original:

src/python/futag-package/src/futag/generator.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
from subprocess import Popen, PIPE
2727
from multiprocessing import Pool
2828
from typing import List
29-
from distutils.dir_util import copy_tree
3029

3130
from futag.sysmsg import *
3231
from futag.preprocessor import *

src/python/futag-package/tests/test_fuzzer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_quote(self):
4949

5050
def test_newline(self):
5151
fuzzer = BaseFuzzer.__new__(BaseFuzzer)
52-
assert "
" in fuzzer._xml_escape("a\nb")
52+
assert "a b" == fuzzer._xml_escape("a\nb")
5353

5454

5555
class TestCorpusArgs:

0 commit comments

Comments
 (0)