Fix file locking on Windows

sebastinas · sebastinas · commit 1b2068903bd7 · 2018-03-08T21:25:30.000+01:00
Also rename fd to fileobj.

Signed-off-by: Sebastian Ramacher &lt;sebastian@ramacher.at&gt;
diff --git a/bpython/filelock.py b/bpython/filelock.py
@@ -42,8 +42,8 @@ class BaseLock(object):
     """Base class for file locking
     """
 
-    def __init__(self, fd):
-        self.fd = fd
+    def __init__(self, fileobj):
+        self.fileobj = fileobj
         self.locked = False
 
     def acquire(self):
@@ -69,39 +69,39 @@ class UnixFileLock(BaseLock):
     """Simple file locking for Unix using fcntl
     """
 
-    def __init__(self, fd, mode=None):
-        super(UnixFileLock, self).__init__(fd)
+    def __init__(self, fileobj, mode=None):
+        super(UnixFileLock, self).__init__(fileobj)
 
         if mode is None:
             mode = fcntl.LOCK_EX
         self.mode = mode
 
     def acquire(self):
         try:
-            fcntl.flock(self.fd, self.mode)
+            fcntl.flock(self.fileobj, self.mode)
             self.locked = True
         except IOError as e:
             if e.errno != errno.ENOLCK:
                 raise e
 
     def release(self):
-        fcntl.flock(self.fd, fcntl.LOCK_UN)
+        fcntl.flock(self.fileobj, fcntl.LOCK_UN)
         self.locked = False
 
 
 class WindowsFileLock(BaseLock):
     """Simple file locking for Windows using msvcrt
     """
 
-    def __init__(self, fd, mode=None):
-        super(WindowsFileLock, self).__init__(fd)
+    def __init__(self, fileobj, mode=None):
+        super(WindowsFileLock, self).__init__(fileobj)
 
     def acquire(self):
-        msvcrt.locking(self.fd, msvcrt.LK_NBLCK, 1)
+        msvcrt.locking(self.fileobj.fileno(), msvcrt.LK_NBLCK, 1)
         self.locked = True
 
     def release(self):
-        msvcrt.locking(self.fd, msvcrt.LK_UNLCK, 1)
+        msvcrt.locking(self.fileobj.fileno(), msvcrt.LK_UNLCK, 1)
         self.locked = False
 
 
