Imported Debian patch 4.0.5-6~numeezy

doc/guide/guide.org

@@ -752,9 +752,9 @@ def run(api):
     except KeyboardInterrupt:
         print ''
         api.log.info('operation aborted')
-    except PublicError as e:
+    except PublicError, e:
         error = e
-    except Exception as e:
+    except StandardError, e:
         api.log.exception('%s: %s', e.__class__.__name__, str(e))
         error = InternalError()
     if error is not None:

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 as e:
+except StandardError, e:
     api.log.error('Failed to start IPA: %s' % e)
 else:
     api.log.info('*** PROCESS START ***')