Use posixpath instead of os.path where appropriate

This guarantees that join() will be performed using forward slashes.
datopian · Jun 18, 2021 · 84d8a8c · 84d8a8c
1 parent 07b9d44
commit 84d8a8c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/giftless/storage/amazon_s3.py b/giftless/storage/amazon_s3.py
@@ -1,4 +1,4 @@
-import os
+import posixpath
 from typing import Any, BinaryIO, Dict, Iterable, Optional
 
 import boto3  # type: ignore
@@ -112,7 +112,7 @@ def _get_blob_path(self, prefix: str, oid: str) -> str:
             storage_prefix = self.path_prefix[1:]
         else:
             storage_prefix = self.path_prefix
-        return os.path.join(storage_prefix, prefix, oid)
+        return posixpath.join(storage_prefix, prefix, oid)
 
     def _s3_object(self, prefix, oid):
         return self.s3.Object(self.bucket_name, self._get_blob_path(prefix, oid))
diff --git a/giftless/storage/azure.py b/giftless/storage/azure.py
@@ -1,6 +1,6 @@
 import base64
 import logging
-import os
+import posixpath
 from collections import namedtuple
 from datetime import datetime, timedelta, timezone
 from typing import Any, BinaryIO, Dict, Iterable, List, Optional
@@ -163,7 +163,7 @@ def _get_blob_path(self, prefix: str, oid: str) -> str:
             storage_prefix = self.path_prefix[1:]
         else:
             storage_prefix = self.path_prefix
-        return os.path.join(storage_prefix, prefix, oid)
+        return posixpath.join(storage_prefix, prefix, oid)
 
     def _get_signed_url(self, prefix: str, oid: str, expires_in: int, filename: Optional[str] = None,
                         disposition: Optional[str] = None, **permissions: bool) -> str:

diff --git a/giftless/storage/google_cloud.py b/giftless/storage/google_cloud.py
@@ -1,7 +1,7 @@
 import base64
 import io
 import json
-import os
+import posixpath
 from datetime import timedelta
 from typing import Any, BinaryIO, Dict, Optional
 
@@ -90,7 +90,7 @@ def _get_blob_path(self, prefix: str, oid: str) -> str:
             storage_prefix = self.path_prefix[1:]
         else:
             storage_prefix = self.path_prefix
-        return os.path.join(storage_prefix, prefix, oid)
+        return posixpath.join(storage_prefix, prefix, oid)
 
     def _get_signed_url(self, prefix: str, oid: str, expires_in: int, http_method: str = 'GET',
                         filename: Optional[str] = None, disposition: Optional[str] = None) -> str:

diff --git a/giftless/transfer/basic_external.py b/giftless/transfer/basic_external.py
@@ -11,7 +11,7 @@
 implement the `ExternalStorage` interface defined here.
 """
 
-import os
+import posixpath
 from typing import Any, Dict, Optional
 
 from giftless.storage import ExternalStorage, exc
@@ -27,7 +27,7 @@ def __init__(self, storage: ExternalStorage, default_action_lifetime: int):
         self.action_lifetime = default_action_lifetime
 
     def upload(self, organization: str, repo: str, oid: str, size: int, extra: Optional[Dict[str, Any]] = None) -> Dict:
-        prefix = os.path.join(organization, repo)
+        prefix = posixpath.join(organization, repo)
         response = {"oid": oid,
                     "size": size}
 
@@ -50,7 +50,7 @@ def upload(self, organization: str, repo: str, oid: str, size: int, extra: Optio
 
     def download(self, organization: str, repo: str, oid: str, size: int,
                  extra: Optional[Dict[str, Any]] = None) -> Dict:
-        prefix = os.path.join(organization, repo)
+        prefix = posixpath.join(organization, repo)
         response = {"oid": oid,
                     "size": size}
 

diff --git a/giftless/transfer/basic_streaming.py b/giftless/transfer/basic_streaming.py
@@ -6,7 +6,7 @@
 interface through which additional streaming backends can be implemented.
 """
 
-import os
+import posixpath
 from typing import Any, Dict, Optional
 
 from flask import Response, request, url_for
@@ -41,7 +41,7 @@ def verify(self, organization, repo):
 
         self._check_authorization(organization, repo, Permission.READ_META, oid=payload['oid'])
 
-        prefix = os.path.join(organization, repo)
+        prefix = posixpath.join(organization, repo)
         if not self.storage.verify_object(prefix, payload['oid'], payload['size']):
             raise InvalidPayload("Object does not exist or size does not match")
         return Response(status=200)
@@ -79,7 +79,7 @@ def get(self, organization, repo, oid):
         """Get an file open file stream from local storage
         """
         self._check_authorization(organization, repo, Permission.READ, oid=oid)
-        path = os.path.join(organization, repo)
+        path = posixpath.join(organization, repo)
 
         filename = request.args.get('filename')
         filename = safe_filename(filename)
@@ -118,7 +118,7 @@ def upload(self, organization: str, repo: str, oid: str, size: int, extra: Optio
         response = {"oid": oid,
                     "size": size}
 
-        prefix = os.path.join(organization, repo)
+        prefix = posixpath.join(organization, repo)
         if not self.storage.exists(prefix, oid) or self.storage.get_size(prefix, oid) != size:
             response['actions'] = {
                 "upload": {
@@ -142,7 +142,7 @@ def download(self, organization: str, repo: str, oid: str, size: int,
         response = {"oid": oid,
                     "size": size}
 
-        prefix = os.path.join(organization, repo)
+        prefix = posixpath.join(organization, repo)
         if not self.storage.exists(prefix, oid):
             response['error'] = {
                 "code": 404,

diff --git a/giftless/transfer/multipart.py b/giftless/transfer/multipart.py
@@ -1,7 +1,7 @@
 """Multipart Transfer Adapter
 """
 
-import os
+import posixpath
 from typing import Any, Dict, Optional
 
 from giftless.storage import MultipartStorage, exc
@@ -21,7 +21,7 @@ def __init__(self, storage: MultipartStorage, default_action_lifetime: int, max_
         self.action_lifetime = default_action_lifetime
 
     def upload(self, organization: str, repo: str, oid: str, size: int, extra: Optional[Dict[str, Any]] = None) -> Dict:
-        prefix = os.path.join(organization, repo)
+        prefix = posixpath.join(organization, repo)
         response = {"oid": oid,
                     "size": size}
 
@@ -45,7 +45,7 @@ def upload(self, organization: str, repo: str, oid: str, size: int, extra: Optio
 
     def download(self, organization: str, repo: str, oid: str, size: int,
                  extra: Optional[Dict[str, Any]] = None) -> Dict:
-        prefix = os.path.join(organization, repo)
+        prefix = posixpath.join(organization, repo)
         response = {"oid": oid,
                     "size": size}