Move fcntl import to avoid high level ImportErrors on Windows
Fixes #5.
(cherry picked from commit ec2aedac71
)
This commit is contained in:
parent
c3e9b76d51
commit
1882f3470b
6
CHANGES
6
CHANGES
|
@ -1,5 +1,11 @@
|
|||
Temporary, post-Paramiko changelog while we get our sh!t together.
|
||||
|
||||
## ssh 1.7.13 (2012-MM-DD)
|
||||
|
||||
* Moved a `fcntl` import closer to where it's used to help avoid `ImportError`
|
||||
problems on Windows platforms. Thanks to Jason Coombs for the catch +
|
||||
suggested fix.
|
||||
|
||||
## ssh 1.7.12 (2012-02-10)
|
||||
|
||||
* Added an IO loop sleep() call to avoid needless CPU usage when agent
|
||||
|
|
|
@ -28,7 +28,6 @@ import threading
|
|||
import time
|
||||
import tempfile
|
||||
import stat
|
||||
import fcntl
|
||||
from select import select
|
||||
|
||||
from paramiko.ssh_exception import SSHException
|
||||
|
@ -119,6 +118,7 @@ class AgentProxyThread(threading.Thread):
|
|||
raise
|
||||
|
||||
def _communicate(self):
|
||||
import fcntl
|
||||
oldflags = fcntl.fcntl(self.__inr, fcntl.F_GETFL)
|
||||
fcntl.fcntl(self.__inr, fcntl.F_SETFL, oldflags | os.O_NONBLOCK)
|
||||
while not self._exit:
|
||||
|
|
Loading…
Reference in New Issue