Merge lp:~jelmer/bzr/no-termios into lp:bzr

[Jelmer Vernooij]

Avoid always importing termios and tty in bzrlib.osutils.

Lazily import tty and termios if we don't have to.

We only seem to use getchar() to get user input ("y", "n"), so it seems
reasonable to me to have a local import here. We could also make it
use lazy_import.

[Martin Packman (gz)]

Worth not importing these straight off.

The way imports are delayed in osutils is so inconsistent. This method is fine as we're not worried about getchar overhead, putting them in lazy import at the top may be slightly better, but less clear.

Arguably these functions should be made private, on trunk this needs to go through ui._ChooseUI or we break non-terminal interactions.

review: Approve

[Jelmer Vernooij (jelmer)]

sent to pqm by email

=== modified file 'bzrlib/osutils.py'
--- bzrlib/osutils.py	2011-12-14 19:31:25 +0000
+++ bzrlib/osutils.py	2011-12-18 15:58:24 +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'
--- bzrlib/tests/test_import_tariff.py	2011-12-12 11:23:28 +0000
+++ bzrlib/tests/test_import_tariff.py	2011-12-18 15:58:24 +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)