cloud-files 4.27.0__py3-none-any.whl → 6.0.0__py3-none-any.whl

cloudfiles/compression.py

@@ -171,7 +171,7 @@ def gzip_compress(content, compresslevel=None):
     compresslevel = 9
 
   if deflate:
-    return deflate.gzip_compress(content, compresslevel)
+    return bytes(deflate.gzip_compress(content, compresslevel))
 
   stringio = BytesIO()
   gzip_obj = gzip.GzipFile(mode='wb', fileobj=stringio, compresslevel=compresslevel)
@@ -190,14 +190,19 @@ def gunzip(content):
     raise DecompressionError('File contains zero bytes.')
 
   gzip_magic_numbers = [ 0x1f, 0x8b ]
-  first_two_bytes = [ byte for byte in bytearray(content)[:2] ]
+
+  if isinstance(content, (bytes, bytearray)):
+    first_two_bytes = list(content[:2])
+  else:
+    first_two_bytes = [ byte for byte in bytearray(content)[:2] ]
+
   if first_two_bytes != gzip_magic_numbers:
     raise DecompressionError('File is not in gzip format. Magic numbers {}, {} did not match {}, {}.'.format(
       hex(first_two_bytes[0]), hex(first_two_bytes[1]), hex(gzip_magic_numbers[0]), hex(gzip_magic_numbers[1])
     ))
 
   if deflate:
-    return deflate.gzip_decompress(content)
+    return bytes(deflate.gzip_decompress(content))
 
   stringio = BytesIO(content)
   with gzip.GzipFile(mode='rb', fileobj=stringio) as gfile:

cloudfiles/exceptions.py

@@ -14,6 +14,10 @@ class CompressionError(Exception):
   """
   pass
 
+class AuthorizationError(Exception):
+  """Authorization Error"""
+  pass
+
 class UnsupportedCompressionType(Exception):
   """
   Raised when attempting to use a compression type which is unsupported

cloudfiles/gcs.py

@@ -78,14 +78,18 @@ def composite_upload(
   cache_control:Optional[str] = None,
   storage_class:Optional[str] = None,
   compress:CompressType = None,
+  skip_compress:bool = False,
 ) -> int:
   from .cloudfiles import CloudFiles, CloudFile
   
   content_encoding = compression.normalize_encoding(compress)
   if isinstance(handle, bytes):
-    handle = io.BytesIO(
-      compression.compress(handle, compress)
-    )
+    if skip_compress:
+      handle = io.BytesIO(handle)
+    else:
+      handle = io.BytesIO(
+        compression.compress(handle, compress)
+      )
     content_encoding = compression.normalize_encoding(compress)
 
   path = paths.extract(cloudpath)