support/scripts/check-uniq-files: run with Python 2.6

Message ID 33f2f5c9d9cdbb320e52.1532112144@cveaol6qa08.wv.mentorg.com
State Rejected
Headers show
Series
  • support/scripts/check-uniq-files: run with Python 2.6
Related show

Commit Message

Hollis Blanchard July 20, 2018, 6:42 p.m.
Support Python 2.6 by switching from argparse (introduced in Python 2.7) to
optparse. Python 2.6 is the version of Python in RHEL6.5.

optparse was deprecated in 2.7, but is still usable, so the script now runs in
more environments.

Backports of argparse to 2.6 are available, but can be impractical to require
on all hosts (e.g. hosts belonging to end-users who are unfamiliar with Python
package management, corporate-managed build hosts where installing packages is
difficult or impossible).

Signed-off-by: Hollis Blanchard <hollis_blanchard@mentor.com>

Comments

Thomas Petazzoni Aug. 21, 2018, 10:14 a.m. | #1
Hello Hollis,

On Fri, 20 Jul 2018 11:42:24 -0700, Hollis Blanchard wrote:
> Support Python 2.6 by switching from argparse (introduced in Python 2.7) to
> optparse. Python 2.6 is the version of Python in RHEL6.5.
> 
> optparse was deprecated in 2.7, but is still usable, so the script now runs in
> more environments.
> 
> Backports of argparse to 2.6 are available, but can be impractical to require
> on all hosts (e.g. hosts belonging to end-users who are unfamiliar with Python
> package management, corporate-managed build hosts where installing packages is
> difficult or impossible).
> 
> Signed-off-by: Hollis Blanchard <hollis_blanchard@mentor.com>

We had a bit of discussion about this on IRC today, and both Yann's
feeling and mine is that optparse is long deprecated (since Python
2.7), so it is really annoying to keep using it just for the sake of
Python 2.6 users.

Python 2.6 users can simply install the argparse module as a third
party module, and use Buildroot. I think it's a reasonable trade-off
between using modern APIs and keeping compatibility with older build
systems.

So I've marked this patch as Rejected in patchwork. Sorry :-/

Best regards,

Thomas

Patch

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -281,8 +281,3 @@  if [ -n "$missing_perl_modules" ] ; then
 	echo
 	exit 1
 fi
-
-if ! python -c "import argparse" > /dev/null 2>&1 ; then
-	echo "Your Python installation is not complete enough: argparse module is missing"
-	exit 1
-fi
diff --git a/support/scripts/check-uniq-files b/support/scripts/check-uniq-files
--- a/support/scripts/check-uniq-files
+++ b/support/scripts/check-uniq-files
@@ -1,31 +1,31 @@ 
 #!/usr/bin/env python
 
 import sys
-import argparse
+import optparse
 from collections import defaultdict
 
 warn = 'Warning: {0} file "{1}" is touched by more than one package: {2}\n'
 
 
 def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('packages_file_list', nargs='*',
-                        help='The packages-file-list to check from')
-    parser.add_argument('-t', '--type', metavar="TYPE",
+    usage = 'usage: %prog -t TYPE <packages file list>'
+    parser = optparse.OptionParser(usage=usage)
+    parser.add_option('-t', '--type', metavar="TYPE",
                         help='Report as a TYPE file (TYPE is either target, staging, or host)')
 
-    args = parser.parse_args()
+    options, args = parser.parse_args()
 
-    if not len(args.packages_file_list) == 1:
-        sys.stderr.write('No packages-file-list was provided.\n')
+    if not len(args) == 1:
+        sys.stderr.write('No packages file list was provided.\n')
         return False
+    packages_file = args[0]
 
-    if args.type is None:
+    if options.type is None:
         sys.stderr.write('No type was provided\n')
         return False
 
     file_to_pkg = defaultdict(list)
-    with open(args.packages_file_list[0], 'rb') as pkg_file_list:
+    with open(packages_file, 'rb') as pkg_file_list:
         for line in pkg_file_list.readlines():
             pkg, _, file = line.rstrip(b'\n').partition(b',')
             file_to_pkg[file].append(pkg)
@@ -35,12 +35,12 @@  def main():
             # If possible, try to decode the binary strings with
             # the default user's locale
             try:
-                sys.stderr.write(warn.format(args.type, file.decode(),
+                sys.stderr.write(warn.format(options.type, file.decode(),
                                              [p.decode() for p in file_to_pkg[file]]))
             except UnicodeDecodeError:
                 # ... but fallback to just dumping them raw if they
                 # contain non-representable chars
-                sys.stderr.write(warn.format(args.type, file,
+                sys.stderr.write(warn.format(options.type, file,
                                              file_to_pkg[file]))