merge with http://bitbucket.org/spig/pygments-main

1 files changed, 8 insertions, 2 deletions

diff --git a/pygments/util.py b/pygments/util.py
index 1bd1455f..46c5a125 100644
--- a/pygments/util.py
+++ b/pygments/util.py
@@ -110,10 +110,16 @@ def make_analysator(f):
     returns float values.
     """
     def text_analyse(text):
-        rv = f(text)
+        try:
+            rv = f(text)
+        except Exception:
+            return 0.0
         if not rv:
             return 0.0
-        return min(1.0, max(0.0, float(rv)))
+        try:
+            return min(1.0, max(0.0, float(rv)))
+        except ValueError:
+            return 0.0
     text_analyse.__doc__ = f.__doc__
     return staticmethod(text_analyse)