diff options
Diffstat (limited to 'django/contrib/admin/bin/compress.py')
| -rw-r--r-- | django/contrib/admin/bin/compress.py | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/django/contrib/admin/bin/compress.py b/django/contrib/admin/bin/compress.py index 7e5d4ea779..f21972708f 100644 --- a/django/contrib/admin/bin/compress.py +++ b/django/contrib/admin/bin/compress.py @@ -1,6 +1,6 @@ #!/usr/bin/env python +import argparse import os -import optparse import subprocess import sys @@ -8,35 +8,37 @@ js_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'static', 'ad def main(): - usage = "usage: %prog [file1..fileN]" description = """With no file paths given this script will automatically compress all jQuery-based files of the admin app. Requires the Google Closure Compiler library and Java version 6 or later.""" - parser = optparse.OptionParser(usage, description=description) - parser.add_option("-c", dest="compiler", default="~/bin/compiler.jar", + parser = argparse.ArgumentParser(description=description) + parser.add_argument('file', nargs='*') + parser.add_argument("-c", dest="compiler", default="~/bin/compiler.jar", help="path to Closure Compiler jar file") - parser.add_option("-v", "--verbose", + parser.add_argument("-v", "--verbose", action="store_true", dest="verbose") - parser.add_option("-q", "--quiet", + parser.add_argument("-q", "--quiet", action="store_false", dest="verbose") - (options, args) = parser.parse_args() + options = parser.parse_args() compiler = os.path.expanduser(options.compiler) if not os.path.exists(compiler): sys.exit("Google Closure compiler jar file %s not found. Please use the -c option to specify the path." % compiler) - if not args: + if not options.file: if options.verbose: sys.stdout.write("No filenames given; defaulting to admin scripts\n") - args = [os.path.join(js_path, f) for f in [ + files = [os.path.join(js_path, f) for f in [ "actions.js", "collapse.js", "inlines.js", "prepopulate.js"]] + else: + files = options.file - for arg in args: - if not arg.endswith(".js"): - arg = arg + ".js" - to_compress = os.path.expanduser(arg) + for file_name in files: + if not file_name.endswith(".js"): + file_name = file_name + ".js" + to_compress = os.path.expanduser(file_name) if os.path.exists(to_compress): - to_compress_min = "%s.min.js" % "".join(arg.rsplit(".js")) + to_compress_min = "%s.min.js" % "".join(file_name.rsplit(".js")) cmd = "java -jar %s --js %s --js_output_file %s" % (compiler, to_compress, to_compress_min) if options.verbose: sys.stdout.write("Running: %s\n" % cmd) |