Merge branch 'master' into fix-484

Author: Diego Argueta

.github/workflows/test.yml

@@ -16,6 +16,7 @@ jobs:
           - 3.7
           - 3.8
           - 3.9
+          - '3.10'
           - pypy-2.7
           - pypy-3.6
           - pypy-3.7
@@ -44,10 +45,10 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v1
-    - name: Setup Python 3.9
+    - name: Setup Python 3.10
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: '3.10'
     - name: Install coverage package
       run: python -m pip install -U coverage
     - name: Download partial coverage reports
@@ -76,10 +77,10 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v1
-    - name: Setup Python 3.9
+    - name: Setup Python '3.10'
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: '3.10'
     - name: Update pip
       run: python -m pip install -U pip wheel setuptools
     - name: Install tox

CHANGELOG.md

@@ -12,9 +12,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### 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).
+
 ### Fixed
 
 - Fixed `ResourceLocked` error translation on Windows [#484](https://github.com/PyFilesystem/pyfilesystem2/issues/484).
+- Fixed `MemoryFS.move` and `MemoryFS.movedir` not updating the name of moved
+  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).
 
 
 ## [2.4.14] - 2021-11-16

CONTRIBUTORS.md

@@ -2,6 +2,7 @@
 
 Many thanks to the following developers for contributing to this project:
 
