Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit99d0177

Browse files
author
Gauvain Pocentek
committed
CLI: refactor _die()
1 parent58ddf1d commit99d0177

File tree

1 file changed

+36
-35
lines changed

1 file changed

+36
-35
lines changed

‎gitlab/cli.py

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@
7373
}
7474

7575

76-
def_die(msg):
76+
def_die(msg,e=None):
77+
ife:
78+
msg="%s (%s)"% (msg,e)
7779
sys.stderr.write(msg+"\n")
7880
sys.exit(1)
7981

@@ -111,7 +113,7 @@ def do_create(self, cls, gl, what, args):
111113
try:
112114
o=cls.create(gl,args)
113115
exceptExceptionase:
114-
_die("Impossible to create object (%s)"%str(e))
116+
_die("Impossible to create object",e)
115117

116118
returno
117119

@@ -122,7 +124,7 @@ def do_list(self, cls, gl, what, args):
122124
try:
123125
l=cls.list(gl,**args)
124126
exceptExceptionase:
125-
_die("Impossible to list objects (%s)"%str(e))
127+
_die("Impossible to list objects",e)
126128

127129
returnl
128130

@@ -137,7 +139,7 @@ def do_get(self, cls, gl, what, args):
137139
try:
138140
o=cls.get(gl,id,**args)
139141
exceptExceptionase:
140-
_die("Impossible to get object (%s)"%str(e))
142+
_die("Impossible to get object",e)
141143

142144
returno
143145

@@ -149,7 +151,7 @@ def do_delete(self, cls, gl, what, args):
149151
try:
150152
gl.delete(cls,id,**args)
151153
exceptExceptionase:
152-
_die("Impossible to destroy object (%s)"%str(e))
154+
_die("Impossible to destroy object",e)
153155

154156
defdo_update(self,cls,gl,what,args):
155157
ifnotcls.canUpdate:
@@ -161,173 +163,172 @@ def do_update(self, cls, gl, what, args):
161163
o.__dict__[k]=v
162164
o.save()
163165
exceptExceptionase:
164-
_die("Impossible to update object (%s)"%str(e))
166+
_die("Impossible to update object",e)
165167

166168
returno
167169

168170
defdo_group_search(self,cls,gl,what,args):
169171
try:
170172
returngl.groups.search(args['query'])
171173
exceptExceptionase:
172-
_die("Impossible to search projects (%s)"%str(e))
174+
_die("Impossible to search projects",e)
173175

174176
defdo_project_search(self,cls,gl,what,args):
175177
try:
176178
returngl.projects.search(args['query'])
177179
exceptExceptionase:
178-
_die("Impossible to search projects (%s)"%str(e))
180+
_die("Impossible to search projects",e)
179181

180182
defdo_project_all(self,cls,gl,what,args):
181183
try:
182184
returngl.projects.all()
183185
exceptExceptionase:
184-
_die("Impossible to list all projects (%s)"%str(e))
186+
_die("Impossible to list all projects",e)
185187

186188
defdo_project_starred(self,cls,gl,what,args):
187189
try:
188190
returngl.projects.starred()
189191
exceptExceptionase:
190-
_die("Impossible to list starred projects (%s)"%str(e))
192+
_die("Impossible to list starred projects",e)
191193

192194
defdo_project_owned(self,cls,gl,what,args):
193195
try:
194196
returngl.projects.owned()
195197
exceptExceptionase:
196-
_die("Impossible to list owned projects (%s)"%str(e))
198+
_die("Impossible to list owned projects",e)
197199

198200
defdo_project_star(self,cls,gl,what,args):
199201
try:
200202
o=self.do_get(cls,gl,what,args)
201203
o.star()
202204
exceptExceptionase:
203-
_die("Impossible to star project (%s)"%str(e))
205+
_die("Impossible to star project",e)
204206

205207
defdo_project_unstar(self,cls,gl,what,args):
206208
try:
207209
o=self.do_get(cls,gl,what,args)
208210
o.unstar()
209211
exceptExceptionase:
210-
_die("Impossible to unstar project (%s)"%str(e))
212+
_die("Impossible to unstar project",e)
211213

212214
defdo_project_archive(self,cls,gl,what,args):
213215
try:
214216
o=self.do_get(cls,gl,what,args)
215217
o.archive_()
216218
exceptExceptionase:
217-
_die("Impossible to archive project (%s)"%str(e))
219+
_die("Impossible to archive project",e)
218220

219221
defdo_project_unarchive(self,cls,gl,what,args):
220222
try:
221223
o=self.do_get(cls,gl,what,args)
222224
o.unarchive_()
223225
exceptExceptionase:
224-
_die("Impossible to unarchive project (%s)"%str(e))
226+
_die("Impossible to unarchive project",e)
225227

226228
defdo_project_share(self,cls,gl,what,args):
227229
try:
228230
o=self.do_get(cls,gl,what,args)
229231
o.share(args['group_id'],args['group_access'])
230232
exceptExceptionase:
231-
_die("Impossible to share project (%s)"%str(e))
233+
_die("Impossible to share project",e)
232234

233235
defdo_user_block(self,cls,gl,what,args):
234236
try:
235237
o=self.do_get(cls,gl,what,args)
236238
o.block()
237239
exceptExceptionase:
238-
_die("Impossible to block user (%s)"%str(e))
240+
_die("Impossible to block user",e)
239241

240242
defdo_user_unblock(self,cls,gl,what,args):
241243
try:
242244
o=self.do_get(cls,gl,what,args)
243245
o.unblock()
244246
exceptExceptionase:
245-
_die("Impossible to block user (%s)"%str(e))
247+
_die("Impossible to block user",e)
246248

