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

[dead/census-tools.git] / bin / pg2kml

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.