Merge branch 'pylint' into develop

[infoex-autowx.git] / infoex-autowx.py

diff --git a/infoex-autowx.py b/infoex-autowx.py
index 0755e4a1d9252340b01c0442fd092b587ac98837..79e0fd3064a41d477811a4c5311b9977d9aefca9 100755 (executable)
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -31,7 +31,7 @@ import sys
 import time
 
 from ftplib import FTP
 import time
 
 from ftplib import FTP

-from optparse import OptionParser
+from argparse import ArgumentParser

 
 import requests
 
 
 import requests
 


@@ -46,23 +46,27 @@ LOG.setLevel(logging.NOTSET)
 
 def get_parser():
     """Return OptionParser for this program"""
 
 def get_parser():
     """Return OptionParser for this program"""

-    parser = OptionParser(version=__version__)
+    parser = ArgumentParser()

 
 

-    parser.add_option("--config",
-                      dest="config",
-                      metavar="FILE",
-                      help="location of config file")
+    parser.add_argument("--version",
+                        action="version",
+                        version=__version__)

 
 

-    parser.add_option("--log-level",
-                      dest="log_level",
-                      default=None,
-                      help="set the log level (debug, info, warning)")
+    parser.add_argument("--config",
+                        dest="config",
+                        metavar="FILE",
+                        help="location of config file")

 
 

-    parser.add_option("--dry-run",
-                      action="store_true",
-                      dest="dry_run",
-                      default=False,
-                      help="fetch data but don't upload to InfoEx")
+    parser.add_argument("--log-level",
+                        dest="log_level",
+                        default=None,
+                        help="set the log level (debug, info, warning)")
+
+    parser.add_argument("--dry-run",
+                        action="store_true",
+                        dest="dry_run",
+                        default=False,
+                        help="fetch data but don't upload to InfoEx")

 
     return parser
 
 
     return parser
 


@@ -155,7 +159,7 @@ def setup_logging(log_level):
 def main():
     """Main routine: sort through args, decide what to do, then do it"""
     parser = get_parser()
 def main():
     """Main routine: sort through args, decide what to do, then do it"""
     parser = get_parser()

-    (options, args) = parser.parse_args()
+    options = parser.parse_args()

 
     config = configparser.ConfigParser(allow_no_value=False)
 
 
     config = configparser.ConfigParser(allow_no_value=False)