[mapserver-commits] r9497 - in trunk/mapserver: . mapscript/python

[svn at osgeo.org]

Author: warmerdam
Date: 2009-10-19 23:27:18 -0400 (Mon, 19 Oct 2009)
New Revision: 9497

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapscript/python/pymodule.i
Log:
rework pythonappend use to avoid indenting issues (#3180)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-20 03:26:07 UTC (rev 9496)
+++ trunk/mapserver/HISTORY.TXT	2009-10-20 03:27:18 UTC (rev 9497)
@@ -18,6 +18,8 @@
 
 - Added charset in content-type http header for wms/wfs/sos/wcs requests (#2583)
 
+- Python/MapScript: improve compatability for different swig versions (#3180)
+
 Version 5.6.0-beta4 (2009-10-18):
 ---------------------------------
 

Modified: trunk/mapserver/mapscript/python/pymodule.i
===================================================================
--- trunk/mapserver/mapscript/python/pymodule.i	2009-10-20 03:26:07 UTC (rev 9496)
+++ trunk/mapserver/mapscript/python/pymodule.i	2009-10-20 03:27:18 UTC (rev 9497)
@@ -156,14 +156,20 @@
 MapServerChildError = _mapscript.MapServerChildError
 %}
 
-%feature("pythonappend") layerObj %{if args and len(args)!=0:
+/* The bogus "if 1:" is to introduce a new scope to work around indentation
+   handling with pythonappend in different versions.  (#3180) */
+%feature("pythonappend") layerObj %{if 1:
+	  if args and len(args)!=0:
 		self.p_map=args[0]
-else:
+	  else:
 		self.p_map=None%}
 
-%feature("pythonappend") classObj %{if args and len(args)!=0:
+/* The bogus "if 1:" is to introduce a new scope to work around indentation
+   handling with pythonappend in different versions. (#3180) */
+%feature("pythonappend") classObj %{if 1:
+	   if args and len(args)!=0:
 		self.p_layer=args[0]
-else:
+	   else:
 		self.p_layer=None%}
 
 %feature("shadow") insertClass %{