summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/zipfile.py10
-rw-r--r--Misc/NEWS6
2 files changed, 11 insertions, 5 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 7ba4e5980b..44e653d620 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -1963,19 +1963,19 @@ def main(args = None):
args = sys.argv[1:]
if not args or args[0] not in ('-l', '-c', '-e', '-t'):
- print(USAGE)
+ print(USAGE, file=sys.stderr)
sys.exit(1)
if args[0] == '-l':
if len(args) != 2:
- print(USAGE)
+ print(USAGE, file=sys.stderr)
sys.exit(1)
with ZipFile(args[1], 'r') as zf:
zf.printdir()
elif args[0] == '-t':
if len(args) != 2:
- print(USAGE)
+ print(USAGE, file=sys.stderr)
sys.exit(1)
with ZipFile(args[1], 'r') as zf:
badfile = zf.testzip()
@@ -1985,7 +1985,7 @@ def main(args = None):
elif args[0] == '-e':
if len(args) != 3:
- print(USAGE)
+ print(USAGE, file=sys.stderr)
sys.exit(1)
with ZipFile(args[1], 'r') as zf:
@@ -1993,7 +1993,7 @@ def main(args = None):
elif args[0] == '-c':
if len(args) < 3:
- print(USAGE)
+ print(USAGE, file=sys.stderr)
sys.exit(1)
def addToZip(zf, path, zippath):
diff --git a/Misc/NEWS b/Misc/NEWS
index fe71b35112..aeccab4187 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,12 @@ Core and Builtins
Library
-------
+Tools/Demos
+-----------
+
+- Issue #28102: The zipfile module CLI now prints usage to stderr.
+ Patch by Stephen J. Turnbull.
+
What's New in Python 3.6.0 beta 1
=================================