fix typo

Author: huiguangjun

alibabacloud_oss_v2/downloader.py

@@ -266,7 +266,7 @@ def __init__(
         """
         self._base = base
         self._client = client
-        self._reqeust = request
+        self._request = request
         self._options = options
 
         self._rstart = 0
@@ -310,8 +310,8 @@ def writer_filepath(self) -> str:
     def check_source(self):
         """check source
         """
-        request = models.HeadObjectRequest(self._reqeust.bucket, self._reqeust.key)
-        copy_request(request, self._reqeust)
+        request = models.HeadObjectRequest(self._request.bucket, self._request.key)
+        copy_request(request, self._request)
         result = self._client.head_object(request)
 
         self._size_in_bytes = result.content_length
@@ -341,10 +341,10 @@ def adjust_range(self):
         self._rstart = 0
         self._epos = self._size_in_bytes
 
-        if self._reqeust.range_header is not None:
-            range_header = utils.parse_http_range(self._reqeust.range_header)
+        if self._request.range_header is not None:
+            range_header = utils.parse_http_range(self._request.range_header)
             if range_header[0] >= self._size_in_bytes:
-                raise ValueError(f'invalid range, size :{self._size_in_bytes}, range: {self._reqeust.range_header}')
+                raise ValueError(f'invalid range, size :{self._size_in_bytes}, range: {self._request.range_header}')
             if range_header[0] > 0:
                 self._pos = range_header[0]
             self._rstart = self._pos
@@ -359,7 +359,7 @@ def check_checkpoint(self):
             return
 
         checkpoint = DownloadCheckpoint(
-            request=self._reqeust,
+            request=self._request,
             filepath=self._temp_filepath,
             basedir=self._options.checkpoint_dir,
             headers=self._headers,
@@ -415,7 +415,7 @@ def update_crc_flag(self):
         """
         #FF_ENABLE_CRC64_CHECK_DOWNLOAD
         if (self._base._feature_flags & 0x00000010) > 0:
-            self._check_crc = self._reqeust.range_header is None
+            self._check_crc = self._request.range_header is None
             self._calc_crc = (self._checkpoint is not None and self._checkpoint.verify_data) or self._check_crc
 
     def download(self) -> DownloadResult:
@@ -470,7 +470,7 @@ def _process_part(self, start:int):
             return None
 
         size = self._calc_part_size(start)
-        request = copy.copy(self._reqeust)
+        request = copy.copy(self._request)
 
         got = 0
         error: Exception = None
@@ -528,12 +528,12 @@ def _update_progress(self, increment: int):
         if self._progress_lock:
             with self._progress_lock:
                 self._written += increment
-                if self._reqeust.progress_fn is not None:
-                    self._reqeust.progress_fn(increment, self._written, self._size_in_bytes)
+                if self._request.progress_fn is not None:
+                    self._request.progress_fn(increment, self._written, self._size_in_bytes)
         else:
             self._written += increment
-            if self._reqeust.progress_fn is not None:
-                self._reqeust.progress_fn(increment, self._written, self._size_in_bytes)
+            if self._request.progress_fn is not None:
+                self._request.progress_fn(increment, self._written, self._size_in_bytes)
 
         #print(f'_update_progress: {increment}, {self._written}, {self._size_in_bytes}\n')
 
@@ -584,6 +584,6 @@ def _assert_crc_same(self):
 
     def _wrap_error(self, error: Exception) -> Exception:
         return DownloadError(
-            path=f'oss://{self._reqeust.bucket}/{self._reqeust.key}',
+            path=f'oss://{self._request.bucket}/{self._request.key}',
             error=error
         )

alibabacloud_oss_v2/uploader.py

@@ -247,7 +247,7 @@ def upload_from(
 
     def _delegate(
         self,
-        request: models.GetObjectRequest,
+        request: models.PutObjectRequest,
         **kwargs: Any
     ) -> "_UploaderDelegate":
 
@@ -306,7 +306,7 @@ def __init__(
         """
         self._base = base
         self._client = client
-        self._reqeust = request
+        self._request = request
         self._options = options
 
         parallel = options.parallel_num > 1
@@ -391,7 +391,7 @@ def check_checkpoint(self):
             return
 
         checkpoint = UploadCheckpoint(
-            request=self._reqeust,
+            request=self._request,
             filepath=self._filepath,
             basedir=self._options.checkpoint_dir,
             fileinfo=self._file_stat,
@@ -466,7 +466,7 @@ def upload(self) -> UploadResult:
 
     def _single_part(self) -> UploadResult:
         request = models.PutObjectRequest()
-        copy_request(request, self._reqeust)
+        copy_request(request, self._request)
         request.body = self._reader
         if request.content_type is None:
             request.content_type = self._get_content_type()
@@ -519,7 +519,7 @@ def _multipart_part(self) -> UploadResult:
         cmresult: models.CompleteMultipartUploadResult = None
         if len(self._upload_errors) == 0:
             request = models.CompleteMultipartUploadRequest()
-            copy_request(request, self._reqeust)
+            copy_request(request, self._request)
             parts = sorted(self._uploaded_parts, key=lambda p: p.part_number)
             request.upload_id = upload_ctx.upload_id
             request.complete_multipart_upload = models.CompleteMultipartUpload(parts=parts)
@@ -534,7 +534,7 @@ def _multipart_part(self) -> UploadResult:
                 try:
                     abort_request = models.AbortMultipartUploadRequest()
                     abort_request.upload_id = upload_ctx.upload_id
-                    copy_request(request, self._reqeust)
+                    copy_request(request, self._request)
                     self._client.abort_multipart_upload(abort_request)
                 except Exception as _:
                     pass
@@ -565,7 +565,7 @@ def _get_upload_context(self) -> _UploadContext:
 
 	    #if not exist or fail, create a new upload id
         request = models.InitiateMultipartUploadRequest()
-        copy_request(request, self._reqeust)
+        copy_request(request, self._request)
         if request.content_type is None:
             request.content_type = self._get_content_type()
 
@@ -622,12 +622,12 @@ def _upload_part(self, part):
         hash_crc64 = None
         try:
             result = self._client.upload_part(models.UploadPartRequest(
-                bucket=self._reqeust.bucket,
-                key=self._reqeust.key,
+                bucket=self._request.bucket,
+                key=self._request.key,
                 upload_id=upload_id,
                 part_number=part_number,
                 body=body,
-                request_payer=self._reqeust.request_payer
+                request_payer=self._request.request_payer
             ))
             etag = result.etag
             hash_crc64 = result.hash_crc64
@@ -656,9 +656,9 @@ def _iter_uploaded_part(self):
         try:
             paginator = ListPartsPaginator(self._client)
             iterator = paginator.iter_page(models.ListPartsRequest(
-                bucket=self._reqeust.bucket,
-                key=self._reqeust.key,
-                request_payer=self._reqeust.request_payer,
+                bucket=self._request.bucket,
+                key=self._request.key,
+                request_payer=self._request.request_payer,
                 upload_id=self._upload_id,
             ))
             check_part_number = 1
@@ -707,6 +707,6 @@ def _assert_crc_same(self, headers: MutableMapping):
     def _wrap_error(self, upload_id: str, error: Exception) -> Exception:
         return UploadError(
             upload_id=upload_id,
-            path=f'oss://{self._reqeust.bucket}/{self._reqeust.key}',
+            path=f'oss://{self._request.bucket}/{self._request.key}',
             error=error
         )