~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 10:58:39 UTC
  • mfrom: (6383 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6386.
  • Revision ID: jelmer@canonical.com-20111219105839-uji05ck4rkm1mj4j
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2327
2327
 
2328
2328
 
2329
2329
if sys.platform == "win32":
2330
 
    import msvcrt
2331
2330
    def getchar():
 
2331
        import msvcrt
2332
2332
        return msvcrt.getch()
2333
2333
else:
2334
 
    lazy_import(globals(), """
2335
 
    import tty
2336
 
    import termios
2337
 
    """)
2338
2334
    def getchar():
 
2335
        import tty
 
2336
        import termios
2339
2337
        fd = sys.stdin.fileno()
2340
2338
        settings = termios.tcgetattr(fd)
2341
2339
        try: