Set a default usage=None for the CLI.default_option_parser() function.

Updated all of the scripts to use the default_option_parser().

diff --git a/bin/drag_wkt_along_kml_path b/bin/drag_wkt_along_kml_path
index 072d72a768fec0747fa6e13bb8b88efcd5a084c3..752a60faa27c3b271dc97d386440f1f26619f588 100755 (executable)
--- a/bin/drag_wkt_along_kml_path
+++ b/bin/drag_wkt_along_kml_path
@@ -11,13 +11,13 @@ import pgdb
 import os
 import site
 import sys
-from optparse import OptionParser
 
 # Basically, add '../src' and '../lib/Shapely' to our path.
 # Needed for the imports that follow.
 site.addsitedir(os.path.dirname(os.path.abspath(sys.argv[0])) + '/../src')
 site.addsitedir(os.path.dirname(os.path.abspath(sys.argv[0])) + '/../lib/Shapely')
 
+import CLI
 import Configuration.Defaults
 import ExitCodes
 import Geometry
@@ -26,26 +26,11 @@ import KML
 usage = '%prog [options] <well-known text> <kml filename>'
 
 # -h (help) Conflicts with -h HOSTNAME
-parser = OptionParser(usage=usage, add_help_option = False)
+parser = CLI.default_option_parser(usage)
 
 # Use this module's docstring as the description.
 parser.description = __doc__.strip()
 
-parser.add_option('-h',
-                  '--host',
-                  help='The hostname/address where the database is located.',
-                  default=Configuration.Defaults.DATABASE_HOST)
-
-parser.add_option('-d',
-                  '--database',
-                  help='The database in which the population data are stored.',
-                  default=Configuration.Defaults.DATABASE_NAME)
-
-parser.add_option('-U',
-                  '--username',
-                  help='The username who has access to the database.',
-                  default=Configuration.Defaults.DATABASE_USERNAME)
-
 parser.add_option('-o',
                   '--outfile',
                   help='Optional output file path. Defaults to stdout.')

diff --git a/bin/find_avg_population_density b/bin/find_avg_population_density
index 712db20f96c3c53465d1b8131826cb37547fb88d..ef60d22df439add2308d6951f98252d86ca0612a 100755 (executable)
--- a/bin/find_avg_population_density
+++ b/bin/find_avg_population_density
@@ -7,13 +7,13 @@ Find the average population density of a set of GPS coordinates.
 import sys
 import os
 import site
-from optparse import OptionParser
 
 # Basically, add '../src' to our path.
 # Needed for the imports that follow.
 site.addsitedir(os.path.dirname(os.path.abspath(sys.argv[0])) + '/../src')
 
 import Census
+import CLI
 import Configuration.Defaults
 import ExitCodes
 import GPS
@@ -38,27 +38,11 @@ for idx, value in enumerate(sys.argv):
     
 usage = '%prog [options] <longitude> <latitude>'
 
-# -h (help) Conflicts with -h HOSTNAME
-parser = OptionParser(usage=usage, add_help_option = False)
+parser = CLI.default_option_parser(usage)
 
 # Use this module's docstring as the description.
 parser.description = __doc__.strip()
 
