Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion decouple.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def __init__(self, cast=text_type, delimiter=',', strip=string.whitespace, post_
def __call__(self, value):
"""The actual transformation"""
if value is None:
return self.post_process()
value = ''

transform = lambda s: self.cast(s.strip(self.strip))

Expand Down
23 changes: 22 additions & 1 deletion tests/test_helper_csv.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# coding: utf-8
from decouple import Csv
import pytest
from decouple import Config, Csv


def test_csv():
Expand Down Expand Up @@ -34,3 +35,23 @@ def test_csv_quoted_parse():
def test_csv_none():
csv = Csv()
assert [] == csv(None)


@pytest.mark.parametrize('value', [None, ''])
@pytest.mark.parametrize('post_process, expected', [
(list, []), (tuple, ()), (sum, 0), (sorted, []),
])
def test_csv_empty_post_process(value, post_process, expected):
csv = Csv(cast=int, post_process=post_process)
assert expected == csv(value)


def test_csv_none_default_with_custom_post_process(monkeypatch):
monkeypatch.delenv('CSV_OPTION', raising=False)

def post_process(values):
return next(values, 'empty')

csv = Csv(cast=pytest.fail, post_process=post_process)
config = Config({})
assert 'empty' == config('CSV_OPTION', default=None, cast=csv)