Fix review coments.

product-definition-center · Nov 18, 2015 · 39e5878 · 39e5878
1 parent 7b1e58a
commit 39e5878
Showing 1 changed file with 7 additions and 15 deletions.
diff --git a/pdc/scripts/create_release_components.py b/pdc/scripts/create_release_components.py
@@ -3,8 +3,7 @@
 # Licensed under The MIT License (MIT)
 # http://opensource.org/licenses/MIT
 #
-from optparse import OptionParser
-import sys
+import argparse
 
 from beanbag import BeanBagException
 from pdc_client import PDCClient
@@ -52,7 +51,7 @@ def _generate_global_components(name_set):
     existing_gc_name_set = set([item['name'] for item in client[GLOBAL_COMPONENTS_RESOURCE]._(**condition)])
     non_existing_set = name_set - existing_gc_name_set
     if non_existing_set:
-        print "Be about to %d insert global components." % len(non_existing_set)
+        print "About to insert %d global components." % len(non_existing_set)
         _bulk_insert_resource(GLOBAL_COMPONENTS_RESOURCE, [{'name': item} for item in non_existing_set])
         print "Inserted %d global components." % len(non_existing_set)
 
@@ -62,7 +61,7 @@ def _generate_release_components(release, name_set):
     existing_rc_name_set = set([item['name'] for item in client[RELEASE_COMPONENTS_RESOURCE]._(**condition)])
     non_existing_set = name_set - existing_rc_name_set
     if non_existing_set:
-        print "Be about to insert %d release components." % len(non_existing_set)
+        print "About to insert %d release components." % len(non_existing_set)
         _bulk_insert_resource(RELEASE_COMPONENTS_RESOURCE,
                               [{'name': item, 'release': release, 'global_component': item}
                                for item in non_existing_set])
@@ -81,18 +80,11 @@ def main(release):
 
 
 if __name__ == '__main__':
-    usage = """%prog -s {PDC instance url or shortcut} -r {release id for a release}"""
-    parser = OptionParser(usage)
-    parser.add_option("-s", "--server", help="PDC instance url or shortcut.")
-    parser.add_option("-r", "--release", help="release id for a release.")
-
-    options, args = parser.parse_args()
-
-    if not options.server or not options.release:
-        print "Error: -s and -r are required.\n"
-        parser.print_help()
-        sys.exit(1)
+    parser = argparse.ArgumentParser(description='Create release components according release id')
+    parser.add_argument('-s', '--server', help='PDC instance url or shortcut.', required=True)
+    parser.add_argument("-r", "--release", help="release id for a release.", required=True)
 
+    options = parser.parse_args()
     try:
         client = PDCClient(options.server)
         main(options.release)