-parser.add_option('-h',
-                  '--host',
-                  help='The hostname/address where the database is located.',
-                  default=Configuration.Defaults.DATABASE_HOST)
-
-parser.add_option('-d',
-                  '--database',
-                  help='The database in which the population data are stored.',
-                  default=Configuration.Defaults.DATABASE_NAME)
-
-parser.add_option('-U',
-                  '--username',
-                  help='The username who has access to the database.',
-                  default=Configuration.Defaults.DATABASE_USERNAME)
-
 parser.add_option('-s',
                   '--srid',
                   type="int",

diff --git a/bin/lines2kml b/bin/lines2kml
index bba63b2f59df68e25e71826b502a29fd900bab50..3fc3d784d4f60ff70fbd83e0391a806004af318b 100755 (executable)
--- a/bin/lines2kml
+++ b/bin/lines2kml
@@ -6,7 +6,6 @@ Language (KML). The exported roads should have both a human-readable
 name and a globally-unique identifier (gid).
 """
 
-from optparse import OptionParser
 import os
 import pgdb
 import site
@@ -16,6 +15,7 @@ import sys
 # Needed for the imports that follow.
 site.addsitedir(os.path.dirname(os.path.abspath(sys.argv[0])) + '/../src')
 
+import CLI
 import Configuration.Defaults
 import ExitCodes
 import KML
@@ -26,27 +26,12 @@ Parse the command line options. All of these are optional; defaults
 are provided for the database information and the output is written
 to stdout.
 """
-# -h (help) Conflicts with -h HOSTNAME
-parser = OptionParser(add_help_option = False)
+
+parser = CLI.default_option_parser()
 
 # Use this module's docstring as the description.
 parser.description = __doc__.strip()
 
-parser.add_option('-h',
-                  '--host',
-                  help='The hostname/address where the database is located.',
-                  default=Configuration.Defaults.DATABASE_HOST)
-
-parser.add_option('-d',
-                  '--database',
-                  help='The database in which the population data are stored.',
-                  default=Configuration.Defaults.DATABASE_NAME)
-
-parser.add_option('-U',
-                  '--username',
-                  help='The username who has access to the database.',
-                  default=Configuration.Defaults.DATABASE_USERNAME)
-
 parser.add_option('-s',
                   '--state',
                   help='The FIPS id of the State whose roads you would like.')

diff --git a/bin/pg2kml b/bin/pg2kml
index 81afecaa63bc98a7fbed36739360dfd86b7f4628..bef23fa4393b8a40e2e596bd0a554ec8b88f64b5 100755 (executable)
--- a/bin/pg2kml
+++ b/bin/pg2kml
@@ -7,7 +7,6 @@ upon their blocks' average population densities. Output is written to
 stdout.
 """
 
-from optparse import OptionParser
 import os
 import pgdb
 import site
@@ -17,6 +16,7 @@ import sys
 # Needed for the imports that follow.
 site.addsitedir(os.path.dirname(os.path.abspath(sys.argv[0])) + '/../src')
 
+import CLI
 import Configuration.Defaults
 import ExitCodes
 import GPS
@@ -29,31 +29,14 @@ Parse the command line options. All of these are optional; defaults
 are provided for the database information and the output is written
 to stdout.
 """
-# -h (help) Conflicts with -h HOSTNAME
-parser = OptionParser(add_help_option = False)
+
+parser = CLI.default_option_parser()
 
 # Use this module's docstring as the description.
 parser.description = __doc__.strip()
-
-parser.add_option('-h',
-                  '--host',
-                  help='The hostname/address where the database is located.',
-                  default=Configuration.Defaults.DATABASE_HOST)
-
-parser.add_option('-d',
-                  '--database',
-                  help='The database in which the population data are stored.',
-                  default=Configuration.Defaults.DATABASE_NAME)
-
-parser.add_option('-U',
-                  '--username',
-                  help='The username who has access to the database.',
-                  default=Configuration.Defaults.DATABASE_USERNAME)
-
 (options, args) = parser.parse_args()
 
 
-
 def GenerateRedStyles(alpha='7f'):
     """
     Generate 256 styles (0-255), each corresponding to a shade of red.

diff --git a/bin/wkt2kml b/bin/wkt2kml
index 598fb52f8d930ace785ced75361bfb2fe65e0bf2..81b45ffc3fd924361cbf99ab6b87596dffb750de 100755 (executable)
--- a/bin/wkt2kml
+++ b/bin/wkt2kml
@@ -18,7 +18,6 @@ conversions correctly, sans-database.
 [2] http://search.cpan.org/dist/Geo-Converter-WKT2KML/
 """
 
-from optparse import OptionParser
 import os
 import pgdb
 import site
@@ -28,6 +27,7 @@ import sys
 # Needed for the imports that follow.
 site.addsitedir(os.path.dirname(os.path.abspath(sys.argv[0])) + '/../src')
 
+import CLI
 import Configuration.Defaults
 import ExitCodes
 import GPS
@@ -45,27 +45,11 @@ default. The name option is available in case the user would like to
 e.g. see the object name in Google Earth.
 """
 
-# -h (help) Conflicts with -h HOSTNAME
-parser = OptionParser(add_help_option = False)
+parser = CLI.default_option_parser()
 
 # Use this module's docstring as the description.
 parser.description = __doc__.strip()
 
-parser.add_option('-h',
-                  '--host',
-                  help='The hostname/address where the database is located.',
-                  default=Configuration.Defaults.DATABASE_HOST)
-
-parser.add_option('-d',
-                  '--database',
-                  help='The database in which the population data are stored.',
-                  default=Configuration.Defaults.DATABASE_NAME)
-
-parser.add_option('-U',
-                  '--username',
-                  help='The username who has access to the database.',
-                  default=Configuration.Defaults.DATABASE_USERNAME)
-
 parser.add_option('-o',
                   '--outfile',
                   help='Optional output file path. Defaults to stdout.')

diff --git a/bin/wkt2pop b/bin/wkt2pop
index 6b6290e9d9f8232af971541826cda022fbd400ed..3fa70b220f76569765cedca4391a36b0dac0e5ff 100755 (executable)
--- a/bin/wkt2pop
+++ b/bin/wkt2pop
@@ -16,38 +16,22 @@ string.
 import sys
 import os
 import site
-from optparse import OptionParser
 
 # Basically, add '../src' to our path.
 # Needed for the imports that follow.
 site.addsitedir(os.path.dirname(os.path.abspath(sys.argv[0])) + '/../src')
 
 import Census
+import CLI
 import Configuration.Defaults
 import ExitCodes
 
 usage = '%prog [options] <well-known text representation>'
-
-# -h (help) Conflicts with -h HOSTNAME
-parser = OptionParser(usage=usage, add_help_option = False)
+parser = CLI.default_option_parser(usage)
 
 # Use this module's docstring as the description.
 parser.description = __doc__.strip()
 
-parser.add_option('-h',
-                  '--host',
-                  help='The hostname/address where the database is located.',
-                  default=Configuration.Defaults.DATABASE_HOST)
-
-parser.add_option('-d',
-                  '--database',
-                  help='The database in which the population data are stored.',
-                  default=Configuration.Defaults.DATABASE_NAME)
-
-parser.add_option('-U',
-                  '--username',
-                  help='The username who has access to the database.',
-                  default=Configuration.Defaults.DATABASE_USERNAME)
 
 parser.add_option('-s',
                   '--srid',
@@ -77,4 +61,3 @@ if (population != None):
 else:
     print 'Error: No rows returned.'
     raise SystemExit(ExitCodes.NO_RESULTS)
-

diff --git a/src/CLI.py b/src/CLI.py
index eb8b21904a53ff622dcecf592f8a8dea481e4b81..b7fcaaff8e49fe8fb377fcdaed8c9cc61caf2938 100644 (file)
--- a/src/CLI.py
+++ b/src/CLI.py
@@ -3,7 +3,7 @@ from optparse import OptionParser
 import Configuration.Defaults
 
 
-def default_option_parser(usage):
+def default_option_parser(usage=None):
     # -h (help) Conflicts with -h HOSTNAME
     parser = OptionParser(usage=usage, add_help_option = False)