From e8c92c3b6f3fa654871db1d28af07d2692a31e3f Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 23 Sep 2014 16:20:36 +0800
Subject: [PATCH] transforms/inline: support catchall 'except' clauses

---
 artiq/transforms/inline.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/artiq/transforms/inline.py b/artiq/transforms/inline.py
index 0a9fc6b56..9a073ee2b 100644
--- a/artiq/transforms/inline.py
+++ b/artiq/transforms/inline.py
@@ -232,15 +232,16 @@ class _ReferenceReplacer(ast.NodeVisitor):
     def visit_ExceptHandler(self, node):
         if node.name is not None:
             raise NotImplementedError("'as target' is not supported")
-        exception_class = self.rm.get(self.obj, self.func_name, node.type)
-        if not inspect.isclass(exception_class):
-            raise NotImplementedError("Exception type must be a class")
-        exception_id = self.rm.exception_map[exception_class]
-        node.type = ast.copy_location(
-                ast.Call(func=ast.Name("EncodedException", ast.Load()),
-                         args=[value_to_ast(exception_id)],
-                         keywords=[], starargs=None, kwargs=None),
-                node.type)
+        if node.type is not None:
+            exception_class = self.rm.get(self.obj, self.func_name, node.type)
+            if not inspect.isclass(exception_class):
+                raise NotImplementedError("Exception type must be a class")
+            exception_id = self.rm.exception_map[exception_class]
+            node.type = ast.copy_location(
+                    ast.Call(func=ast.Name("EncodedException", ast.Load()),
+                             args=[value_to_ast(exception_id)],
+                             keywords=[], starargs=None, kwargs=None),
+                    node.type)
         self.generic_visit(node)
         return node