Catch AttributeError in Python 2.6.

mozilla · Jul 11, 2012 · fefe5d8 · fefe5d8
1 parent 1d0e907
commit fefe5d8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/bleach/__init__.py b/bleach/__init__.py
@@ -86,6 +86,9 @@
 
 DEFAULT_CALLBACKS = [linkify_callbacks.nofollow]
 
+PY_26 = (sys.version_info < (2, 7))
+RECURSION_EXCEPTION = RuntimeError if not PY_26 else AttributeError
+
 
 def clean(text, tags=ALLOWED_TAGS, attributes=ALLOWED_ATTRIBUTES,
           styles=ALLOWED_STYLES, strip=False, strip_comments=True):
@@ -289,7 +292,7 @@ def link_repl(match):
 
     try:
         linkify_nodes(forest)
-    except RuntimeError, e:
+    except (RECURSION_EXCEPTION), e:
         # If we hit the max recursion depth, just return what we've got.
         log.error('Probable recursion error: %r' % e, exc_info=sys.exc_info())