remove join_paths and add _format_path

mmcv/fileio/file_client.py

@@ -2,6 +2,7 @@
 import inspect
 import os
 import os.path as osp
+import re
 from abc import ABCMeta, abstractmethod
 from pathlib import Path
 from typing import Optional, Union
@@ -92,8 +93,19 @@ def _path_mapping(self, filepath: str) -> str:
                 filepath = filepath.replace(k, v)
         return filepath
 
+    def _format_path(self, filepath: str) -> str:
+        """Convert filepath to standard format of petrel oss.
+
+        Since the filepath is concatenated by `os.path.join`, in a windows
+        environment, the filepath will be the format of
+        's3://bucket_name\\image.jpg'. By invoking `_format_path`, the above
+        filepath will be converted to 's3://bucket_name/image.jpn'.
+        """
+        return re.sub(r'\\+', '/', filepath)
+
     def get(self, filepath: Union[str, Path]) -> memoryview:
         filepath = self._path_mapping(str(filepath))
+        filepath = self._format_path(filepath)
         value = self._client.Get(filepath)
         value_buf = memoryview(value)
         return value_buf
@@ -105,25 +117,24 @@ def get_text(self,
 
     def put(self, obj: bytes, filepath: Union[str, Path]) -> None:
         filepath = self._path_mapping(str(filepath))
+        filepath = self._format_path(filepath)
         self._client.put(filepath, obj)
 
     def put_text(self,
                  obj: str,
                  filepath: Union[str, Path],
                  encoding: str = 'utf-8') -> None:
-        self.put(bytes(obj, encoding=encoding), str(filepath))
+        self.put(bytes(obj, encoding=encoding), filepath)
 
     def remove(self, filepath: Union[str, Path]) -> None:
         filepath = self._path_mapping(str(filepath))
+        filepath = self._format_path(filepath)
         self._client.delete(filepath)
 
     def check_exist(self, filepath: Union[str, Path]) -> bool:
         # TODO, need other team to support the feature
         return True
 
-    def join_paths(self, path, *paths) -> str:
-        return f'{path}/{"/".join(paths)}'
-
 
 class MemcachedBackend(BaseStorageBackend):
     """Memcached storage backend.
@@ -248,9 +259,6 @@ def remove(self, filepath: Union[str, Path]) -> None:
     def check_exist(self, filepath: Union[str, Path]) -> bool:
         return osp.exists(str(filepath))
 
-    def join_paths(self, path, *paths) -> str:
-        return osp.join(path, *paths)
-
 
 class HTTPBackend(BaseStorageBackend):
     """HTTP and HTTPS storage bachend."""
@@ -485,6 +493,3 @@ def remove(self, filepath):
 
     def check_exist(self, filepath):
         return self.client.check_exist(filepath)
-
-    def join_paths(self, path, *paths) -> str:
-        return self.client.join_paths(path, *paths)

tests/test_fileclient.py

@@ -1,4 +1,3 @@
-import platform
 import sys
 from pathlib import Path
 from unittest.mock import MagicMock, patch
@@ -265,23 +264,6 @@ def test_infer_client(self):
         client = FileClient.infer_client(uri=uri)
         assert client.backend_name == 'petrel'
 
-    def test_join_paths(self):
-        # HardDiskBackend
-        file_client_args = {'backend': 'disk'}
-        client = FileClient(**file_client_args)
-        dir1 = '/path/of/your/directory'
-        dir2 = 'c:\\windows\\path\\of\\your\\directory'
-        filename1 = 'filename'
-        if platform.system() == 'Windows':
-            assert client.join_paths(dir2, filename1) == f'{dir2}\\{filename1}'
-        else:
-            assert client.join_paths(dir1, filename1) == f'{dir1}/{filename1}'
-
-        # PetrelBackend
-        file_client_args = {'backend': 'petrel'}
-        client = FileClient(**file_client_args)
-        assert client.join_paths(dir1, filename1) == f'{dir1}/{filename1}'
-
     def test_register_backend(self):
 
         # name must be a string