Revision 0dff1e21
[#1667] Préparation compatibilité Python 3
Change-Id: I6d31beff11682430369cc19faedee49019b28ac0
Refs: #1667
| vigiboard/controllers/silence.py | ||
|---|---|---|
| 274 | 274 |
try: |
| 275 | 275 |
silence = DBSession.query(Silence |
| 276 | 276 |
).filter(Silence.idsilence == id).one() |
| 277 |
except InvalidRequestError, e:
|
|
| 277 |
except InvalidRequestError as e:
|
|
| 278 | 278 |
msg = _('An exception has been raised while ' \
|
| 279 | 279 |
'querying the database: %s') % str(e) |
| 280 | 280 |
error_handler.handle_error_message(msg) |
| ... | ... | |
| 373 | 373 |
try: |
| 374 | 374 |
supitem = DBSession.query(SupItem |
| 375 | 375 |
).filter(SupItem.idsupitem == idsupitem).one() |
| 376 |
except InvalidRequestError, e:
|
|
| 376 |
except InvalidRequestError as e:
|
|
| 377 | 377 |
msg = _('An exception has been raised while ' \
|
| 378 | 378 |
'querying the database: %s') % str(e) |
| 379 | 379 |
error_handler.handle_error_message(msg) |
| ... | ... | |
| 395 | 395 |
try: |
| 396 | 396 |
silence = DBSession.query(Silence |
| 397 | 397 |
).filter(Silence.idsilence == idsilence).one() |
| 398 |
except InvalidRequestError, e:
|
|
| 398 |
except InvalidRequestError as e:
|
|
| 399 | 399 |
msg = _('An exception has been raised while ' \
|
| 400 | 400 |
'querying the database: %s') % str(e) |
| 401 | 401 |
error_handler.handle_error_message(msg) |
| ... | ... | |
| 433 | 433 |
).filter(StateName.statename == state).one() |
| 434 | 434 |
silence.states.append(s) |
| 435 | 435 |
DBSession.flush() |
| 436 |
except (IntegrityError, InvalidRequestError), e:
|
|
| 436 |
except (IntegrityError, InvalidRequestError) as e:
|
|
| 437 | 437 |
msg = _('An exception has been raised while ' \
|
| 438 | 438 |
'updating the database: %s') % str(e) |
| 439 | 439 |
error_handler.handle_error_message(msg) |
| ... | ... | |
| 544 | 544 |
try: |
| 545 | 545 |
silences = DBSession.query(Silence |
| 546 | 546 |
).filter(Silence.idsilence.in_(id)).all() |
| 547 |
except InvalidRequestError, e:
|
|
| 547 |
except InvalidRequestError as e:
|
|
| 548 | 548 |
msg = _('An exception has been raised while ' \
|
| 549 | 549 |
'querying the database: %s') % str(e) |
| 550 | 550 |
error_handler.handle_error_message(msg) |
| ... | ... | |
| 575 | 575 |
for silence in silences: |
| 576 | 576 |
DBSession.delete(silence) |
| 577 | 577 |
DBSession.flush() |
| 578 |
except InvalidRequestError, e:
|
|
| 578 |
except InvalidRequestError as e:
|
|
| 579 | 579 |
msg = _('An exception has been raised while ' \
|
| 580 | 580 |
'deleting the silence rules: %s') % str(e) |
| 581 | 581 |
error_handler.handle_error_message(msg) |
Also available in: Unified diff