From 8767c404c3414e021be57dc6c330aaec91018c42 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Sat, 8 May 2010 17:07:03 +0000
Subject: [PATCH] apply patch from Herm to update doc scripts to mapnik2, and
 fix imports for local ogcserver code

---
 bindings/python/mapnik/ogcserver/WMS.py    | 2 +-
 bindings/python/mapnik/ogcserver/common.py | 2 +-
 bindings/python/mapnik/ogcserver/wms111.py | 2 +-
 bindings/python/mapnik/ogcserver/wms130.py | 2 +-
 docs/epydoc_config/build_epydoc.sh         | 4 ++--
 docs/epydoc_config/test_build_epydoc.sh    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bindings/python/mapnik/ogcserver/WMS.py b/bindings/python/mapnik/ogcserver/WMS.py
index ea38ee5c0..57e2f8fd3 100644
--- a/bindings/python/mapnik/ogcserver/WMS.py
+++ b/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
 
diff --git a/bindings/python/mapnik/ogcserver/common.py b/bindings/python/mapnik/ogcserver/common.py
index c55a042f2..602547777 100644
--- a/bindings/python/mapnik/ogcserver/common.py
+++ b/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
diff --git a/bindings/python/mapnik/ogcserver/wms111.py b/bindings/python/mapnik/ogcserver/wms111.py
index 62d44ec2d..a27dc9aba 100644
--- a/bindings/python/mapnik/ogcserver/wms111.py
+++ b/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
diff --git a/bindings/python/mapnik/ogcserver/wms130.py b/bindings/python/mapnik/ogcserver/wms130.py
index 609da66b3..5ddf38292 100644
--- a/bindings/python/mapnik/ogcserver/wms130.py
+++ b/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
diff --git a/docs/epydoc_config/build_epydoc.sh b/docs/epydoc_config/build_epydoc.sh
index bd6972480..493f16f6e 100755
--- a/docs/epydoc_config/build_epydoc.sh
+++ b/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 $?
diff --git a/docs/epydoc_config/test_build_epydoc.sh b/docs/epydoc_config/test_build_epydoc.sh
index 73cddbc65..dd03d8725 100755
--- a/docs/epydoc_config/test_build_epydoc.sh
+++ b/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