Rev 6380: (jelmer) Avoid always importing termios and tty in bzrlib.osutils. (Jelmer in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6380 [merge]
revision-id: pqm at pqm.ubuntu.com-20111218212445-onsppr7rdov3cw42
parent: pqm at pqm.ubuntu.com-20111216140401-s72dizm37u8q660i
parent: jelmer at samba.org-20111218154948-8m66eidwe8fdabny
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2011-12-18 21:24:45 +0000
message:
  (jelmer) Avoid always importing termios and tty in bzrlib.osutils. (Jelmer
   Vernooij)
modified:
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/tests/test_import_tariff.py test_import_tariff.p-20100207155145-ff9infp7goncs7zh-1
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2011-12-14 19:31:25 +0000
+++ b/bzrlib/osutils.py	2011-12-18 15:49:48 +0000
@@ -2325,13 +2325,13 @@
 
 
 if sys.platform == "win32":
-    import msvcrt
     def getchar():
+        import msvcrt
         return msvcrt.getch()
 else:
-    import tty
-    import termios
     def getchar():
+        import tty
+        import termios
         fd = sys.stdin.fileno()
         settings = termios.tcgetattr(fd)
         try:

=== modified file 'bzrlib/tests/test_import_tariff.py'
--- a/bzrlib/tests/test_import_tariff.py	2011-12-12 11:23:28 +0000
+++ b/bzrlib/tests/test_import_tariff.py	2011-12-18 15:49:48 +0000
@@ -193,6 +193,8 @@
             'smtplib',
             'tarfile',
             'tempfile',
+            'termios',
+            'tty',
             ] + old_format_modules)
         # TODO: similar test for repository-only operations, checking we avoid
         # loading wt-specific stuff
@@ -262,4 +264,6 @@
             'smtplib',
             'tarfile',
             'tempfile',
+            'termios',
+            'tty',
             ] + old_format_modules)