aurore/aurorepass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fname doit être un unicode

Browse source 
On ne gère la conversion vers du binaire (utf-8) qu'au dernier
moment.
This commit is contained in:
Daniel STAN 2014-03-12 20:55:34 +01:00
parent 64e40a0a80
commit 53eb46d652
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client.py
View file

@ -961,6 +961,7 @@ if __name__ == "__main__":
liste liste
""") """)
parser.add_argument('fname', nargs='?', default=None, parser.add_argument('fname', nargs='?', default=None,
type=lambda x: x.decode('utf-8'),
help="Nom du fichier à afficher") help="Nom du fichier à afficher")
# On parse les options fournies en commandline # On parse les options fournies en commandline

5
server.py
View file

@ -41,6 +41,8 @@ def validate(roles, mode='r'):
def getpath(filename, backup=False): def getpath(filename, backup=False):
"""Récupère le chemin du fichier ``filename``""" """Récupère le chemin du fichier ``filename``"""
assert(isinstance(filename, unicode))
filename = filename.encode('utf-8')
return os.path.join(serverconfig.STORE, '%s.%s' % (filename, 'bak' if backup else 'json')) return os.path.join(serverconfig.STORE, '%s.%s' % (filename, 'bak' if backup else 'json'))
def writefile(filename, contents): def writefile(filename, contents):
@ -140,7 +142,8 @@ def listfiles():
files = {} files = {}
for filename in filenames: for filename in filenames:
file_dict = json.loads(open(filename).read()) file_dict = json.loads(open(filename).read())
files[filename[:-5]] = file_dict["roles"] fname = filename[:-5].decode('utf-8')
files[fname] = file_dict["roles"]
return files return files
@server_command('getfile') @server_command('getfile')