247249
defdo_project_commit_diff(self,cls,gl,what,args):
248250
try:
249251
o=self.do_get(cls,gl,what,args)
250252
return [x['diff']forxino.diff()]
251253
exceptExceptionase:
252-
_die("Impossible to get commit diff (%s)"%str(e))
254+
_die("Impossible to get commit diff",e)
253255

254256
defdo_project_commit_blob(self,cls,gl,what,args):
255257
try:
256258
o=self.do_get(cls,gl,what,args)
257259
returno.blob(args['filepath'])
258260
exceptExceptionase:
259-
_die("Impossible to get commit blob (%s)"%str(e))
261+
_die("Impossible to get commit blob",e)
260262

261263
defdo_project_commit_builds(self,cls,gl,what,args):
262264
try:
263265
o=self.do_get(cls,gl,what,args)
264266
returno.builds()
265267
exceptExceptionase:
266-
_die("Impossible to get commit builds (%s)"%str(e))
268+
_die("Impossible to get commit builds",e)
267269

268270
defdo_project_build_cancel(self,cls,gl,what,args):
269271
try:
270272
o=self.do_get(cls,gl,what,args)
271273
returno.cancel()
272274
exceptExceptionase:
273-
_die("Impossible to cancel project build (%s)"%str(e))
275+
_die("Impossible to cancel project build",e)
274276

275277
defdo_project_build_retry(self,cls,gl,what,args):
276278
try:
277279
o=self.do_get(cls,gl,what,args)
278280
returno.retry()
279281
exceptExceptionase:
280-
_die("Impossible to retry project build (%s)"%str(e))
282+
_die("Impossible to retry project build",e)
281283

282284
defdo_project_build_artifacts(self,cls,gl,what,args):
283285
try:
284286
o=self.do_get(cls,gl,what,args)
285287
returno.artifacts()
286288
exceptExceptionase:
287-
_die("Impossible to get project build artifacts (%s)"%str(e))
289+
_die("Impossible to get project build artifacts",e)
288290

289291
defdo_project_build_trace(self,cls,gl,what,args):
290292
try:
291293
o=self.do_get(cls,gl,what,args)
292294
returno.trace()
293295
exceptExceptionase:
294-
_die("Impossible to get project build trace (%s)"%str(e))
296+
_die("Impossible to get project build trace",e)
295297

296298
defdo_project_issue_subscribe(self,cls,gl,what,args):
297299
try:
298300
o=self.do_get(cls,gl,what,args)
299301
o.subscribe()
300302
exceptExceptionase:
301-
_die("Impossible to subscribe to issue (%s)"%str(e))
303+
_die("Impossible to subscribe to issue",e)
302304

303305
defdo_project_issue_unsubscribe(self,cls,gl,what,args):
304306
try:
305307
o=self.do_get(cls,gl,what,args)
306308
o.unsubscribe()
307309
exceptExceptionase:
308-
_die("Impossible to subscribe to issue (%s)"%str(e))
310+
_die("Impossible to subscribe to issue",e)
309311

310312
defdo_project_issue_move(self,cls,gl,what,args):
311313
try:
312314
o=self.do_get(cls,gl,what,args)
313315
o.move(args['to_project_id'])
314316
exceptExceptionase:
315-
_die("Impossible to move issue (%s)"%str(e))
317+
_die("Impossible to move issue",e)
316318

317319
defdo_project_merge_request_closesissues(self,cls,gl,what,args):
318320
try:
319321
o=self.do_get(cls,gl,what,args)
320322
returno.closes_issues()
321323
exceptExceptionase:
322-
_die("Impossible to list issues closed by merge request (%s)"%
323-
str(e))
324+
_die("Impossible to list issues closed by merge request",e)
324325

325326
defdo_project_merge_request_cancel(self,cls,gl,what,args):
326327
try:
327328
o=self.do_get(cls,gl,what,args)
328329
returno.cancel_merge_when_build_succeeds()
329330
exceptExceptionase:
330-
_die("Impossible to cancel merge request (%s)"%str(e))
331+
_die("Impossible to cancel merge request",e)
331332

332333
defdo_project_merge_request_merge(self,cls,gl,what,args):
333334
try:
@@ -339,26 +340,26 @@ def do_project_merge_request_merge(self, cls, gl, what, args):
339340
should_remove_source_branch=should_remove,
340341
merged_when_build_succeeds=build_succeeds)
341342
exceptExceptionase:
342-
_die("Impossible to validate merge request (%s)"%str(e))
343+
_die("Impossible to validate merge request",e)
343344

344345
defdo_project_milestone_issues(self,cls,gl,what,args):
345346
try:
346347
o=self.do_get(cls,gl,what,args)
347348
returno.issues()
348349
exceptExceptionase:
349-
_die("Impossible to get milestone issues (%s)"%str(e))
350+
_die("Impossible to get milestone issues",e)
350351

351352
defdo_user_search(self,cls,gl,what,args):
352353
try:
353354
returngl.users.search(args['query'])
354355
exceptExceptionase:
355-
_die("Impossible to search users (%s)"%str(e))
356+
_die("Impossible to search users",e)
356357

357358
defdo_user_getbyusername(self,cls,gl,what,args):
358359
try:
359360
returngl.users.search(args['query'])
360361
exceptExceptionase:
361-
_die("Impossible to get user %s (%s)"%(args['query'],str(e)))
362+
_die("Impossible to get user %s"%args['query'],e)
362363

363364

364365
def_populate_sub_parser_by_class(cls,sub_parser):

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp