diff options
| author | Tomas Babej <tbabej@redhat.com> | 2016-01-08 18:23:35 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-01-13 09:54:03 +0100 |
| commit | 50627004b83fe155767fb02b51099eba612a5855 (patch) | |
| tree | 98a5342880df3f206ce528bdd1a265a537465f42 /doc | |
| parent | 00c13fd340eedafe062ec5df56cdb689a5483589 (diff) | |
| download | freeipa-50627004b83fe155767fb02b51099eba612a5855.tar.gz freeipa-50627004b83fe155767fb02b51099eba612a5855.tar.xz freeipa-50627004b83fe155767fb02b51099eba612a5855.zip | |
py3: Remove py3 incompatible exception handling
https://fedorahosted.org/freeipa/ticket/5585
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guide/guide.org | 4 | ||||
| -rw-r--r-- | doc/guide/wsgi.py.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/guide/guide.org b/doc/guide/guide.org index 55c172535..6d181559f 100644 --- a/doc/guide/guide.org +++ b/doc/guide/guide.org @@ -752,9 +752,9 @@ def run(api): except KeyboardInterrupt: print '' api.log.info('operation aborted') - except PublicError, e: + except PublicError as e: error = e - except Exception, e: + except Exception as e: api.log.exception('%s: %s', e.__class__.__name__, str(e)) error = InternalError() if error is not None: diff --git a/doc/guide/wsgi.py.txt b/doc/guide/wsgi.py.txt index eb64f3a82..8566a25a1 100644 --- a/doc/guide/wsgi.py.txt +++ b/doc/guide/wsgi.py.txt @@ -13,7 +13,7 @@ env._finalize_core(**dict(DEFAULT_CONFIG)) api.bootstrap(context='server', debug=env.debug, log=None) (ref:wsgi-app-bootstrap) try: api.finalize() (ref:wsgi-app-finalize) -except Exception, e: +except Exception as e: api.log.error('Failed to start IPA: %s' % e) else: api.log.info('*** PROCESS START ***') |