[#8530] convert exception handlers to except..as syntax

Futurize fixers:
* lib2to3.fixes.fix_except

27 files changed, 70 insertions, 70 deletions

diff --git a/odoo/addons/base/ir/ir_cron.py b/odoo/addons/base/ir/ir_cron.py
index a6f29ee0d95..3edf3fab094 100644
--- a/odoo/addons/base/ir/ir_cron.py
+++ b/odoo/addons/base/ir/ir_cron.py
@@ -95,7 +95,7 @@ class ir_cron(models.Model):
                 end_time = time.time()
                 _logger.debug('%.3fs (cron %s, server action %d with uid %d)', end_time - start_time, cron_name, server_action_id, self.env.uid)
             self.pool.signal_caches_change()
-        except Exception, e:
+        except Exception as e:
             self._handle_callback_exception(cron_name, server_action_id, job_id, e)
 
     @classmethod
@@ -166,7 +166,7 @@ class ir_cron(models.Model):
                     jobs = cr.dictfetchall()
                 else:
                     _logger.warning('Skipping database %s as its base version is not %s.', db_name, BASE_VERSION)
-        except psycopg2.ProgrammingError, e:
+        except psycopg2.ProgrammingError as e:
             if e.pgcode == '42P01':
                 # Class 42 — Syntax Error or Access Rule Violation; 42P01: undefined_table
                 # The table ir_cron does not exist; this is probably not an OpenERP database.
@@ -206,7 +206,7 @@ class ir_cron(models.Model):
                 finally:
                     job_cr.close()
 
-            except psycopg2.OperationalError, e:
+            except psycopg2.OperationalError as e:
                 if e.pgcode == '55P03':
                     # Class 55: Object not in prerequisite state; 55P03: lock_not_available
                     _logger.debug('Another process/thread is already busy executing job `%s`, skipping it.', job['cron_name'])
diff --git a/odoo/addons/base/ir/ir_fields.py b/odoo/addons/base/ir/ir_fields.py
index 0d880687cfb..26c351d6fa8 100644
--- a/odoo/addons/base/ir/ir_fields.py
+++ b/odoo/addons/base/ir/ir_fields.py
@@ -83,7 +83,7 @@ class IrFieldsConverter(models.AbstractModel):
                             # uniform handling
                             w = ImportWarning(w)
                         log(field, w)
-                except ValueError, e:
+                except ValueError as e:
                     log(field, e)
             return converted
 
diff --git a/odoo/addons/base/ir/ir_http.py b/odoo/addons/base/ir/ir_http.py
index 1d942e75a86..75676910461 100644
--- a/odoo/addons/base/ir/ir_http.py
+++ b/odoo/addons/base/ir/ir_http.py
@@ -176,7 +176,7 @@ class IrHttp(models.AbstractModel):
         try:
             rule, arguments = cls._find_handler(return_rule=True)
             func = rule.endpoint
-        except werkzeug.exceptions.NotFound, e:
+        except werkzeug.exceptions.NotFound as e:
             return cls._handle_exception(e)
 
         # check authentication level
@@ -195,7 +195,7 @@ class IrHttp(models.AbstractModel):
             result = request.dispatch()
             if isinstance(result, Exception):
                 raise result
-        except Exception, e:
+        except Exception as e:
             return cls._handle_exception(e)
 
         return result
diff --git a/odoo/addons/base/ir/ir_qweb/assetsbundle.py b/odoo/addons/base/ir/ir_qweb/assetsbundle.py
index 47a7cd1b8b8..5bc2dec8a9b 100644
--- a/odoo/addons/base/ir/ir_qweb/assetsbundle.py
+++ b/odoo/addons/base/ir/ir_qweb/assetsbundle.py
@@ -523,7 +523,7 @@ class JavascriptAsset(WebAsset):
     def _fetch_content(self):
         try:
             return super(JavascriptAsset, self)._fetch_content()
-        except AssetError, e:
+        except AssetError as e:
             return "console.error(%s);" % json.dumps(e.message)
 
     def to_html(self):
@@ -572,7 +572,7 @@ class StylesheetAsset(WebAsset):
                 content = self.rx_charset.sub('', content)
 
             return content
-        except AssetError, e:
+        except AssetError as e:
             self.bundle.css_errors.append(e.message)
             return ''
 
diff --git a/odoo/addons/base/ir/ir_qweb/qweb.py b/odoo/addons/base/ir/ir_qweb/qweb.py
index 89281963de7..e4b618a47e4 100644
--- a/odoo/addons/base/ir/ir_qweb/qweb.py
+++ b/odoo/addons/base/ir/ir_qweb/qweb.py
@@ -281,9 +281,9 @@ class QWeb(object):
             _options['ast_calls'] = []
             def_name = self._create_def(_options, body, prefix='template_%s' % name.replace('.', '_'))
             _options['ast_calls'] += ast_calls
-        except QWebException, e:
+        except QWebException as e:
             raise e
-        except Exception, e:
+        except Exception as e:
             path = _options['last_path_node']
             node = element.getroottree().xpath(path)
             raise QWebException("Error when compiling AST", e, path, etree.tostring(node[0]), name)
@@ -301,9 +301,9 @@ class QWeb(object):
             ns = {}
             unsafe_eval(compile(astmod, '<template>', 'exec'), ns)
             compiled = ns[def_name]
-        except QWebException, e:
+        except QWebException as e:
             raise e
-        except Exception, e:
+        except Exception as e:
             path = _options['last_path_node']
             node = element.getroottree().xpath(path)
             raise QWebException("Error when compiling AST", e, path, node and etree.tostring(node[0]), name)
@@ -315,9 +315,9 @@ class QWeb(object):
             values = dict(self.default_values(), **values)
             try:
                 return compiled(self, append, values, options, log)
-            except QWebException, e:
+            except QWebException as e:
                 raise e
-            except Exception, e:
+            except Exception as e:
                 path = log['last_path_node']
                 element, document = self.get_template(template, options)
                 node = element.getroottree().xpath(path)
@@ -341,9 +341,9 @@ class QWeb(object):
         else:
             try:
                 document = options.get('load', self.load)(template, options)
-            except QWebException, e:
+            except QWebException as e:
                 raise e
-            except Exception, e:
+            except Exception as e:
                 raise QWebException("load could not load template", name=template)
 
         if document is not None:
diff --git a/odoo/addons/base/module/module.py b/odoo/addons/base/module/module.py
index 04cb68f61c2..1178fcca49f 100644
--- a/odoo/addons/base/module/module.py
+++ b/odoo/addons/base/module/module.py
@@ -310,7 +310,7 @@ class Module(models.Model):
         terp = cls.get_module_info(module_name)
         try:
             cls._check_external_dependencies(terp)
-        except Exception, e:
+        except Exception as e:
             if newstate == 'to install':
                 msg = _('Unable to install module "%s" because an external dependency is not met: %s')
             elif newstate == 'to upgrade':
diff --git a/odoo/addons/base/res/res_font.py b/odoo/addons/base/res/res_font.py
index 9107455f728..873bea5aa03 100644
--- a/odoo/addons/base/res/res_font.py
+++ b/odoo/addons/base/res/res_font.py
@@ -79,7 +79,7 @@ class ResFont(models.Model):
                 font = ttfonts.TTFontFile(font_path)
                 _logger.debug("Found font %s at %s", font.name, font_path)
                 found_fonts.append((font.familyName, font.name, font_path, font.styleName))
-            except Exception, ex:
+            except Exception as ex:
                 _logger.warning("Could not register Font %s: %s", font_path, ex)
 
         for family, name, path, mode in found_fonts:
diff --git a/odoo/cli/deploy.py b/odoo/cli/deploy.py
index 2e97d838ec2..2547ebdcd78 100644
--- a/odoo/cli/deploy.py
+++ b/odoo/cli/deploy.py
@@ -95,5 +95,5 @@ class Deploy(Command):
                 args.url = 'https://%s' % args.url
             result = self.deploy_module(args.path, args.url, args.login, args.password, args.db, force=args.force)
             print(result)
-        except Exception, e:
+        except Exception as e:
             sys.exit("ERROR: %s" % e)
diff --git a/odoo/cli/start.py b/odoo/cli/start.py
index 043c411ad8d..306722b23da 100644
--- a/odoo/cli/start.py
+++ b/odoo/cli/start.py
@@ -56,9 +56,9 @@ class Start(Command):
         # TODO: forbid some database names ? eg template1, ...
         try:
             _create_empty_database(args.db_name)
-        except DatabaseExists, e:
+        except DatabaseExists as e:
             pass
-        except Exception, e:
+        except Exception as e:
             die("Could not create database `%s`. (%s)" % (args.db_name, e))
 
         if '--db-filter' not in cmdargs:
diff --git a/odoo/http.py b/odoo/http.py
index cef63e8f639..015c00342b4 100644
--- a/odoo/http.py
+++ b/odoo/http.py
@@ -131,11 +131,11 @@ def dispatch_rpc(service_name, method, params):
         return result
     except NO_POSTMORTEM:
         raise
-    except odoo.exceptions.DeferredException, e:
+    except odoo.exceptions.DeferredException as e:
         _logger.exception(odoo.tools.exception_to_unicode(e))
         odoo.tools.debugger.post_mortem(odoo.tools.config, e.traceback)
         raise
-    except Exception, e:
+    except Exception as e:
         _logger.exception(odoo.tools.exception_to_unicode(e))
         odoo.tools.debugger.post_mortem(odoo.tools.config, sys.exc_info())
         raise
@@ -687,7 +687,7 @@ class JsonRequest(WebRequest):
                     rpc_request.debug(logline)
 
             return self._json_response(result)
-        except Exception, e:
+        except Exception as e:
             return self._handle_exception(e)
 
 def serialize_exception(e):
@@ -777,7 +777,7 @@ class HttpRequest(WebRequest):
                     'redirect': redirect,
                 })
                 return werkzeug.utils.redirect('/web/login?%s' % query)
