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
be20be13
Commit
be20be13
authored
13 years ago
by
Tarek Ziade
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use the same line terminator everywhere
parent
fb2473fc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
Lib/packaging/command/install_distinfo.py
Lib/packaging/command/install_distinfo.py
+2
-2
Lib/packaging/database.py
Lib/packaging/database.py
+4
-2
Lib/packaging/tests/test_database.py
Lib/packaging/tests/test_database.py
+5
-2
No files found.
Lib/packaging/command/install_distinfo.py
View file @
be20be13
...
...
@@ -110,7 +110,7 @@ class install_distinfo(Command):
logger
.
info
(
'creating %s'
,
resources_path
)
with
open
(
resources_path
,
'wb'
)
as
f
:
writer
=
csv
.
writer
(
f
,
delimiter
=
','
,
lineterminator
=
os
.
linesep
,
lineterminator
=
'
\
n
'
,
quotechar
=
'"'
)
for
tuple
in
install_data
.
get_resources_out
():
writer
.
writerow
(
tuple
)
...
...
@@ -122,7 +122,7 @@ class install_distinfo(Command):
logger
.
info
(
'creating %s'
,
record_path
)
with
open
(
record_path
,
'w'
,
encoding
=
'utf-8'
)
as
f
:
writer
=
csv
.
writer
(
f
,
delimiter
=
','
,
lineterminator
=
os
.
linesep
,
lineterminator
=
'
\
n
'
,
quotechar
=
'"'
)
install
=
self
.
get_finalized_command
(
'install_dist'
)
...
...
This diff is collapsed.
Click to expand it.
Lib/packaging/database.py
View file @
be20be13
...
...
@@ -159,7 +159,8 @@ class Distribution:
def
_get_records
(
self
,
local
=
False
):
with
self
.
get_distinfo_file
(
'RECORD'
)
as
record
:
record_reader
=
csv
.
reader
(
record
,
delimiter
=
','
)
record_reader
=
csv
.
reader
(
record
,
delimiter
=
','
,
lineterminator
=
'
\
n
'
)
# XXX needs an explaining comment
for
row
in
record_reader
:
path
,
checksum
,
size
=
(
row
[:]
+
...
...
@@ -171,7 +172,8 @@ class Distribution:
def
get_resource_path
(
self
,
relative_path
):
with
self
.
get_distinfo_file
(
'RESOURCES'
)
as
resources_file
:
resources_reader
=
csv
.
reader
(
resources_file
,
delimiter
=
','
)
resources_reader
=
csv
.
reader
(
resources_file
,
delimiter
=
','
,
lineterminator
=
'
\
n
'
)
for
relative
,
destination
in
resources_reader
:
if
relative
==
relative_path
:
return
destination
...
...
This diff is collapsed.
Click to expand it.
Lib/packaging/tests/test_database.py
View file @
be20be13
...
...
@@ -111,7 +111,8 @@ class TestDistribution(CommonDistributionTests, unittest.TestCase):
record_file
=
os
.
path
.
join
(
distinfo_dir
,
'RECORD'
)
with
open
(
record_file
,
'w'
)
as
file
:
record_writer
=
csv
.
writer
(
file
,
delimiter
=
','
,
quoting
=
csv
.
QUOTE_NONE
)
file
,
delimiter
=
','
,
quoting
=
csv
.
QUOTE_NONE
,
lineterminator
=
'
\
n
'
)
dist_location
=
distinfo_dir
.
replace
(
'.dist-info'
,
''
)
...
...
@@ -125,9 +126,11 @@ class TestDistribution(CommonDistributionTests, unittest.TestCase):
record_writer
.
writerow
([
relpath
(
record_file
,
sys
.
prefix
)])
with
open
(
record_file
)
as
file
:
record_reader
=
csv
.
reader
(
file
)
record_reader
=
csv
.
reader
(
file
,
lineterminator
=
'
\
n
'
)
record_data
=
{}
for
row
in
record_reader
:
if
row
==
[]:
continue
path
,
md5_
,
size
=
(
row
[:]
+
[
None
for
i
in
range
(
len
(
row
),
3
)])
record_data
[
path
]
=
md5_
,
size
...
...
This diff is collapsed.
Click to expand it.
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