Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace use of CreateFile with CreateFileW

Browse Source
This commit is contained in:
Kovid Goyal 2018-01-28 08:08:43 +05:30
parent 75e59cb3a8
commit 6f87c59b7b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/utils/lock.py
View File

@ -49,8 +49,10 @@ def unix_retry(err):
def windows_open(path): def windows_open(path):
if isinstance(path, bytes):
path = path.decode('mbcs')
try: try:
h = win32file.CreateFile( h = win32file.CreateFileW(
path, path,
win32file.GENERIC_READ | win32file.GENERIC_READ |
win32file.GENERIC_WRITE, # Open for reading and writing win32file.GENERIC_WRITE, # Open for reading and writing
@ -86,9 +88,8 @@ def retry_for_a_time(timeout, sleep_time, func, error_retry, *args):
class ExclusiveFile(object): class ExclusiveFile(object):
def __init__(self, path, timeout=15, sleep_time=0.2): def __init__(self, path, timeout=15, sleep_time=0.2):
if iswindows: if iswindows and isinstance(path, bytes):
if isinstance(path, bytes): path = path.decode(filesystem_encoding)
path = path.decode(filesystem_encoding)
self.path = path self.path = path
self.timeout = timeout self.timeout = timeout
self.sleep_time = sleep_time self.sleep_time = sleep_time