-        except werkzeug.exceptions.HTTPException, e:
+        except werkzeug.exceptions.HTTPException as e:
             return e
 
     def dispatch(self):
@@ -1391,7 +1391,7 @@ class Root(object):
         if isinstance(result, Response) and result.is_qweb:
             try:
                 result.flatten()
-            except(Exception), e:
+            except(Exception) as e:
                 if request.db:
                     result = request.registry['ir.http']._handle_exception(e)
                 else:
@@ -1448,7 +1448,7 @@ class Root(object):
             def _dispatch_nodb():
                 try:
                     func, arguments = self.nodb_routing_map.bind_to_environ(request.httprequest.environ).match()
-                except werkzeug.exceptions.HTTPException, e:
+                except werkzeug.exceptions.HTTPException as e:
                     return request._handle_exception(e)
                 request.set_handler(func, arguments, "none")
                 result = request.dispatch()
@@ -1483,7 +1483,7 @@ class Root(object):
                 response = self.get_response(httprequest, result, explicit_session)
             return response(environ, start_response)
 
-        except werkzeug.exceptions.HTTPException, e:
+        except werkzeug.exceptions.HTTPException as e:
             return e(environ, start_response)
 
     def get_db_router(self, db):
diff --git a/odoo/models.py b/odoo/models.py
index 8e88b82c788..e5805e74bba 100644
--- a/odoo/models.py
+++ b/odoo/models.py
@@ -941,7 +941,7 @@ class BaseModel(object):
                 valid = names and not (set(names) & field_names)
                 valid = valid or func(self)
                 extra_error = None
