apply patch from Herm to update doc scripts to mapnik2, and fix imports for local ogcserver code

bindings/python/mapnik/ogcserver/WMS.py

@@ -25,7 +25,7 @@ from common import Version, copy_style, copy_layer
 from exceptions import OGCException, ServerConfigurationError
 from wms111 import ServiceHandler as ServiceHandler111
 from wms130 import ServiceHandler as ServiceHandler130
-from mapnik import Style, Map, load_map 
+from mapnik2 import Style, Map, load_map 
 import re
 import sys
 

bindings/python/mapnik/ogcserver/common.py

@@ -22,7 +22,7 @@
 """Core OGCServer classes and functions."""
 
 from exceptions import OGCException, ServerConfigurationError
-from mapnik import Map, Color, Box2d, render, Image, Layer, Style, Projection as MapnikProjection, Coord
+from mapnik2 import Map, Color, Box2d, render, Image, Layer, Style, Projection as MapnikProjection, Coord
 from PIL.Image import new
 from PIL.ImageDraw import Draw
 from StringIO import StringIO

bindings/python/mapnik/ogcserver/wms111.py

@@ -25,7 +25,7 @@ from common import ParameterDefinition, Response, Version, ListFactory, \
                    ColorFactory, CRSFactory, WMSBaseServiceHandler, CRS, \
                    BaseExceptionHandler, Projection
 from exceptions import OGCException, ServerConfigurationError
-from mapnik import Coord
+from mapnik2 import Coord
 
 try:
     from lxml import etree as ElementTree

bindings/python/mapnik/ogcserver/wms130.py

@@ -25,7 +25,7 @@ from common import ParameterDefinition, Response, Version, ListFactory, \
                    ColorFactory, CRSFactory, CRS, WMSBaseServiceHandler, \
                    BaseExceptionHandler, Projection, Box2d
 from exceptions import OGCException, ServerConfigurationError
-from mapnik import Coord
+from mapnik2 import Coord
 
 try:
     from lxml import etree as ElementTree

docs/epydoc_config/build_epydoc.sh

@@ -11,9 +11,9 @@ fi
 epydoc --no-private \
     --no-frames \
     --no-sourcecode \
-    --name mapnik \
+    --name mapnik2 \
     --url http://mapnik.org \
-    --css mapnik_epydoc.css mapnik \
+    --css mapnik_epydoc.css mapnik2 \
     -o $API_DOCS_DIR
 
 exit $?

docs/epydoc_config/test_build_epydoc.sh

@@ -1,2 +1,2 @@
 rm -rf test_api
-epydoc --no-private --no-frames --no-sourcecode --name mapnik --url http://mapnik.org --css mapnik_epydoc.css mapnik -o test_api
+epydoc --no-private --no-frames --no-sourcecode --name mapnik2 --url http://mapnik.org --css mapnik_epydoc.css mapnik2 -o test_api