Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
Cranspasswords
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
Cranspasswords
Commits
53eb46d6
Commit
53eb46d6
authored
Mar 12, 2014
by
Daniel Stan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fname doit être un unicode
On ne gère la conversion vers du binaire (utf-8) qu'au dernier moment.
parent
64e40a0a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
client.py
client.py
+1
-0
server.py
server.py
+4
-1
No files found.
client.py
View file @
53eb46d6
...
...
@@ -961,6 +961,7 @@ if __name__ == "__main__":
liste
"""
)
parser
.
add_argument
(
'fname'
,
nargs
=
'?'
,
default
=
None
,
type
=
lambda
x
:
x
.
decode
(
'utf-8'
),
help
=
"Nom du fichier à afficher"
)
# On parse les options fournies en commandline
...
...
server.py
View file @
53eb46d6
...
...
@@ -41,6 +41,8 @@ def validate(roles, mode='r'):
def
getpath
(
filename
,
backup
=
False
):
"""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'
))
def
writefile
(
filename
,
contents
):
...
...
@@ -140,7 +142,8 @@ def listfiles():
files
=
{}
for
filename
in
filenames
:
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
@
server_command
(
'getfile'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment