From 15b2a742e96c07a3882f5653365f9996d6d07bb4 Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 6 May 2016 06:01:10 -0400 Subject: [PATCH] Administrivia setup.py: don't need to import pkg_resources pydisassemble: give an error is no file or directory is given usage should go to stderr, not stdout --- bin/pydisassemble | 7 ++++++- setup.py | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/pydisassemble b/bin/pydisassemble index d5fa59f6..cb220cd5 100755 --- a/bin/pydisassemble +++ b/bin/pydisassemble @@ -41,6 +41,10 @@ check_python_version(program) outfile = '-' out_base = None +if len(sys.argv) == 1: + print("No file(s) or directory given", file=sys.stderr) + print(Usage_short, file=sys.stderr) + sys.exit(1) try: opts, files = getopt.getopt(sys.argv[1:], 'hVo:', ['help', 'version']) @@ -59,9 +63,10 @@ for opt, val in opts: outfile = val else: print(opt) - print(Usage_short) + print(Usage_short, file=sys.stderr) sys.exit(1) + # argl, commonprefix works on strings, not on path parts, # thus we must handle the case with files in 'some/classes' # and 'some/cmds' diff --git a/setup.py b/setup.py index 82b62cae..b0319c13 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,6 @@ from __pkginfo__ import \ modname, packages, py_modules, scripts, \ short_desc, web, zip_safe -__import__('pkg_resources') from setuptools import setup exec(open('uncompyle6/version.py').read())