/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/util/bencode.py

  • Committer: Vincent Ladeuil
  • Date: 2009-04-02 10:43:01 UTC
  • mto: (4248.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 4249.
  • Revision ID: v.ladeuil+lp@free.fr-20090402104301-esvcd0lcqru9g4lb
Stop requiring a tty for CLIUIFactory and derivatives.

* bzrlib/ui/text.py:
(TextUIFactory.prompt):  Deleted, not needed anymore.

* bzrlib/ui/__init__.py:
(CLIUIFactory.get_boolean): Delegate terminal handling to
prompt().
(CLIUIFactory.get_non_echoed_password): Simplified.
(CLIUIFactory.get_password): Delegate terminal handling to
prompt().
(CLIUIFactory.prompt): Clear the terminal, builb, encode and
displays the prompt.
(SilentUIFactory.prompt): Update signature.

* bzrlib/tests/__init__.py:
(TestUIFactory.__init__): Simplified.
(TestUIFactory.get_non_echoed_password): No need for prompt here.

* errors.py:
(NotATerminal): Deleted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/util/bencode.py
86
86
        return (r, f + 1)
87
87
 
88
88
    def bdecode(self, x):
89
 
        if type(x) != str:
90
 
            raise TypeError
91
89
        try:
92
90
            r, l = self.decode_func[x[0]](x, 0)
93
91
        except (IndexError, KeyError):
154
152
        encode_int(int(x), r)
155
153
    encode_func[BooleanType] = encode_bool
156
154
 
157
 
from bzrlib._static_tuple_py import StaticTuple
158
 
encode_func[StaticTuple] = encode_list
159
 
try:
160
 
    from bzrlib._static_tuple_c import StaticTuple
161
 
except ImportError:
162
 
    pass
163
 
else:
164
 
    encode_func[StaticTuple] = encode_list
165
 
 
166
155
 
167
156
def bencode(x):
168
157
    r = []