12
12
13
13
from pyexcel .book import Book
14
14
from pyexcel .core import save_as , get_book , get_sheet
15
- from pyexcel ._compact import OrderedDict
15
+ from pyexcel ._compact import OrderedDict , get_string_file_name
16
16
from pyexcel .constants import MESSAGE_WARNING
17
17
18
18
DEFAULT_OUT_FILE = "pyexcel_merged.csv"
@@ -32,9 +32,10 @@ def update_columns(in_file_name, column_dicts, out_file_name=None):
32
32
33
33
34
34
"""
35
+ in_file_name = get_string_file_name (in_file_name )
35
36
default_out_file = OUT_FILE_FORMATTER % in_file_name
36
37
if out_file_name :
37
- default_out_file = out_file_name
38
+ default_out_file = get_string_file_name ( out_file_name )
38
39
if os .path .exists (default_out_file ):
39
40
raise NotImplementedError (MESSAGE_WARNING )
40
41
sheet = get_sheet (file_name = in_file_name , name_columns_by_row = 0 )
@@ -54,9 +55,10 @@ def update_rows(in_file_name, row_dicts, out_file_name=None):
54
55
:param dict row_dicts: dictionaries of rows
55
56
:param str out_file_name: save the sheet as
56
57
"""
58
+ in_file_name = get_string_file_name (in_file_name )
57
59
default_out_file = OUT_FILE_FORMATTER % in_file_name
58
60
if out_file_name :
59
- default_out_file = out_file_name
61
+ default_out_file = get_string_file_name ( out_file_name )
60
62
if os .path .exists (default_out_file ):
61
63
raise NotImplementedError (MESSAGE_WARNING )
62
64
sheet = get_sheet (file_name = in_file_name , name_rows_by_column = 0 )
@@ -71,6 +73,7 @@ def merge_files(file_array, out_file_name=DEFAULT_OUT_FILE):
71
73
"""merge many files horizontally column after column
72
74
:param str out_file_name: save the sheet as
73
75
"""
76
+ out_file_name = get_string_file_name (out_file_name )
74
77
if os .path .exists (out_file_name ):
75
78
raise NotImplementedError (MESSAGE_WARNING )
76
79
content = []
@@ -90,6 +93,7 @@ def merge_two_files(file1, file2, out_file_name=DEFAULT_OUT_FILE):
90
93
:param str file2: an accessible file name
91
94
:param str out_file_name: save the sheet as
92
95
"""
96
+ out_file_name = get_string_file_name (out_file_name )
93
97
if os .path .exists (out_file_name ):
94
98
raise NotImplementedError (MESSAGE_WARNING )
95
99
files = [file1 , file2 ]
@@ -102,6 +106,7 @@ def merge_readers(reader_array, out_file_name=DEFAULT_OUT_FILE):
102
106
With FilterableReader and SeriesReader, you can do custom filtering
103
107
:param str out_file_name: save the sheet as
104
108
"""
109
+ out_file_name = get_string_file_name (out_file_name )
105
110
if os .path .exists (out_file_name ):
106
111
raise NotImplementedError (MESSAGE_WARNING )
107
112
content = OrderedDict ()
0 commit comments