From 62a7e521ed35adb48b7afaf2b63a0f16a4a8ebbe Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Mon, 31 Dec 2018 06:19:33 -0800
Subject: Replace use of deprecated optparse with argparse

The Python project considers the optparse module as deprecated. See:

https://docs.python.org/3/library/optparse.html

> Deprecated since version 3.2: The optparse module is deprecated and
> will not be developed further; development will continue with the
> argparse module.

Replace the project's use with the newer argparse. The CLI is fully
equivalent and should not result in any backwards comparability
concerns.

https://docs.python.org/3/library/argparse.html
---
 unidecode/util.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'unidecode')

diff --git a/unidecode/util.py b/unidecode/util.py
index 477280d..dc262c6 100644
--- a/unidecode/util.py
+++ b/unidecode/util.py
@@ -1,6 +1,6 @@
 # vim:ts=4 sw=4 expandtab softtabstop=4
 from __future__ import print_function
-import optparse
+import argparse
 import locale
 import os
 import sys
@@ -17,29 +17,30 @@ def fatal(msg):
 def main():
     default_encoding = locale.getpreferredencoding()
 
-    parser = optparse.OptionParser('%prog [options] [FILE]',
+    parser = argparse.ArgumentParser(
             description="Transliterate Unicode text into ASCII. FILE is path to file to transliterate. "
             "Standard input is used if FILE is omitted and -c is not specified.")
-    parser.add_option('-e', '--encoding', metavar='ENCODING', default=default_encoding,
+    parser.add_argument('-e', '--encoding', metavar='ENCODING', default=default_encoding,
             help='Specify an encoding (default is %s)' % (default_encoding,))
-    parser.add_option('-c', metavar='TEXT', dest='text',
+    parser.add_argument('-c', metavar='TEXT', dest='text',
             help='Transliterate TEXT instead of FILE')
+    parser.add_argument('path', nargs='?', metavar='FILE')
 
-    options, args = parser.parse_args()
+    args = parser.parse_args()
 
-    encoding = options.encoding
+    encoding = args.encoding
 
-    if args:
-        if options.text:
+    if args.path:
+        if args.text:
             fatal("Can't use both FILE and -c option")
         else:
-            with open(args[0], 'rb') as f:
+            with open(args.path, 'rb') as f:
                 stream = f.read()
-    elif options.text:
+    elif args.text:
         if PY3:
-            stream = os.fsencode(options.text)
+            stream = os.fsencode(args.text)
         else:
-            stream = options.text
+            stream = args.text
         # add a newline to the string if it comes from the
         # command line so that the result is printed nicely
         # on the console.
-- 
cgit v1.2.1