Merge branch 'master' into fix-484

Author: dargueta

.github/workflows/package.yml

@@ -129,3 +129,17 @@ jobs:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}
         skip_existing: false
+
+  release:
+    environment: GitHub Releases
+    runs-on: ubuntu-latest
+    if: "startsWith(github.ref, 'refs/tags/v')"
+    name: Release
+    needs: upload
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v1
+    - name: Release a Changelog
+      uses: rasmus-saks/[email protected]
+      with:
+        github-token: '${{ secrets.GITHUB_TOKEN }}'

.github/workflows/test.yml

@@ -8,6 +8,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         python-version:
           - 2.7

CHANGELOG.md

@@ -8,11 +8,33 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+
+## [2.4.16] - 2022-05-02
+
+### Changed
+
+- Make `fs.zipfs._ZipExtFile` use the seeking mechanism implemented
+  in the Python standard library in Python version 3.7 and later
+  ([#527](https://github.com/PyFilesystem/pyfilesystem2/pull/527)).
+- Mark `fs.zipfs.ReadZipFS` as a case-sensitive filesystem
+  ([#527](https://github.com/PyFilesystem/pyfilesystem2/pull/527)). 
+- Optimized moving files between filesystems with syspaths.
+  ([#523](https://github.com/PyFilesystem/pyfilesystem2/pull/523)).
+- Fixed `fs.move.move_file` to clean up the copy on the destination in case of errors.
+- `fs.opener.manage_fs` with `writeable=True` will now raise a `ResourceReadOnly`
+  exception if the managed filesystem is not writeable.
+- Marked filesystems wrapped with `fs.wrap.WrapReadOnly` as read-only.
+
+
+## [2.4.15] - 2022-02-07
+
 ### Changed
 
 - Support more lenient usernames and group names in FTP servers
   ([#507](https://github.com/PyFilesystem/pyfilesystem2/pull/507)).
   Closes [#506](https://github.com/PyFilesystem/pyfilesystem2/issues/506).
+- Removed dependency on pytz ([#518](https://github.com/PyFilesystem/pyfilesystem2/pull/518)).
+  Closes [#516](https://github.com/PyFilesystem/pyfilesystem2/issues/518).
 
 ### Fixed
 
@@ -21,6 +43,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
   resources, causing `MemoryFS.scandir` to use the old name.
   ([#510](https://github.com/PyFilesystem/pyfilesystem2/pull/510)).
   Closes [#509](https://github.com/PyFilesystem/pyfilesystem2/issues/509).
+- Make `WrapFS.move` and `WrapFS.movedir` use the delegate FS methods instead
+  of `fs.move` functions, which was causing optimized implementation of 
+  `movedir` to be always skipped.
+  ([#511](https://github.com/PyFilesystem/pyfilesystem2/pull/511)).
 
 
 ## [2.4.14] - 2021-11-16

CONTRIBUTORS.md

@@ -14,6 +14,7 @@ Many thanks to the following developers for contributing to this project:
 - [Diego Argueta](https://github.com/dargueta)
 - [Eelke van den Bos](https://github.com/eelkevdbos)
 - [Egor Namakonov](https://github.com/fresheed)
+- [Felix Yan](https://github.com/felixonmars)
 - [@FooBarQuaxx](https://github.com/FooBarQuaxx)
 - [Geoff Jukes](https://github.com/geoffjukes)
 - [George Macon](https://github.com/gmacon)
@@ -27,6 +28,7 @@ Many thanks to the following developers for contributing to this project:
 - [Martin Durant](https://github.com/martindurant)
 - [Martin Larralde](https://github.com/althonos)
 - [Masaya Nakamura](https://github.com/mashabow)
+- [Matthew Gamble](https://github.com/djmattyg007)
 - [Morten Engelhardt Olsen](https://github.com/xoriath)
 - [@mrg0029](https://github.com/mrg0029)
 - [Nathan Goldbaum](https://github.com/ngoldbaum)
@@ -38,6 +40,7 @@ Many thanks to the following developers for contributing to this project:
 - [Silvan Spross](https://github.com/sspross)
 - [@sqwishy](https://github.com/sqwishy)
 - [Sven Schliesing](https://github.com/muffl0n)
+- [Thomas Feldmann](https://github.com/tfeldmann)
 - [Tim Gates](https://github.com/timgates42/)
 - [@tkossak](https://github.com/tkossak)
 - [Todd Levi](https://github.com/televi)

docs/source/conf.py

@@ -13,9 +13,8 @@
 # serve to show the default.
 
 import sys
-import os
-
 
+import os
 import sphinx_rtd_theme
 
 html_theme = "sphinx_rtd_theme"
@@ -72,6 +71,7 @@
 # built documents.
 #
 from fs import __version__
+
 # The short X.Y version.
 version = '.'.join(__version__.split('.')[:2])
 # The full version, including alpha/beta/rc tags.

docs/source/interface.rst

@@ -20,7 +20,7 @@ The following is a complete list of methods on PyFilesystem objects.
 * :meth:`~fs.base.FS.getdetails` Get details info namespace for a resource.
 * :meth:`~fs.base.FS.getinfo` Get info regarding a file or directory.
 * :meth:`~fs.base.FS.getmeta` Get meta information for a resource.
-* :meth:`~fs.base.FS.getmodified` Get info regarding the last modified time of a resource.
+* :meth:`~fs.base.FS.getmodified` Get the last modified time of a resource.
 * :meth:`~fs.base.FS.getospath` Get path with encoding expected by the OS.
 * :meth:`~fs.base.FS.getsize` Get the size of a file.
 * :meth:`~fs.base.FS.getsyspath` Get the system path of a resource, if one exists.

examples/count_py.py

@@ -11,7 +11,6 @@
 from fs import open_fs
 from fs.filesize import traditional
 
-
 fs_url = sys.argv[1]
 count = 0
 

examples/find_dups.py

@@ -7,11 +7,11 @@
 
 """
 
-from collections import defaultdict
 import sys
 
-from fs import open_fs
+from collections import defaultdict
 
+from fs import open_fs
 
 hashes = defaultdict(list)
 with open_fs(sys.argv[1]) as fs:

examples/rm_pyc.py

@@ -11,7 +11,6 @@
 
 from fs import open_fs
 
-
 with open_fs(sys.argv[1]) as fs:
     count = fs.glob("**/*.pyc").remove()
 print(f"{count} .pyc files remove")

examples/upload.py

@@ -12,9 +12,10 @@
 
 """
 
-import os
 import sys
 
+import os
+
 from fs import open_fs
 
 _, file_path, fs_url = sys.argv

fs/__init__.py

@@ -3,10 +3,10 @@
 
 __import__("pkg_resources").declare_namespace(__name__)  # type: ignore
 
+from . import path
+from ._fscompat import fsdecode, fsencode
 from ._version import __version__
 from .enums import ResourceType, Seek
 from .opener import open_fs
-from ._fscompat import fsencode, fsdecode
-from . import path
 
 __all__ = ["__version__", "ResourceType", "Seek", "open_fs"]

fs/_bulk.py

@@ -6,19 +6,21 @@
 
 from __future__ import unicode_literals
 
-import threading
 import typing
 
+import threading
 from six.moves.queue import Queue
 
 from .copy import copy_file_internal, copy_modified_time
 from .errors import BulkCopyFailed
 from .tools import copy_file_data
 
 if typing.TYPE_CHECKING:
-    from .base import FS
+    from typing import IO, List, Optional, Text, Tuple, Type
+
     from types import TracebackType
-    from typing import List, Optional, Text, Type, IO, Tuple
+
+    from .base import FS
 
 
 class _Worker(threading.Thread):

fs/_fscompat.py

@@ -1,9 +1,9 @@
 import six
 
 try:
-    from os import fsencode, fsdecode
+    from os import fsdecode, fsencode
 except ImportError:
-    from backports.os import fsencode, fsdecode  # type: ignore
+    from backports.os import fsdecode, fsencode  # type: ignore
 
 try:
     from os import fspath

fs/_ftp_parse.py

@@ -1,19 +1,19 @@
-from __future__ import absolute_import
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
-import unicodedata
-import datetime
 import re
 import time
+import unicodedata
+from datetime import datetime
 
-from pytz import UTC
+try:
+    from datetime import timezone
+except ImportError:
+    from ._tzcompat import timezone  # type: ignore
 
 from .enums import ResourceType
 from .permissions import Permissions
 
-
-EPOCH_DT = datetime.datetime.fromtimestamp(0, UTC)
+EPOCH_DT = datetime.fromtimestamp(0, timezone.utc)
 
 
 RE_LINUX = re.compile(
@@ -98,7 +98,7 @@ def _parse_time(t, formats):
     day = _t.tm_mday
     hour = _t.tm_hour
     minutes = _t.tm_min
-    dt = datetime.datetime(year, month, day, hour, minutes, tzinfo=UTC)
+    dt = datetime(year, month, day, hour, minutes, tzinfo=timezone.utc)
 
     epoch_time = (dt - EPOCH_DT).total_seconds()
     return epoch_time

fs/_pathcompat.py

@@ -0,0 +1,41 @@
+# mypy: ignore-errors
+try:
+    from os.path import commonpath
+except ImportError:
+    # Return the longest common sub-path of the sequence of paths given as input.
+    # The paths are not normalized before comparing them (this is the
+    # responsibility of the caller). Any trailing separator is stripped from the
+    # returned path.
+
+    def commonpath(paths):
+        """Given a sequence of path names, returns the longest common sub-path."""
+
+        if not paths:
+            raise ValueError("commonpath() arg is an empty sequence")
+
+        paths = tuple(paths)
+        if isinstance(paths[0], bytes):
+            sep = b"/"
+            curdir = b"."
+        else:
+            sep = "/"
+            curdir = "."
+
+        split_paths = [path.split(sep) for path in paths]
+
+        try:
+            (isabs,) = set(p[:1] == sep for p in paths)
+        except ValueError:
+            raise ValueError("Can't mix absolute and relative paths")
+
+        split_paths = [[c for c in s if c and c != curdir] for s in split_paths]
+        s1 = min(split_paths)
+        s2 = max(split_paths)
+        common = s1
+        for i, c in enumerate(s1):
+            if c != s2[i]:
+                common = s1[:i]
+                break
+
+        prefix = sep if isabs else sep[:0]
+        return prefix + sep.join(common)

fs/_typing.py

@@ -3,8 +3,8 @@
 
 """
 import sys
-import six
 
+import six
 
 _PY = sys.version_info
 

fs/_tzcompat.py

@@ -0,0 +1,29 @@
+"""Compatibility shim for python2's lack of datetime.timezone.
+
+This is the example code from the Python 2 documentation:
+https://docs.python.org/2.7/library/datetime.html#tzinfo-objects
+"""
+
+from datetime import timedelta, tzinfo
+
+ZERO = timedelta(0)
+
+
+class UTC(tzinfo):
+    """UTC"""
+
+    def utcoffset(self, dt):
+        return ZERO
+
+    def tzname(self, dt):
+        return "UTC"
+
+    def dst(self, dt):
+        return ZERO
+
+
+utc = UTC()
+
+
+class timezone:
+    utc = utc

fs/_url_tools.py

@@ -1,7 +1,8 @@
+import typing
+
+import platform
 import re
 import six
-import platform
-import typing
 
 if typing.TYPE_CHECKING:
     from typing import Text

fs/_version.py

@@ -1,3 +1,3 @@
 """Version, used in module and setup.py.
 """
-__version__ = "2.4.14"
+__version__ = "2.4.16"

fs/appfs.py

@@ -9,14 +9,14 @@
 
 # see http://technet.microsoft.com/en-us/library/cc766489(WS.10).aspx
 
-import abc
 import typing
 
+import abc
 import six
+from appdirs import AppDirs
 
-from .osfs import OSFS
 from ._repr import make_repr
-from appdirs import AppDirs
+from .osfs import OSFS
 
 if typing.TYPE_CHECKING:
     from typing import Optional, Text