Merge branch 'issue-44-solaris-support' of github.com:pexpect/pexpect…

… into issue-44-solaris-support
pexpect · Jun 1, 2014 · aa427e0 · aa427e0
2 parents 800775f + 822ffc8
commit aa427e0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pexpect/__init__.py b/pexpect/__init__.py
@@ -669,7 +669,11 @@ def _spawn(self, command, args=[]):
 
         # Parent
         self.setwinsize(24, 80)
-        self.setecho(self.echo)
+        try:
+            self.setecho(self.echo)
+        except OSError:
+            # Solaris, etc. cannot set echo from master
+            pass
         self.terminated = False
         self.closed = False