+- [Adrian Garcia Badaracco](https://github.com/adriangb)
 - [Alex Povel](https://github.com/alexpovel)
 - [Andreas Tollkötter](https://github.com/atollk)
 - [Andrew Scheller](https://github.com/lurch)

fs/_ftp_parse.py

@@ -24,9 +24,9 @@
     \s+?
     (\d+)
     \s+?
-    ([\w\-]+)
+    ([A-Za-z0-9][A-Za-z0-9\-\.\_\@]*\$?)
     \s+?
-    ([\w\-]+)
+    ([A-Za-z0-9][A-Za-z0-9\-\.\_\@]*\$?)
     \s+?
     (\d+)
     \s+?

fs/errors.py

@@ -51,6 +51,7 @@
     "ResourceNotFound",
     "ResourceReadOnly",
     "Unsupported",
+    "UnsupportedHash",
 ]
 
 

fs/memoryfs.py

@@ -463,8 +463,11 @@ def move(self, src_path, dst_path, overwrite=False, preserve_time=False):
             elif not overwrite and dst_name in dst_dir_entry:
                 raise errors.DestinationExists(dst_path)
 
+            # move the entry from the src folder to the dst folder
             dst_dir_entry.set_entry(dst_name, src_entry)
             src_dir_entry.remove_entry(src_name)
+            # make sure to update the entry name itself (see #509)
+            src_entry.name = dst_name
 
             if preserve_time:
                 copy_modified_time(self, src_path, self, dst_path)
@@ -481,12 +484,16 @@ def movedir(self, src_path, dst_path, create=False, preserve_time=False):
             if not src_entry.is_dir:
                 raise errors.DirectoryExpected(src_path)
 
+            # move the entry from the src folder to the dst folder
             dst_dir_entry = self._get_dir_entry(dst_dir)
             if dst_dir_entry is None or (not create and dst_name not in dst_dir_entry):
                 raise errors.ResourceNotFound(dst_path)
 
+            # move the entry from the src folder to the dst folder
             dst_dir_entry.set_entry(dst_name, src_entry)
             src_dir_entry.remove_entry(src_name)
+            # make sure to update the entry name itself (see #509)
+            src_entry.name = dst_name
 
             if preserve_time:
                 copy_modified_time(self, src_path, self, dst_path)

fs/test.py

@@ -1738,6 +1738,24 @@ def test_copy_dir_temp(self):
         self._test_copy_dir("temp://")
         self._test_copy_dir_write("temp://")
 
+    def test_move_dir_same_fs(self):
+        self.fs.makedirs("foo/bar/baz")
+        self.fs.makedir("egg")
+        self.fs.writetext("top.txt", "Hello, World")
+        self.fs.writetext("/foo/bar/baz/test.txt", "Goodbye, World")
+
+        fs.move.move_dir(self.fs, "foo", self.fs, "foo2")
+
+        expected = {"/egg", "/foo2", "/foo2/bar", "/foo2/bar/baz"}
+        self.assertEqual(set(walk.walk_dirs(self.fs)), expected)
+        self.assert_text("top.txt", "Hello, World")
+        self.assert_text("/foo2/bar/baz/test.txt", "Goodbye, World")
+
+        self.assertEqual(sorted(self.fs.listdir("/")), ["egg", "foo2", "top.txt"])
+        self.assertEqual(
+            sorted(x.name for x in self.fs.scandir("/")), ["egg", "foo2", "top.txt"]
+        )
+
     def _test_move_dir_write(self, protocol):
         # Test moving to this filesystem from another.
         other_fs = open_fs(protocol)
@@ -1760,19 +1778,6 @@ def test_move_dir_mem(self):
     def test_move_dir_temp(self):
         self._test_move_dir_write("temp://")
 
-    def test_move_same_fs(self):
-        self.fs.makedirs("foo/bar/baz")
-        self.fs.makedir("egg")
-        self.fs.writetext("top.txt", "Hello, World")
-        self.fs.writetext("/foo/bar/baz/test.txt", "Goodbye, World")
-
-        fs.move.move_dir(self.fs, "foo", self.fs, "foo2")
-
-        expected = {"/egg", "/foo2", "/foo2/bar", "/foo2/bar/baz"}
-        self.assertEqual(set(walk.walk_dirs(self.fs)), expected)
-        self.assert_text("top.txt", "Hello, World")
-        self.assert_text("/foo2/bar/baz/test.txt", "Goodbye, World")
-
     def test_move_file_same_fs(self):
         text = "Hello, World"
         self.fs.makedir("foo").writetext("test.txt", text)
@@ -1782,6 +1787,9 @@ def test_move_file_same_fs(self):
         self.assert_not_exists("foo/test.txt")
         self.assert_text("foo/test2.txt", text)
 
+        self.assertEqual(self.fs.listdir("foo"), ["test2.txt"])
+        self.assertEqual(next(self.fs.scandir("foo")).name, "test2.txt")
+
     def _test_move_file(self, protocol):
         other_fs = open_fs(protocol)
 

setup.cfg

@@ -21,12 +21,12 @@ classifiers =
     Operating System :: OS Independent
     Programming Language :: Python
     Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
     Topic :: System :: Filesystems
@@ -130,7 +130,7 @@ markers =
 # --- Tox automation configuration ---------------------------------------------
 
 [tox:tox]
-envlist = py{27,34}{,-scandir}, py{35,36,37,38,39}, pypy{27,36,37}, typecheck, codestyle, docstyle, codeformat
+envlist = py{27,34}{,-scandir}, py{35,36,37,38,39,310}, pypy{27,36,37}, typecheck, codestyle, docstyle, codeformat
 sitepackages = false
 skip_missing_interpreters = true
 requires =
@@ -141,9 +141,9 @@ commands = python -m coverage run --rcfile {toxinidir}/setup.cfg -m pytest {posa
 deps =
   -rtests/requirements.txt
   coverage~=5.0
-  py{35,36,37,38,39,py36,py37}: pytest~=6.0
+  py{35,36,37,38,39,310,py36,py37}: pytest~=6.0
   py{27,34,py27}: pytest~=4.6
-  py{35,36,37,38,39,py36,py37}: pytest-randomly~=3.5
+  py{35,36,37,38,39,310,py36,py37}: pytest-randomly~=3.5
   py{27,34,py27}: pytest-randomly~=1.2
   scandir: .[scandir]
   !scandir: .
@@ -183,6 +183,7 @@ python =
     3.7: py37
     3.8: py38
     3.9: py39
+    3.10: py310
     pypy-2.7: pypy27
     pypy-3.6: pypy36
     pypy-3.7: pypy37

tests/test_ftp_parse.py

@@ -50,7 +50,9 @@ def test_decode_linux(self, mock_localtime):
             drwxr-xr-x   12 0        0            4096 Sep 29 13:13 pub
             -rw-r--r--    1 0        0              26 Mar 04  2010 robots.txt
             drwxr-xr-x   8 foo      bar          4096 Oct  4 09:05 test
+            drwxr-xr-x   8 f      b          4096 Oct  4 09:05 test
             drwxr-xr-x   2 foo-user foo-group         0 Jan  5 11:59 240485
+            drwxr-xr-x   2 foo.user$ foo@group_         0 Jan  5 11:59 240485
             """
         )
 
@@ -147,6 +149,18 @@ def test_decode_linux(self, mock_localtime):
                     "ls": "drwxr-xr-x   8 foo      bar          4096 Oct  4 09:05 test"
                 },
             },
+            {
+                "access": {
+                    "group": "b",
+                    "permissions": ["g_r", "g_x", "o_r", "o_x", "u_r", "u_w", "u_x"],
+                    "user": "f",
+                },
+                "basic": {"is_dir": True, "name": "test"},
+                "details": {"modified": 1507107900.0, "size": 4096, "type": 1},
+                "ftp": {
+                    "ls": "drwxr-xr-x   8 f      b          4096 Oct  4 09:05 test"
+                },
+            },
             {
                 "access": {
                     "group": "foo-group",
@@ -159,6 +173,18 @@ def test_decode_linux(self, mock_localtime):
                     "ls": "drwxr-xr-x   2 foo-user foo-group         0 Jan  5 11:59 240485"
                 },
             },
+            {
+                "access": {
+                    "group": "foo@group_",
+                    "permissions": ["g_r", "g_x", "o_r", "o_x", "u_r", "u_w", "u_x"],
+                    "user": "foo.user$",
+                },
+                "basic": {"is_dir": True, "name": "240485"},
+                "details": {"modified": 1483617540.0, "size": 0, "type": 1},
+                "ftp": {
+                    "ls": "drwxr-xr-x   2 foo.user$ foo@group_         0 Jan  5 11:59 240485"
+                },
+            },
         ]
 
         parsed = ftp_parse.parse(directory.strip().splitlines())