diff options
| author | ?ric Araujo <merwok@netwok.org> | 2011-02-10 01:48:09 +0100 |
|---|---|---|
| committer | ?ric Araujo <merwok@netwok.org> | 2011-02-10 01:48:09 +0100 |
| commit | 0d8fcc59e85ef42479dea9128bb051aca9dade14 (patch) | |
| tree | 69b6f82e1cb09f9bfb57cdf9dacc6450edd12273 /distutils2/command | |
| parent | 37d72aef1b216abd0840afd73c114bad25621a39 (diff) | |
| download | disutils2-0d8fcc59e85ef42479dea9128bb051aca9dade14.tar.gz | |
More logging tweaks: use real warning method, merge some calls.
Diffstat (limited to 'distutils2/command')
| -rw-r--r-- | distutils2/command/cmd.py | 4 | ||||
| -rw-r--r-- | distutils2/command/register.py | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/distutils2/command/cmd.py b/distutils2/command/cmd.py index e91d924..9cfc5d9 100644 --- a/distutils2/command/cmd.py +++ b/distutils2/command/cmd.py @@ -182,7 +182,7 @@ class Command(object): raise RuntimeError( "abstract method -- subclass %s must override" % self.__class__) - # TODO remove this method, just use logging + # TODO remove this method, just use logging.info def announce(self, msg, level=logging.INFO): """If the current verbosity level is of greater than or equal to 'level' print 'msg' to stdout. @@ -364,7 +364,7 @@ class Command(object): # -- External world manipulation ----------------------------------- - # TODO remove this method, just use logging + # TODO remove this method, just use logging.warn def warn(self, msg): logger.warning("warning: %s: %s\n", self.get_command_name(), msg) diff --git a/distutils2/command/register.py b/distutils2/command/register.py index 3d5bc23..e67cb7f 100644 --- a/distutils2/command/register.py +++ b/distutils2/command/register.py @@ -208,9 +208,8 @@ Your selection [default 1]: ''', logging.INFO) if code != 200: logger.info('Server response (%s): %s', code, result) else: - logger.info('You will receive an email shortly.') - logger.info('Follow the instructions in it to ' - 'complete registration.') + logger.info('You will receive an email shortly; follow the ' + 'instructions in it to complete registration.') elif choice == '3': data = {':action': 'password_reset'} data['email'] = '' |
