1212 override_missing_value ,
1313 to_string )
1414from mycli .output_formatter .output_formatter import OutputFormatter
15- from mycli .output_formatter .delimited_output_adapter import (
16- adapter as csv_wrapper )
17- from mycli .output_formatter .tabulate_adapter import (
18- adapter as tabulate_wrapper )
19- from mycli .output_formatter .terminaltables_adapter import (
20- adapter as terminal_tables_wrapper )
15+ from mycli .output_formatter import delimited_output_adapter
16+ from mycli .output_formatter import tabulate_adapter
17+ from mycli .output_formatter import terminaltables_adapter
2118
2219
2320def test_to_string ():
@@ -98,7 +95,7 @@ def test_tabulate_wrapper():
9895 """Test the *output_formatter.tabulate_wrapper()* function."""
9996 data = [['abc' , 1 ], ['d' , 456 ]]
10097 headers = ['letters' , 'number' ]
101- output = tabulate_wrapper (data , headers , table_format = 'psql' )
98+ output = tabulate_adapter . adapter (data , headers , table_format = 'psql' )
10299 assert output == dedent ('''\
103100 +-----------+----------+
104101 | letters | number |
@@ -113,7 +110,7 @@ def test_csv_wrapper():
113110 # Test comma-delimited output.
114111 data = [['abc' , 1 ], ['d' , 456 ]]
115112 headers = ['letters' , 'number' ]
116- output = csv_wrapper (data , headers )
113+ output = delimited_output_adapter . adapter (data , headers )
117114 assert output == dedent ('''\
118115 letters,number\r \n \
119116 abc,1\r \n \
@@ -122,7 +119,7 @@ def test_csv_wrapper():
122119 # Test tab-delimited output.
123120 data = [['abc' , 1 ], ['d' , 456 ]]
124121 headers = ['letters' , 'number' ]
125- output = csv_wrapper (data , headers , table_format = 'tsv' )
122+ output = delimited_output_adapter . adapter (data , headers , table_format = 'tsv' )
126123 assert output == dedent ('''\
127124 letters\t number\r \n \
128125 abc\t 1\r \n \
@@ -133,7 +130,7 @@ def test_terminal_tables_wrapper():
133130 """Test the *output_formatter.terminal_tables_wrapper()* function."""
134131 data = [['abc' , 1 ], ['d' , 456 ]]
135132 headers = ['letters' , 'number' ]
136- output = terminal_tables_wrapper (data , headers , table_format = 'ascii' )
133+ output = terminaltables_adapter . adapter (data , headers , table_format = 'ascii' )
137134 assert output == dedent ('''\
138135 +---------+--------+
139136 | letters | number |
0 commit comments