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
3f7a9482
Commit
3f7a9482
authored
Sep 06, 2003
by
Skip Montanaro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
**kwds arg was missing from __init__ for Dict{Reader,Writer} classes.
will backport.
parent
60e868ab
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
4 deletions
+14
-4
Lib/csv.py
Lib/csv.py
+4
-4
Lib/test/test_csv.py
Lib/test/test_csv.py
+7
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/csv.py
View file @
3f7a9482
...
...
@@ -93,11 +93,11 @@ register_dialect("excel-tab", excel_tab)
class
DictReader
:
def
__init__
(
self
,
f
,
fieldnames
,
restkey
=
None
,
restval
=
None
,
dialect
=
"excel"
,
*
args
):
dialect
=
"excel"
,
*
args
,
**
kwds
):
self
.
fieldnames
=
fieldnames
# list of keys for the dict
self
.
restkey
=
restkey
# key to catch long rows
self
.
restval
=
restval
# default value for short rows
self
.
reader
=
reader
(
f
,
dialect
,
*
args
)
self
.
reader
=
reader
(
f
,
dialect
,
*
args
,
**
kwds
)
def
__iter__
(
self
):
return
self
...
...
@@ -122,7 +122,7 @@ class DictReader:
class
DictWriter
:
def
__init__
(
self
,
f
,
fieldnames
,
restval
=
""
,
extrasaction
=
"raise"
,
dialect
=
"excel"
,
*
args
):
dialect
=
"excel"
,
*
args
,
**
kwds
):
self
.
fieldnames
=
fieldnames
# list of keys for the dict
self
.
restval
=
restval
# for writing short dicts
if
extrasaction
.
lower
()
not
in
(
"raise"
,
"ignore"
):
...
...
@@ -130,7 +130,7 @@ class DictWriter:
(
"extrasaction (%s) must be 'raise' or 'ignore'"
%
extrasaction
)
self
.
extrasaction
=
extrasaction
self
.
writer
=
writer
(
f
,
dialect
,
*
args
)
self
.
writer
=
writer
(
f
,
dialect
,
*
args
,
**
kwds
)
def
_dict_to_list
(
self
,
rowdict
):
if
self
.
extrasaction
==
"raise"
:
...
...
Lib/test/test_csv.py
View file @
3f7a9482
...
...
@@ -447,6 +447,13 @@ class TestDictFields(unittest.TestCase):
self
.
assertEqual
(
reader
.
next
(),
{
"1"
:
'1'
,
"2"
:
'2'
,
"3"
:
'abc'
,
"4"
:
'4'
,
"5"
:
'5'
,
"6"
:
'6'
})
def
test_read_semi_sep
(
self
):
reader
=
csv
.
DictReader
([
"1;2;abc;4;5;6
\
r
\
n
"
],
fieldnames
=
"1 2 3 4 5 6"
.
split
(),
delimiter
=
';'
)
self
.
assertEqual
(
reader
.
next
(),
{
"1"
:
'1'
,
"2"
:
'2'
,
"3"
:
'abc'
,
"4"
:
'4'
,
"5"
:
'5'
,
"6"
:
'6'
})
class
TestArrayWrites
(
unittest
.
TestCase
):
def
test_int_write
(
self
):
import
array
...
...
Misc/NEWS
View file @
3f7a9482
...
...
@@ -33,6 +33,9 @@ Extension modules
Library
-------
-
The
csv
module
's DictReader and DictWriter classes now accept keyword
arguments. This was an omission in the initial implementation.
- The email package handles some RFC 2231 parameters with missing
CHARSET fields better. It also includes a patch to parameter
parsing when semicolons appear inside quotes.
...
...
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