diff --git a/plumbum/cli/application.py b/plumbum/cli/application.py index cb5e1fad3..e170286bc 100644 --- a/plumbum/cli/application.py +++ b/plumbum/cli/application.py @@ -2,10 +2,11 @@ import os import sys import functools +import re from textwrap import TextWrapper from collections import defaultdict -from plumbum.lib import six, getdoc +from plumbum.lib import six, getdoc, get_main_module_frame from .terminal import get_terminal_size from .switches import (SwitchError, UnknownSwitch, MissingArgument, WrongArgumentType, MissingMandatorySwitch, @@ -68,6 +69,7 @@ def __repr__(self): # CLI Application base class #=================================================================================================== +main_module_ending_rx = re.compile("\.__main__$") class Application(object): """The base class for CLI applications; your "entry point" class should derive from it, @@ -166,7 +168,11 @@ def __init__(self, executable): # Filter colors if self.PROGNAME is None: - self.PROGNAME = os.path.basename(executable) + spec = get_main_module_frame().f_globals.get("__spec__", None) + if spec: + self.PROGNAME = " ".join(("python -m", main_module_ending_rx.sub("", spec.name))) + else: + self.PROGNAME = os.path.basename(executable) elif isinstance(self.PROGNAME, colors._style): self.PROGNAME = self.PROGNAME | os.path.basename(executable) elif colors.filter(self.PROGNAME) == '': diff --git a/plumbum/lib.py b/plumbum/lib.py index b9404f24a..bf19492b5 100644 --- a/plumbum/lib.py +++ b/plumbum/lib.py @@ -161,3 +161,12 @@ def read_fd_decode_safely(fd, size=4096): if i == 3: raise data += os.read(fd.fileno(), 1) + +def get_main_module_frame(): + """ + Gets the frame of the __main__ module (the one which is called with command line) of an app. + """ + fr=sys._getframe(0) + while fr and fr.f_globals['__name__'] != '__main__': + fr=fr.f_back + return fr