← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ui.py

  • Committer: Vincent Ladeuil
  • Date: 2011-03-14 10:11:58 UTC
  • mfrom: (5609.24.1 2.3)
  • mto: (5609.24.2 2.3)
  • mto: This revision was merged to the branch mainline in revision 5723.
  • Revision ID: v.ladeuil+lp@free.fr-20110314101158-9ojis0ftsljg3c3t
Merge bzr/2.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ui.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
"""Tests for the bzrlib ui
18
18
"""
19
19
 
20
 
import os
21
20
import time
22
21
 
23
22
from StringIO import StringIO
26
25
 
27
26
from bzrlib import (
28
27
    config,
29
 
    errors,
30
28
    remote,
31
 
    repository,
32
29
    tests,
33
30
    ui as _mod_ui,
34
31
    )
35
 
from bzrlib.symbol_versioning import (
36
 
    deprecated_in,
37
 
    )
38
32
from bzrlib.tests import (
39
33
    fixtures,
40
34
    test_progress,