← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inter.py

terminal_width can now returns None.

* bzrlib/win32utils.py:
(get_console_size): Fix typo in comment.

* bzrlib/ui/text.py:
(TextProgressView._show_line): Handle the no terminal present case.

* bzrlib/tests/test_osutils.py:
(TestTerminalWidth): Update tests.

* bzrlib/tests/blackbox/test_too_much.py:
Fix some imports.
(OldTests.test_bzr): Handle the no terminal present case.

* bzrlib/tests/__init__.py:
(VerboseTestResult.report_test_start): Handle the no terminal
present case.

* bzrlib/status.py:
(show_pending_merges): Handle the no terminal present case.
(show_pending_merges.show_log_message): Factor out some
code. Handle the no terminal present case.

* bzrlib/osutils.py:
(terminal_width): Return None if no precise value can be found.

* bzrlib/log.py:
(LineLogFormatter.__init__): Handle the no terminal present case.
(LineLogFormatter.truncate): Accept None as max_len meaning no
truncation.
(LineLogFormatter.log_string): 

* bzrlib/help.py:
(_help_commands_to_text): Handle the no terminal present case.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inter.py
18
18
"""Inter-object utility class."""
19
19
 
20
20
 
21
 
from bzrlib.errors import NoCompatibleInter
22
 
 
23
 
 
24
21
class InterObject(object):
25
22
    """This class represents operations taking place between two objects.
26
23
 
78
75
                       the InterObject instance.
79
76
        :param target: the object to be the 'target' member of
80
77
                       the InterObject instance.
81
 
 
82
78
        If an optimised worker exists it will be used otherwise
83
79
        a default Inter worker instance will be created.
84
80
        """
85
81
        for provider in reversed(klass._optimisers):
86
82
            if provider.is_compatible(source, target):
87
83
                return provider(source, target)
88
 
        raise NoCompatibleInter(source, target)
 
84
        return klass(source, target)
89
85
 
90
86
    def lock_read(self):
91
87
        """Take out a logical read lock.