← Back to branch summary

~ubuntu-branches/ubuntu/raring/python-pip/raring-proposed

« back to all changes in this revision

Viewing changes to pip/log.py

  • Committer: Package Import Robot
  • Author(s): Barry Warsaw
  • Date: 2013-04-17 10:45:19 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20130417104519-cn67sz4camrlkbsb
Tags: 1.3.1-0ubuntu1
https://launchpad.net/bugs/1167351
* New upstream release.  (LP: #1167351)
  - debian/patches/test_urlparse_uses_fragment.patch: Removed; applied
    upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pip/log.py
4
4
import sys
5
5
import logging
6
6
 
7
 
import pip.backwardcompat
 
7
from pip import backwardcompat
8
8
 
9
9
 
10
10
class Logger(object):
11
 
 
12
11
    """
13
12
    Logging object for use in command-line script.  Allows ranges of
14
13
    levels, to avoid some redundancy of displayed information.
15
14
    """
16
 
 
17
 
    VERBOSE_DEBUG = logging.DEBUG-1
 
15
    VERBOSE_DEBUG = logging.DEBUG - 1
18
16
    DEBUG = logging.DEBUG
19
17
    INFO = logging.INFO
20
 
    NOTIFY = (logging.INFO+logging.WARN)/2
 
18
    NOTIFY = (logging.INFO + logging.WARN) / 2
21
19
    WARN = WARNING = logging.WARN
22
20
    ERROR = logging.ERROR
23
21
    FATAL = logging.FATAL
68
66
                        rendered = msg % args
69
67
                    else:
70
68
                        rendered = msg
71
 
                    rendered = ' '*self.indent + rendered
 
69
                    rendered = ' ' * self.indent + rendered
72
70
                    if self.explicit_levels:
73
71
                        ## FIXME: should this be a name, not a level number?
74
72
                        rendered = '%02i %s' % (level, rendered)
75
73
                if hasattr(consumer, 'write'):
76
74
                    rendered += '\n'
77
 
                    pip.backwardcompat.fwrite(consumer, rendered)
 
75
                    backwardcompat.fwrite(consumer, rendered)
78
76
                else:
79
77
                    consumer(rendered)
80
78
 
87
85
            "Tried to start_progress(%r) while in_progress %r"
88
86
            % (msg, self.in_progress))
89
87
        if self._show_progress():
90
 
            sys.stdout.write(' '*self.indent + msg)
 
88
            sys.stdout.write(' ' * self.indent + msg)
91
89
            sys.stdout.flush()
92
90
            self.in_progress_hanging = True
93
91
        else:
121
119
                sys.stdout.flush()
122
120
            else:
123
121
                if self.last_message:
124
 
                    padding = ' ' * max(0, len(self.last_message)-len(message))
 
122
                    padding = ' ' * max(0, len(self.last_message) - len(message))
125
123
                else:
126
124
                    padding = ''
127
 
                sys.stdout.write('\r%s%s%s%s' % (' '*self.indent, self.in_progress, message, padding))
 
125
                sys.stdout.write('\r%s%s%s%s' %
 
126
                                (' ' * self.indent, self.in_progress, message, padding))
128
127
                sys.stdout.flush()
129
128
                self.last_message = message
130
129