-            except Exception, e:
+            except Exception as e:
                 _logger.debug('Exception while validating constraint', exc_info=True)
                 valid = False
                 extra_error = tools.ustr(e)
@@ -964,9 +964,9 @@ class BaseModel(object):
             if set(check._constrains) & field_names:
                 try:
                     check(self)
-                except ValidationError, e:
+                except ValidationError as e:
                     raise
-                except Exception, e:
+                except Exception as e:
                     raise ValidationError("%s\n\n%s" % (_("Error while validating constraint"), tools.ustr(e)))
 
     @api.model
diff --git a/odoo/modules/module.py b/odoo/modules/module.py
index ecf95be088b..be2977c131e 100644
--- a/odoo/modules/module.py
+++ b/odoo/modules/module.py
@@ -373,7 +373,7 @@ def load_openerp_module(module_name):
         if info['post_load']:
             getattr(sys.modules['odoo.addons.' + module_name], info['post_load'])()
 
-    except Exception, e:
+    except Exception as e:
         msg = "Couldn't load module %s" % (module_name)
         _logger.critical(msg)
         _logger.critical(e)
@@ -427,7 +427,7 @@ def get_test_modules(module):
     modpath = 'odoo.addons.' + module
     try:
         mod = importlib.import_module('.tests', modpath)
