/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/osutils.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-21 14:50:43 UTC
  • mfrom: (6394 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6407.
  • Revision ID: jelmer@samba.org-20111221145043-pp63ot6xefuc7bjl
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
import errno
18
20
import os
19
21
import re
2325
2327
 
2326
2328
 
2327
2329
if sys.platform == "win32":
2328
 
    import msvcrt
2329
2330
    def getchar():
 
2331
        import msvcrt
2330
2332
        return msvcrt.getch()
2331
2333
else:
2332
 
    import tty
2333
 
    import termios
2334
2334
    def getchar():
 
2335
        import tty
 
2336
        import termios
2335
2337
        fd = sys.stdin.fileno()
2336
2338
        settings = termios.tcgetattr(fd)
2337
2339
        try: