From 46fbc7163dc21058225836acf93c7994d2200903 Mon Sep 17 00:00:00 2001 From: Martin Larralde Date: Wed, 30 Mar 2022 14:07:09 +0200 Subject: [PATCH] Fix circular import between `fs.base`, `fs.osfs` and `fs.move` --- fs/base.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/base.py b/fs/base.py index 83c36218..91152a60 100644 --- a/fs/base.py +++ b/fs/base.py @@ -21,7 +21,7 @@ import six -from . import copy, errors, fsencode, iotools, move, tools, walk, wildcard +from . import copy, errors, fsencode, iotools, tools, walk, wildcard from .copy import copy_modified_time from .glob import BoundGlobber from .mode import validate_open_mode @@ -1083,10 +1083,12 @@ def movedir(self, src_path, dst_path, create=False, preserve_time=False): ancestors is not a directory. """ + from .move import move_dir + with self._lock: if not create and not self.exists(dst_path): raise errors.ResourceNotFound(dst_path) - move.move_dir(self, src_path, self, dst_path, preserve_time=preserve_time) + move_dir(self, src_path, self, dst_path, preserve_time=preserve_time) def makedirs( self,