Skip to content

Commit d270ab8

Browse files
authored
Fix problems found during bug bash (#684)
This fixes a few problems found during the bug bash. It also disables running the formatter.
1 parent edc8131 commit d270ab8

File tree

10 files changed

+18
-15
lines changed

10 files changed

+18
-15
lines changed

kaggle/api/__init__.py

Whitespace-only changes.

kaggle/api/kaggle_api_extended.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
ApiCreateDatasetRequest, ApiCreateDatasetVersionRequestBody, \
7171
ApiCreateDatasetVersionByIdRequest, ApiCreateDatasetVersionRequest, \
7272
ApiDatasetNewFile, ApiUpdateDatasetMetadataRequest, \
73-
ApiGetDatasetMetadataRequest
73+
ApiGetDatasetMetadataRequest, ApiListDatasetFilesResponse
7474
from kagglesdk.datasets.types.dataset_enums import DatasetSelectionGroup, \
7575
DatasetSortBy, DatasetFileTypeGroup, DatasetLicenseGroup
7676
from kagglesdk.datasets.types.dataset_types import DatasetSettings, \
@@ -1474,6 +1474,7 @@ def dataset_list_files_cli(self,
14741474
if next_page_token:
14751475
print('Next Page Token = {}'.format(next_page_token))
14761476
fields = ['name', 'size', 'creationDate']
1477+
ApiListDatasetFilesResponse.files = ApiListDatasetFilesResponse.dataset_files
14771478
if csv_display:
14781479
self.print_csv(result.files, fields)
14791480
else:

kaggle/cli.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@ def main():
8383
try:
8484
out = args.func(**command_args)
8585
except ApiException as e:
86-
msg = '{} - {}'.format(str(e.status), e.reason)
87-
body = __parse_body(e.body)
88-
if body and 'message' in body:
89-
msg += ' - {}'.format(body['message'])
90-
print(msg)
86+
print(e)
9187
out = None
9288
error = True
9389
except ValueError as e:

kaggle/models/__init__.py

Whitespace-only changes.

kagglesdk/kaggle_object.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,10 @@ def _from_str(v):
129129
return datetime.fromisoformat(v)
130130
(dt, nanos) = fields
131131
millis = nanos[:3]
132-
return datetime.fromisoformat(f'{dt}.{millis}')
132+
try:
133+
return datetime.fromisoformat(f'{dt}.{millis}')
134+
except ValueError:
135+
return datetime.fromisoformat(dt) # Python 3.10
133136

134137

135138
class TimeDeltaSerializer(ObjectSerializer):

src/kaggle/api/kaggle_api_extended.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
ApiCreateDatasetRequest, ApiCreateDatasetVersionRequestBody, \
5555
ApiCreateDatasetVersionByIdRequest, ApiCreateDatasetVersionRequest, \
5656
ApiDatasetNewFile, ApiUpdateDatasetMetadataRequest, \
57-
ApiGetDatasetMetadataRequest
57+
ApiGetDatasetMetadataRequest, ApiListDatasetFilesResponse
5858
from kagglesdk.datasets.types.dataset_enums import DatasetSelectionGroup, \
5959
DatasetSortBy, DatasetFileTypeGroup, DatasetLicenseGroup
6060
from kagglesdk.datasets.types.dataset_types import DatasetSettings, \
@@ -1458,6 +1458,7 @@ def dataset_list_files_cli(self,
14581458
if next_page_token:
14591459
print('Next Page Token = {}'.format(next_page_token))
14601460
fields = ['name', 'size', 'creationDate']
1461+
ApiListDatasetFilesResponse.files = ApiListDatasetFilesResponse.dataset_files
14611462
if csv_display:
14621463
self.print_csv(result.files, fields)
14631464
else:

src/kaggle/cli.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,7 @@ def main():
6767
try:
6868
out = args.func(**command_args)
6969
except ApiException as e:
70-
msg = '{} - {}'.format(str(e.status), e.reason)
71-
body = __parse_body(e.body)
72-
if body and 'message' in body:
73-
msg += ' - {}'.format(body['message'])
74-
print(msg)
70+
print(e)
7571
out = None
7672
error = True
7773
except ValueError as e:

src/kagglesdk/kaggle_object.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,10 @@ def _from_str(v):
129129
return datetime.fromisoformat(v)
130130
(dt, nanos) = fields
131131
millis = nanos[:3]
132-
return datetime.fromisoformat(f'{dt}.{millis}')
132+
try:
133+
return datetime.fromisoformat(f'{dt}.{millis}')
134+
except ValueError:
135+
return datetime.fromisoformat(dt) # Python 3.10
133136

134137

135138
class TimeDeltaSerializer(ObjectSerializer):

tests/unit_tests.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ def test_kernels_a_list(self):
227227
try:
228228
kernels = api.kernels_list(sort_by='dateCreated', user='stevemessick', language='python')
229229
self.assertGreater(len(kernels), 0)
230+
api.kernels_list_cli(user='stevemessick', csv_display=True)
230231
except ApiException as e:
231232
self.fail(f"kernels_list failed: {e}")
232233

@@ -482,6 +483,7 @@ def test_dataset_d_list_files(self):
482483
self.assertTrue(hasattr(self.dataset_file, api.camel_to_snake(f)))
483484
for f in api.dataset_file_fields
484485
]
486+
api.dataset_list_files_cli(self.dataset)
485487
except ApiException as e:
486488
self.fail(f"dataset_list_files failed: {e}")
487489

tools/GeneratePythonLibrary.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ function reset {
8888

8989
echo "yapf3 -ir src/"
9090
if [ -x "$(command -v yapf3)" ]; then
91-
yapf3 -ir --style yapf src/
91+
# yapf3 -ir --style yapf src/
92+
echo skipped
9293
else
9394
echo "yapf3 is not installed on your system"
9495
fi

0 commit comments

Comments
 (0)