Modified the default_option_parser function to return a parser using a VerbatimHelpFo...

Updated the scripts using default_option_parser to account for the whitespace changes.

diff --git a/bin/blocks2kml b/bin/blocks2kml
index bef23fa4393b8a40e2e596bd0a554ec8b88f64b5..78420c959c64bd3da2e99308fb0934c81e5b0aba 100755 (executable)
--- a/bin/blocks2kml
+++ b/bin/blocks2kml
@@ -33,7 +33,7 @@ to stdout.
 parser = CLI.default_option_parser()
 
 # Use this module's docstring as the description.
-parser.description = __doc__.strip()
+parser.description = __doc__
 (options, args) = parser.parse_args()
 
 

diff --git a/bin/drag_wkt_along_kml_path b/bin/drag_wkt_along_kml_path
index c65c34a8db4f30e2437b96c5dd8a539f0850c2d5..aa274661023ba6a56386094a518ee020071dacf9 100755 (executable)
--- a/bin/drag_wkt_along_kml_path
+++ b/bin/drag_wkt_along_kml_path
@@ -28,7 +28,7 @@ usage = '%prog [options] <well-known text> <kml filename>'
 parser = CLI.default_option_parser(usage)
 
 # Use this module's docstring as the description.
-parser.description = __doc__.strip()
+parser.description = __doc__
 
 parser.add_option('-o',
                   '--outfile',

diff --git a/bin/find_avg_population_density b/bin/find_avg_population_density
index ef60d22df439add2308d6951f98252d86ca0612a..42ed3e5138c69a3319b083134b8fa041e9cbc5c3 100755 (executable)
--- a/bin/find_avg_population_density
+++ b/bin/find_avg_population_density
@@ -41,7 +41,7 @@ usage = '%prog [options] <longitude> <latitude>'
 parser = CLI.default_option_parser(usage)
 
 # Use this module's docstring as the description.
-parser.description = __doc__.strip()
+parser.description = __doc__
 
 parser.add_option('-s',
                   '--srid',

diff --git a/bin/lines2kml b/bin/lines2kml
index 3fc3d784d4f60ff70fbd83e0391a806004af318b..0e239424046d90c275133faec3e09f1a1b48a01f 100755 (executable)
--- a/bin/lines2kml
+++ b/bin/lines2kml
@@ -30,7 +30,7 @@ to stdout.
 parser = CLI.default_option_parser()
 
 # Use this module's docstring as the description.
-parser.description = __doc__.strip()
+parser.description = __doc__
 
 parser.add_option('-s',
                   '--state',

diff --git a/bin/wkt2kml b/bin/wkt2kml
index 81b45ffc3fd924361cbf99ab6b87596dffb750de..7735bb75d3892ead70f9f5bcdf8a7360ae7379f4 100755 (executable)
--- a/bin/wkt2kml
+++ b/bin/wkt2kml
@@ -3,9 +3,7 @@
 """
 Convert an OGC Well-Known Text string to a Keyhole Markup Language
 (KML) file.
-"""
 
-"""
 We take a Well-Known Text[1] string as input, and optionally a
 filename to which to write the output. While we shouldn't technically
 *need* access to a PostGIS database to perform this conversion, it
@@ -48,7 +46,7 @@ e.g. see the object name in Google Earth.
 parser = CLI.default_option_parser()
 
 # Use this module's docstring as the description.
-parser.description = __doc__.strip()
+parser.description = __doc__
 
 parser.add_option('-o',
                   '--outfile',

diff --git a/bin/wkt2pop b/bin/wkt2pop
index 3fa70b220f76569765cedca4391a36b0dac0e5ff..89bb5955b480d69a4a5592cc36c99f0084d1f261 100755 (executable)
--- a/bin/wkt2pop
+++ b/bin/wkt2pop
@@ -2,9 +2,7 @@
 
 """
 Find the total population contained within a geometric object.
-"""
 
-"""
 Our input is an OGC Well-Known Text[1] string. This string is used as
 part of a database query that finds the population contained within
 (i.e. 'underneath') the geometric object corresponding to the WKT
@@ -30,7 +28,7 @@ usage = '%prog [options] <well-known text representation>'
 parser = CLI.default_option_parser(usage)
 
 # Use this module's docstring as the description.
-parser.description = __doc__.strip()
+parser.description = __doc__
 
 
 parser.add_option('-s',

diff --git a/src/CLI.py b/src/CLI.py
index 4da436e9d0351a0d943897575c5887a5874c981c..93ac2a058ab1fb39998043e76b1a6ff64538f6ad 100644 (file)
--- a/src/CLI.py
+++ b/src/CLI.py
@@ -5,8 +5,14 @@ import Configuration.Defaults
 
 
 def default_option_parser(usage=None):
+    # Use a VerbatimFormatter instead of the default
+    # IndentedHelpFormatter.    
+    fmtr = VerbatimHelpFormatter()
+    
     # -h (help) Conflicts with -h HOSTNAME
-    parser = OptionParser(usage=usage, add_help_option = False)
+    parser = OptionParser(usage = usage,
+                          add_help_option = False,
+                          formatter = fmtr)
 
     parser.add_option('-h',
                       '--host',