Skip to content

Commit aa2ff8c

Browse files
authored
Reformat everything (#635)
Based on #634
1 parent ad798ca commit aa2ff8c

File tree

9 files changed

+10338
-10648
lines changed

9 files changed

+10338
-10648
lines changed

kaggle/api/kaggle_api_extended.py

Lines changed: 3456 additions & 3509 deletions
Large diffs are not rendered by default.

kaggle/cli.py

Lines changed: 1539 additions & 1641 deletions
Large diffs are not rendered by default.

kaggle/models/kaggle_models_extended.py

Lines changed: 147 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -38,244 +38,244 @@
3838

3939
class Competition(object):
4040

41-
def __init__(self, init_dict):
42-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
43-
self.__dict__.update(parsed_dict)
44-
self.tags = [Tag(t) for t in self.tags]
41+
def __init__(self, init_dict):
42+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
43+
self.__dict__.update(parsed_dict)
44+
self.tags = [Tag(t) for t in self.tags]
4545

46-
def __repr__(self):
47-
return self.ref
46+
def __repr__(self):
47+
return self.ref
4848

4949

5050
class SubmitResult(object):
5151

52-
def __init__(self, init_dict):
53-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
54-
self.__dict__.update(parsed_dict)
52+
def __init__(self, init_dict):
53+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
54+
self.__dict__.update(parsed_dict)
5555

56-
def __repr__(self):
57-
return self.message
56+
def __repr__(self):
57+
return self.message
5858

5959

6060
class Submission(object):
6161

62-
def __init__(self, init_dict):
63-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
64-
self.__dict__.update(parsed_dict)
65-
if self.totalBytes is None:
66-
self.size = None
67-
else:
68-
self.size = File.get_size(self.totalBytes)
62+
def __init__(self, init_dict):
63+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
64+
self.__dict__.update(parsed_dict)
65+
if self.totalBytes is None:
66+
self.size = None
67+
else:
68+
self.size = File.get_size(self.totalBytes)
6969

70-
def __repr__(self):
71-
return str(self.ref)
70+
def __repr__(self):
71+
return str(self.ref)
7272

7373

7474
class LeaderboardEntry(object):
7575

76-
def __init__(self, init_dict):
77-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
78-
self.__dict__.update(parsed_dict)
76+
def __init__(self, init_dict):
77+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
78+
self.__dict__.update(parsed_dict)
7979

80-
def __repr__(self):
81-
return self.teamId
80+
def __repr__(self):
81+
return self.teamId
8282

8383

8484
class Dataset(object):
8585

86-
def __init__(self, init_dict):
87-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
88-
self.__dict__.update(parsed_dict)
89-
self.tags = [Tag(t) for t in self.tags]
90-
self.files = [File(f) for f in self.files]
91-
self.versions = [DatasetVersion(v) for v in self.versions]
92-
self.size = File.get_size(self.totalBytes)
86+
def __init__(self, init_dict):
87+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
88+
self.__dict__.update(parsed_dict)
89+
self.tags = [Tag(t) for t in self.tags]
90+
self.files = [File(f) for f in self.files]
91+
self.versions = [DatasetVersion(v) for v in self.versions]
92+
self.size = File.get_size(self.totalBytes)
9393

94-
def __repr__(self):
95-
return self.ref
94+
def __repr__(self):
95+
return self.ref
9696

9797

9898
class Model(object):
9999

100-
def __init__(self, init_dict):
101-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
102-
self.__dict__.update(parsed_dict)
100+
def __init__(self, init_dict):
101+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
102+
self.__dict__.update(parsed_dict)
103103

104-
def __repr__(self):
105-
return self.ref
104+
def __repr__(self):
105+
return self.ref
106106

107107

108108
class Metadata(object):
109109

110-
def __init__(self, init_info):
111-
parsed_info = {k: parse(v) for k, v in init_info.items()}
112-
# backwards compatibility
113-
self.id = parsed_info["ownerUser"] + "/" + parsed_info['datasetSlug']
114-
self.id_no = parsed_info['datasetId']
115-
self.__dict__.update(parsed_info)
110+
def __init__(self, init_info):
111+
parsed_info = {k: parse(v) for k, v in init_info.items()}
112+
# backwards compatibility
113+
self.id = parsed_info["ownerUser"] + "/" + parsed_info['datasetSlug']
114+
self.id_no = parsed_info['datasetId']
115+
self.__dict__.update(parsed_info)
116116

117-
def __repr__(self):
118-
return str(self.datasetId)
117+
def __repr__(self):
118+
return str(self.datasetId)
119119

120120

121121
class DatasetVersion(object):
122122

123-
def __init__(self, init_dict):
124-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
125-
self.__dict__.update(parsed_dict)
123+
def __init__(self, init_dict):
124+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
125+
self.__dict__.update(parsed_dict)
126126

127-
def __repr__(self):
128-
return str(self.versionNumber)
127+
def __repr__(self):
128+
return str(self.versionNumber)
129129

130130

131131
class File(object):
132132

133-
def __init__(self, init_dict):
134-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
135-
self.__dict__.update(parsed_dict)
136-
self.size = File.get_size(self.totalBytes)
133+
def __init__(self, init_dict):
134+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
135+
self.__dict__.update(parsed_dict)
136+
self.size = File.get_size(self.totalBytes)
137137

138-
def __repr__(self):
139-
return self.name
138+
def __repr__(self):
139+
return self.name
140140

141-
@staticmethod
142-
def get_size(size, precision=0):
143-
suffixes = ['B', 'KB', 'MB', 'GB', 'TB']
144-
suffix_index = 0
145-
while size >= 1024 and suffix_index < 4:
146-
suffix_index += 1
147-
size /= 1024.0
148-
return '%.*f%s' % (precision, size, suffixes[suffix_index])
141+
@staticmethod
142+
def get_size(size, precision=0):
143+
suffixes = ['B', 'KB', 'MB', 'GB', 'TB']
144+
suffix_index = 0
145+
while size >= 1024 and suffix_index < 4:
146+
suffix_index += 1
147+
size /= 1024.0
148+
return '%.*f%s' % (precision, size, suffixes[suffix_index])
149149

150150

151151
class Tag(object):
152152

153-
def __init__(self, init_dict):
154-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
155-
self.__dict__.update(parsed_dict)
153+
def __init__(self, init_dict):
154+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
155+
self.__dict__.update(parsed_dict)
156156

157-
def __repr__(self):
158-
return self.ref
157+
def __repr__(self):
158+
return self.ref
159159

160160

161161
class DatasetNewVersionResponse(object):
162162

163-
def __init__(self, init_dict):
164-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
165-
self.__dict__.update(parsed_dict)
163+
def __init__(self, init_dict):
164+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
165+
self.__dict__.update(parsed_dict)
166166

167-
def __repr__(self):
168-
return self.url
167+
def __repr__(self):
168+
return self.url
169169

170170

171171
class DatasetNewResponse(object):
172172

173-
def __init__(self, init_dict):
174-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
175-
self.__dict__.update(parsed_dict)
173+
def __init__(self, init_dict):
174+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
175+
self.__dict__.update(parsed_dict)
176176

177-
def __repr__(self):
178-
return self.url
177+
def __repr__(self):
178+
return self.url
179179

180180

181181
class ListFilesResult(object):
182182

183-
def __init__(self, init_dict):
184-
self.error_message = init_dict['errorMessage']
185-
files = init_dict['datasetFiles']
186-
if files:
187-
self.files = [File(f) for f in files]
188-
else:
189-
self.files = {}
190-
token = init_dict['nextPageToken']
191-
if token:
192-
self.nextPageToken = token
193-
else:
194-
self.nextPageToken = ""
183+
def __init__(self, init_dict):
184+
self.error_message = init_dict['errorMessage']
185+
files = init_dict['datasetFiles']
186+
if files:
187+
self.files = [File(f) for f in files]
188+
else:
189+
self.files = {}
190+
token = init_dict['nextPageToken']
191+
if token:
192+
self.nextPageToken = token
193+
else:
194+
self.nextPageToken = ""
195195

196-
def __repr__(self):
197-
return self.error_message
196+
def __repr__(self):
197+
return self.error_message
198198

199199

200200
class Kernel:
201201

202-
def __init__(self, init_dict):
203-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
204-
self.__dict__.update(parsed_dict)
202+
def __init__(self, init_dict):
203+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
204+
self.__dict__.update(parsed_dict)
205205

206-
def __repr__(self):
207-
return self.title
206+
def __repr__(self):
207+
return self.title
208208

209209

210210
class KernelPushResponse(object):
211211

212-
def __init__(self, init_dict):
213-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
214-
self.__dict__.update(parsed_dict)
212+
def __init__(self, init_dict):
213+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
214+
self.__dict__.update(parsed_dict)
215215

216-
def __repr__(self):
217-
return self.newUrl
216+
def __repr__(self):
217+
return self.newUrl
218218

219219

220220
class ModelNewResponse(object):
221221

222-
def __init__(self, init_dict):
223-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
224-
self.__dict__.update(parsed_dict)
222+
def __init__(self, init_dict):
223+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
224+
self.__dict__.update(parsed_dict)
225225

226-
def __repr__(self):
227-
return self.url
226+
def __repr__(self):
227+
return self.url
228228

229229

230230
class ModelDeleteResponse(object):
231231

232-
def __init__(self, init_dict):
233-
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
234-
self.__dict__.update(parsed_dict)
232+
def __init__(self, init_dict):
233+
parsed_dict = {k: parse(v) for k, v in init_dict.items()}
234+
self.__dict__.update(parsed_dict)
235235

236-
def __repr__(self):
237-
return self.error
236+
def __repr__(self):
237+
return self.error
238238

239239

240240
def parse(string):
241-
time_formats = [
242-
'%Y-%m-%dT%H:%M:%S', '%Y-%m-%dT%H:%M:%SZ', '%Y-%m-%dT%H:%M:%S.%f',
243-
'%Y-%m-%dT%H:%M:%S.%fZ'
244-
]
245-
for t in time_formats:
246-
try:
247-
result = datetime.strptime(string[:26], t).replace(microsecond=0)
248-
return result
249-
except:
250-
pass
251-
return string
241+
time_formats = [
242+
'%Y-%m-%dT%H:%M:%S', '%Y-%m-%dT%H:%M:%SZ', '%Y-%m-%dT%H:%M:%S.%f',
243+
'%Y-%m-%dT%H:%M:%S.%fZ'
244+
]
245+
for t in time_formats:
246+
try:
247+
result = datetime.strptime(string[:26], t).replace(microsecond=0)
248+
return result
249+
except:
250+
pass
251+
return string
252252

253253

254254
class ResumableUploadResult(object):
255-
# Upload was complete, i.e., all bytes were received by the server.
256-
COMPLETE = 1
255+
# Upload was complete, i.e., all bytes were received by the server.
256+
COMPLETE = 1
257257

258-
# There was a non-transient error during the upload or the upload expired.
259-
# The upload cannot be resumed so it should be restarted from scratch
260-
# (i.e., call /api/v1/files/upload to initiate the upload and get the
261-
# create/upload url and token).
262-
FAILED = 2
258+
# There was a non-transient error during the upload or the upload expired.
259+
# The upload cannot be resumed so it should be restarted from scratch
260+
# (i.e., call /api/v1/files/upload to initiate the upload and get the
261+
# create/upload url and token).
262+
FAILED = 2
263263

264-
# Upload was interrupted due to some (transient) failure but it can be
265-
# safely resumed.
266-
INCOMPLETE = 3
264+
# Upload was interrupted due to some (transient) failure but it can be
265+
# safely resumed.
266+
INCOMPLETE = 3
267267

268-
def __init__(self, result, bytes_uploaded=None):
269-
self.result = result
270-
self.bytes_uploaded = bytes_uploaded
271-
self.start_at = 0 if bytes_uploaded is None else bytes_uploaded + 1
268+
def __init__(self, result, bytes_uploaded=None):
269+
self.result = result
270+
self.bytes_uploaded = bytes_uploaded
271+
self.start_at = 0 if bytes_uploaded is None else bytes_uploaded + 1
272272

273-
def Complete():
274-
return ResumableUploadResult(ResumableUploadResult.COMPLETE)
273+
def Complete():
274+
return ResumableUploadResult(ResumableUploadResult.COMPLETE)
275275

276-
def Failed():
277-
return ResumableUploadResult(ResumableUploadResult.FAILED)
276+
def Failed():
277+
return ResumableUploadResult(ResumableUploadResult.FAILED)
278278

279-
def Incomplete(bytes_uploaded=None):
280-
return ResumableUploadResult(ResumableUploadResult.INCOMPLETE,
281-
bytes_uploaded)
279+
def Incomplete(bytes_uploaded=None):
280+
return ResumableUploadResult(ResumableUploadResult.INCOMPLETE,
281+
bytes_uploaded)

0 commit comments

Comments
 (0)