-    except Exception, e:
+    except Exception as e:
         # If module has no `tests` sub-module, no problem.
         if str(e) != 'No module named tests':
             _logger.exception('Can not `import %s`.', module)
diff --git a/odoo/report/render/rml2pdf/trml2pdf.py b/odoo/report/render/rml2pdf/trml2pdf.py
index 22eac51cfab..47ab8d313a5 100644
--- a/odoo/report/render/rml2pdf/trml2pdf.py
+++ b/odoo/report/render/rml2pdf/trml2pdf.py
@@ -1015,7 +1015,7 @@ class _rml_template(object):
                 self.doc_tmpl.build(fis,canvasmaker=NumberedCanvas)
             else:
                 self.doc_tmpl.build(fis)
-        except platypus.doctemplate.LayoutError, e:
+        except platypus.doctemplate.LayoutError as e:
             e.name = 'Print Error'
             e.value = 'The document you are trying to print contains a table row that does not fit on one page. Please try to split it in smaller rows or contact your administrator.'
             raise
@@ -1026,7 +1026,7 @@ def parseNode(rml, localcontext=None, fout=None, images=None, path='.', title=No
     #try to override some font mappings
     try:
         SetCustomFonts(r)
-    except Exception, exc:
+    except Exception as exc:
         _logger.info('Cannot set font mapping: %s', "".join(traceback.format_exception_only(type(exc),exc)))
     fp = StringIO()
     r.render(fp)
diff --git a/odoo/report/render/rml2pdf/utils.py b/odoo/report/render/rml2pdf/utils.py
index 0a9a6bd44bf..785e12fdc41 100644
--- a/odoo/report/render/rml2pdf/utils.py
+++ b/odoo/report/render/rml2pdf/utils.py
@@ -34,7 +34,7 @@ def _child_get(node, self=None, tagname=None):
                             safe_eval(n.get('rml_except'), {}, self.localcontext)
                         except GeneratorExit:
                             continue
-                        except Exception, e:
+                        except Exception as e:
                             _logger.info('rml_except: "%s"', n.get('rml_except',''), exc_info=True)
                             continue
                     if n.get('rml_tag'):
@@ -46,7 +46,7 @@ def _child_get(node, self=None, tagname=None):
                             yield n2
                         except GeneratorExit:
                             yield n
-                        except Exception, e:
+                        except Exception as e:
                             _logger.info('rml_tag: "%s"', n.get('rml_tag',''), exc_info=True)
                             yield n
                     else:
@@ -57,7 +57,7 @@ def _child_get(node, self=None, tagname=None):
                 safe_eval(n.get('rml_except'), {}, self.localcontext)
             except GeneratorExit:
                 continue
-            except Exception, e:
+            except Exception as e:
                 _logger.info('rml_except: "%s"', n.get('rml_except',''), exc_info=True)
                 continue
         if self and self.localcontext and n.get('rml_tag'):
@@ -70,7 +70,7 @@ def _child_get(node, self=None, tagname=None):
                 tagname = ''
             except GeneratorExit:
                 pass
-            except Exception, e:
+            except Exception as e:
                 _logger.info('rml_tag: "%s"', n.get('rml_tag',''), exc_info=True)
                 pass
         if (tagname is None) or (n.tag==tagname):
diff --git a/odoo/service/db.py b/odoo/service/db.py
index a9968963fb8..e20dcb7442a 100644
--- a/odoo/service/db.py
+++ b/odoo/service/db.py
@@ -73,7 +73,7 @@ def _initialize_db(id, db_name, demo, lang, user_password, login='admin', countr
 
             cr.execute('SELECT login, password FROM res_users ORDER BY login')
             cr.commit()
-    except Exception, e:
+    except Exception as e:
         _logger.exception('CREATE DATABASE failed:')
 
 def _create_empty_database(name):
@@ -145,7 +145,7 @@ def exp_drop(db_name):
 
         try:
             cr.execute('DROP DATABASE "%s"' % db_name)
-        except Exception, e:
+        except Exception as e:
             _logger.info('DROP DB: %s failed:\n%s', db_name, e)
             raise Exception("Couldn't drop database %s: %s" % (db_name, e))
         else:
@@ -287,7 +287,7 @@ def exp_rename(old_name, new_name):
         try:
             cr.execute('ALTER DATABASE "%s" RENAME TO "%s"' % (old_name, new_name))
             _logger.info('RENAME DB: %s -> %s', old_name, new_name)
-        except Exception, e:
+        except Exception as e:
             _logger.info('RENAME DB: %s -> %s failed:\n%s', old_name, new_name, e)
             raise Exception("Couldn't rename database %s to %s: %s" % (old_name, new_name, e))
 
diff --git a/odoo/service/model.py b/odoo/service/model.py
index 8ad94fd4f56..6502f74d2bb 100644
--- a/odoo/service/model.py
+++ b/odoo/service/model.py
@@ -134,7 +134,7 @@ def check(f):
                 tries += 1
                 _logger.info("%s, retry %d/%d in %.04f sec..." % (errorcodes.lookup(e.pgcode), tries, MAX_TRIES_ON_CONCURRENCY_FAILURE, wait_time))
                 time.sleep(wait_time)
-            except IntegrityError, inst:
+            except IntegrityError as inst:
                 registry = odoo.registry(dbname)
                 for key in registry._sql_error.keys():
                     if key in inst[0]:
diff --git a/odoo/service/report.py b/odoo/service/report.py
index 011fb19ca63..efeef65f656 100644
--- a/odoo/service/report.py
+++ b/odoo/service/report.py
@@ -59,7 +59,7 @@ def exp_render_report(db, uid, object, ids, datas=None, context=None):
         self_reports[id]['result'] = result
         self_reports[id]['format'] = format
         self_reports[id]['state'] = True
-    except Exception, exception:
+    except Exception as exception:
 
         _logger.exception('Exception: %s\n', exception)
         if hasattr(exception, 'name') and hasattr(exception, 'value'):
@@ -98,7 +98,7 @@ def exp_report(db, uid, object, ids, datas=None, context=None):
                 self_reports[id]['result'] = result
                 self_reports[id]['format'] = format
                 self_reports[id]['state'] = True
-            except Exception, exception:
+            except Exception as exception:
                 _logger.exception('Exception: %s\n', exception)
                 if hasattr(exception, 'name') and hasattr(exception, 'value'):
                     self_reports[id]['exception'] = odoo.exceptions.DeferredException(tools.ustr(exception.name), tools.ustr(exception.value))
diff --git a/odoo/service/server.py b/odoo/service/server.py
index 85bdfc12e0c..97d99983597 100644
--- a/odoo/service/server.py
+++ b/odoo/service/server.py
@@ -173,7 +173,7 @@ class CommonServer(object):
         """
         try:
             sock.shutdown(socket.SHUT_RDWR)
-        except socket.error, e:
+        except socket.error as e:
             if e.errno == errno.EBADF:
                 # Werkzeug > 0.9.6 closes the socket itself (see commit
                 # https://github.com/mitsuhiko/werkzeug/commit/4d8ca089)
@@ -422,7 +422,7 @@ class PreforkServer(CommonServer):
     def pipe_ping(self, pipe):
         try:
             os.write(pipe[1], '.')
-        except IOError, e:
+        except IOError as e:
             if e.errno not in [errno.EAGAIN, errno.EINTR]:
                 raise
 
@@ -468,7 +468,7 @@ class PreforkServer(CommonServer):
     def worker_kill(self, pid, sig):
         try:
             os.kill(pid, sig)
-        except OSError, e:
+        except OSError as e:
             if e.errno == errno.ESRCH:
                 self.worker_pop(pid)
 
@@ -506,7 +506,7 @@ class PreforkServer(CommonServer):
                     _logger.critical(msg, wpid)
                     raise Exception(msg % wpid)
                 self.worker_pop(wpid)
-            except OSError, e:
+            except OSError as e:
                 if e.errno == errno.ECHILD:
                     break
                 raise
@@ -546,10 +546,10 @@ class PreforkServer(CommonServer):
                     # empty pipe
                     while os.read(fd, 1):
                         pass
-                except OSError, e:
+                except OSError as e:
                     if e.errno not in [errno.EAGAIN]:
                         raise
-        except select.error, e:
+        except select.error as e:
             if e[0] not in [errno.EINTR]:
                 raise
 
@@ -626,7 +626,7 @@ class PreforkServer(CommonServer):
                 _logger.debug("Multiprocess clean stop")
                 self.stop()
                 break
-            except Exception, e:
+            except Exception as e:
                 _logger.exception(e)
                 self.stop(False)
                 return -1
@@ -659,7 +659,7 @@ class Worker(object):
     def sleep(self):
         try:
             select.select([self.multi.socket], [], [], self.multi.beat)
-        except select.error, e:
+        except select.error as e:
             if e[0] not in [errno.EINTR]:
                 raise
 
@@ -748,7 +748,7 @@ class WorkerHTTP(Worker):
         # receiving the full reply
         try:
             self.server.process_request(client, addr)
-        except IOError, e:
+        except IOError as e:
             if e.errno != errno.EPIPE:
                 raise
         self.request_count += 1
@@ -757,7 +757,7 @@ class WorkerHTTP(Worker):
         try:
             client, addr = self.multi.socket.accept()
             self.process_request(client, addr)
-        except socket.error, e:
+        except socket.error as e:
             if e[0] not in (errno.EAGAIN, errno.ECONNABORTED):
                 raise
 
diff --git a/odoo/service/wsgi_server.py b/odoo/service/wsgi_server.py
index 9669fabf5d3..3f4dc4b46ad 100644
--- a/odoo/service/wsgi_server.py
+++ b/odoo/service/wsgi_server.py
@@ -55,7 +55,7 @@ def xmlrpc_return(start_response, service, method, params, string_faultcode=Fals
     try:
         result = odoo.http.dispatch_rpc(service, method, params)
         response = xmlrpclib.dumps((result,), methodresponse=1, allow_none=False, encoding=None)
-    except Exception, e:
+    except Exception as e:
         if string_faultcode:
             response = xmlrpc_handle_exception_string(e)
         else:
diff --git a/odoo/tests/common.py b/odoo/tests/common.py
index c2464864972..c16ce8b0425 100644
--- a/odoo/tests/common.py
+++ b/odoo/tests/common.py
@@ -312,7 +312,7 @@ class HttpCase(TransactionCase):
             # read a byte
             try:
                 ready, _, _ = select.select([phantom.stdout], [], [], 0.5)
-            except select.error, e:
+            except select.error as e:
                 # In Python 2, select.error has no relation to IOError or
                 # OSError, and no errno/strerror/filename, only a pair of
                 # unnamed arguments (matching errno and strerror)
diff --git a/odoo/tools/convert.py b/odoo/tools/convert.py
index 1301e035241..c7faab244d3 100644
--- a/odoo/tools/convert.py
+++ b/odoo/tools/convert.py
@@ -781,7 +781,7 @@ form: module.record_id""" % (xml_id,)
             elif rec.tag in self._tags:
                 try:
                     self._tags[rec.tag](rec, de, mode=mode)
-                except Exception, e:
+                except Exception as e:
                     self.cr.rollback()
                     exc_info = sys.exc_info()
                     raise ParseError, (ustr(e), etree.tostring(rec).rstrip(), rec.getroottree().docinfo.URL, rec.sourceline), exc_info[2]
diff --git a/odoo/tools/mail.py b/odoo/tools/mail.py
index e1a4eeb9c54..490006082d5 100644
--- a/odoo/tools/mail.py
+++ b/odoo/tools/mail.py
@@ -233,7 +233,7 @@ def html_sanitize(src, silent=True, sanitize_tags=True, sanitize_attributes=Fals
         cleaned = cleaned.replace('%&gt;', '%>')
         # html considerations so real html content match database value
         cleaned.replace(u'\xa0', '&nbsp;')
-    except etree.ParserError, e:
+    except etree.ParserError as e:
         if 'empty' in str(e):
             return ""
         if not silent:
diff --git a/odoo/tools/safe_eval.py b/odoo/tools/safe_eval.py
index 4d8e5b63d9f..14020378c21 100644
--- a/odoo/tools/safe_eval.py
+++ b/odoo/tools/safe_eval.py
@@ -156,7 +156,7 @@ def test_expr(expr, allowed_codes, mode="eval"):
         code_obj = compile(expr, "", mode)
     except (SyntaxError, TypeError, ValueError):
         raise
-    except Exception, e:
+    except Exception as e:
         import sys
         exc_info = sys.exc_info()
         raise ValueError, '"%s" while compiling\n%r' % (ustr(e), expr), exc_info[2]
@@ -319,7 +319,7 @@ def safe_eval(expr, globals_dict=None, locals_dict=None, mode="eval", nocopy=Fal
         raise
     except odoo.exceptions.MissingError:
         raise
-    except Exception, e:
+    except Exception as e:
         import sys
         exc_info = sys.exc_info()
         raise ValueError, '%s: "%s" while evaluating\n%r' % (ustr(type(e)), ustr(e), expr), exc_info[2]
diff --git a/odoo/tools/test_reports.py b/odoo/tools/test_reports.py
index 962f84b2ed7..ef09862bc01 100644
--- a/odoo/tools/test_reports.py
+++ b/odoo/tools/test_reports.py
@@ -218,7 +218,7 @@ def try_report_action(cr, uid, action_id, active_model=None, active_ids=None,
                         'type': button.getAttribute('type'),
                         'weight': button_weight,
                     })
-            except Exception, e:
+            except Exception as e:
                 _logger.warning("Cannot resolve the view arch and locate the buttons!", exc_info=True)
                 raise AssertionError(e.args[0])
 
diff --git a/odoo/tools/translate.py b/odoo/tools/translate.py
index c947ae5e75d..b33b356a2f9 100644
--- a/odoo/tools/translate.py
+++ b/odoo/tools/translate.py
@@ -846,7 +846,7 @@ def trans_generate(lang, modules, cr):
         if model=='ir.model.fields':
             try:
                 field_name = encode(record.name)
-            except AttributeError, exc:
+            except AttributeError as exc:
                 _logger.error("name error in %s: %s", xml_name, str(exc))
                 continue
             field_model = env.get(record.model)
diff --git a/odoo/tools/xml_utils.py b/odoo/tools/xml_utils.py
index d179559db75..df4c5669644 100644
--- a/odoo/tools/xml_utils.py
+++ b/odoo/tools/xml_utils.py
@@ -10,7 +10,7 @@ def check_with_xsd(tree_or_str, xsd_path):
     xsd_schema = etree.XMLSchema(xml_schema_doc)
     try:
         xsd_schema.assertValid(tree_or_str)
-    except etree.DocumentInvalid, xml_errors:
+    except etree.DocumentInvalid as xml_errors:
         #import UserError only here to avoid circular import statements with tools.func being imported in exceptions.py
         from odoo.exceptions import UserError
         raise UserError('\n'.join([e.message for e in xml_errors.error_log]))
diff --git a/odoo/tools/yaml_import.py b/odoo/tools/yaml_import.py
index 8e9e1342a70..cefc3667a9e 100644
--- a/odoo/tools/yaml_import.py
+++ b/odoo/tools/yaml_import.py
@@ -227,7 +227,7 @@ class YamlInterpreter(object):
                 for test in expressions:
                     try:
                         success = unsafe_eval(test, self.eval_context, RecordDictWrapper(record))
-                    except Exception, e:
+                    except Exception as e:
                         _logger.debug('Exception during evaluation of !assert block in yaml_file %s.', self.filename, exc_info=True)
                         raise YamlImportAbortion(e)
                     if not success:
@@ -240,12 +240,12 @@ class YamlInterpreter(object):
                                 rmsg = ''
                                 try:
                                     lmsg = unsafe_eval(left, self.eval_context, RecordDictWrapper(record))
-                                except Exception, e:
+                                except Exception as e:
                                     lmsg = '<exc>'
 
                                 try:
                                     rmsg = unsafe_eval(right, self.eval_context, RecordDictWrapper(record))
-                                except Exception, e:
+                                except Exception as e:
                                     rmsg = '<exc>'
 
                                 msg += 'values: ! %s %s %s'
@@ -605,11 +605,11 @@ class YamlInterpreter(object):
         try:
             code_obj = compile(statements, self.filename, 'exec')
             unsafe_eval(code_obj, {'ref': self.get_id}, code_context)
-        except AssertionError, e:
+        except AssertionError as e:
             self._log_assert_failure('AssertionError in Python code %s (line %d): %s',
                 python.name, python.first_line, e)
             return
-        except Exception, e:
+        except Exception as e:
             _logger.debug('Exception during evaluation of !python block in yaml_file %s.', self.filename, exc_info=True)
             raise
         else:
@@ -847,7 +847,7 @@ class YamlInterpreter(object):
             is_preceded_by_comment = self._log_node(node, is_preceded_by_comment)
             try:
                 self._process_node(node)
-            except Exception, e:
+            except Exception as e:
                 _logger.exception(e)
                 raise