[mapserver-commits] r9704 - branches/branch-5-6/docs

[svn at osgeo.org]

Author: hobu
Date: 2010-01-18 09:42:30 -0500 (Mon, 18 Jan 2010)
New Revision: 9704

Modified:
   branches/branch-5-6/docs/labels.py
Log:
backport r9703

Modified: branches/branch-5-6/docs/labels.py
===================================================================
--- branches/branch-5-6/docs/labels.py	2010-01-18 14:41:23 UTC (rev 9703)
+++ branches/branch-5-6/docs/labels.py	2010-01-18 14:42:30 UTC (rev 9704)
@@ -1,8 +1,11 @@
 
 from os import path
 from itertools import groupby
-from sphinx.builder import Builder
-
+try:
+    from sphinx.builders import Builder
+except ImportError:
+    from sphinx.builder import Builder
+    
 class CollectLabelsBuilder(Builder):
    """
    Collects all present explicit labels into a table.