tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shared

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-08-07 11:38:47 +02:00
parent 14ba0412f5
commit 15a9720eeb
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/python/recoll/recoll/conftree.py
View File

@ -152,7 +152,15 @@ class ConfSimple(object):
for nm,value in mp.items(): for nm,value in mp.items():
f.write(nm + b'=' + value + b'\n') f.write(nm + b'=' + value + b'\n')
f.close() f.close()
os.rename(tname, self.confname) try:
# os.replace works on Windows even if dst exists, but py3 only
os.replace(tname, self.confname)
except:
try:
os.rename(tname, self.confname)
except:
import shutil
shutil.move(tname, self.confname)
def setbin(self, nm, value, sk = b''): def setbin(self, nm, value, sk = b''):
if self.readonly: if self.readonly:
@ -263,6 +271,7 @@ class ConfStack(object):
def stringToStrings(s, quotes = '"', escape = '\\', escapedquotes = '"', def stringToStrings(s, quotes = '"', escape = '\\', escapedquotes = '"',
whitespace = None): whitespace = None):
lex = shlex.shlex(s, posix=True) lex = shlex.shlex(s, posix=True)
lex.whitespace_split = True
if quotes is not None: if quotes is not None:
lex.quotes = quotes lex.quotes = quotes
if escape is not None: if escape is not None: