Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
87f13b88
Commit
87f13b88
authored
May 19, 2011
by
Victor Stinner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
packaging: don't use locale encoding to compute MD5 checksums
Open the file in binary mode or use UTF-8 encoding.
parent
b71cfdfb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
Lib/packaging/command/install_distinfo.py
Lib/packaging/command/install_distinfo.py
+2
-2
Lib/packaging/create.py
Lib/packaging/create.py
+3
-3
Lib/packaging/tests/test_command_install_distinfo.py
Lib/packaging/tests/test_command_install_distinfo.py
+2
-2
No files found.
Lib/packaging/command/install_distinfo.py
View file @
87f13b88
...
@@ -133,9 +133,9 @@ class install_distinfo(Command):
...
@@ -133,9 +133,9 @@ class install_distinfo(Command):
writer
.
writerow
((
fpath
,
''
,
''
))
writer
.
writerow
((
fpath
,
''
,
''
))
else
:
else
:
size
=
os
.
path
.
getsize
(
fpath
)
size
=
os
.
path
.
getsize
(
fpath
)
with
open
(
fpath
,
'r'
)
as
fp
:
with
open
(
fpath
,
'r
b
'
)
as
fp
:
hash
=
hashlib
.
md5
()
hash
=
hashlib
.
md5
()
hash
.
update
(
fp
.
read
()
.
encode
()
)
hash
.
update
(
fp
.
read
())
md5sum
=
hash
.
hexdigest
()
md5sum
=
hash
.
hexdigest
()
writer
.
writerow
((
fpath
,
md5sum
,
size
))
writer
.
writerow
((
fpath
,
md5sum
,
size
))
...
...
Lib/packaging/create.py
View file @
87f13b88
...
@@ -400,10 +400,10 @@ class MainProgram:
...
@@ -400,10 +400,10 @@ class MainProgram:
self.data['
description
']).lower().encode())
self.data['
description
']).lower().encode())
ref = ref.digest()
ref = ref.digest()
for readme in glob.glob('
README
*
'):
for readme in glob.glob('
README
*
'):
with open(readme) as fp:
with open(readme
, encoding='
utf
-
8
'
) as fp:
contents = fp.read()
contents = fp.read()
val = md5(re.sub('
\
s
', '',
contents = re.sub('
\
s
', '', contents.lower()).encode()
contents.lower()).encode()
).digest()
val = md5(contents
).digest()
if val == ref:
if val == ref:
del data['
description
']
del data['
description
']
data['
description
-
file
'] = readme
data['
description
-
file
'] = readme
...
...
Lib/packaging/tests/test_command_install_distinfo.py
View file @
87f13b88
...
@@ -168,8 +168,8 @@ class InstallDistinfoTestCase(support.TempdirManager,
...
@@ -168,8 +168,8 @@ class InstallDistinfoTestCase(support.TempdirManager,
else
:
else
:
size
=
os
.
path
.
getsize
(
f
)
size
=
os
.
path
.
getsize
(
f
)
md5
=
hashlib
.
md5
()
md5
=
hashlib
.
md5
()
with
open
(
f
)
as
fp
:
with
open
(
f
,
'rb'
)
as
fp
:
md5
.
update
(
fp
.
read
()
.
encode
()
)
md5
.
update
(
fp
.
read
())
hash
=
md5
.
hexdigest
()
hash
=
md5
.
hexdigest
()
expected
.
append
([
f
,
hash
,
str
(
size
)])
expected
.
append
([
f
,
hash
,
str
(
size
)])
...
...
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