python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-19 00:17:51 +02:00
Code Issues Releases Activity

add sep char test

Browse Source
This commit is contained in:
Kelly Brazil
2022-05-02 11:15:41 -07:00
parent 4a7f1bed3a
commit 86c279cbb2
2 changed files with 74 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jc/parsers/asciitable_m.py
View File

@ -386,8 +386,8 @@ def _collapse_data(table: List[List[List[str]]], quiet=False) -> List[List[str]]
"""combine data rows to return a simple list of lists""" """combine data rows to return a simple list of lists"""
result: List[List[str]] = [] result: List[List[str]] = []
try: for index, row in enumerate(table):
for index, row in enumerate(table): try:
new_row: List[str] = [] new_row: List[str] = []
for line in row: for line in row:
if new_row: if new_row:
@ -397,12 +397,12 @@ def _collapse_data(table: List[List[List[str]]], quiet=False) -> List[List[str]]
new_row = line new_row = line
result.append(new_row) result.append(new_row)
except IndexError: except IndexError:
if not quiet: if not quiet:
row_string = '\n'.join([' | '.join(l) for l in row]) row_string = '\n'.join([' | '.join(l) for l in row])
jc.utils.warning_message( jc.utils.warning_message(
[f'Possible table separator character found in row {index}: {row_string}. Skipping.'] [f'Possible table separator character found in row {index}: {row_string}. Skipping.']
) )
return result return result

66
tests/test_asciitable_m.py
View File

@ -270,6 +270,72 @@ class MyTests(unittest.TestCase):
self.assertEqual(jc.parsers.asciitable_m.parse(input, quiet=True), expected) self.assertEqual(jc.parsers.asciitable_m.parse(input, quiet=True), expected)
def test_asciitable_m_sep_char_in_cell(self):
"""
Test 'asciitable_m' with a column separator character inside the data
"""
input = '''
| Author | yada | yada2 | yada3 | yada4 | yada5 | yada6 | yada7 |
├─────────────────┼─────────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼────────────┼─────────────────┤
│ Kelly Brazil │ │ a76d46f9ecb1eff │ kellyjonbrazil@ │ Fri Feb 4 12:14 │ refactor ignore │ 1644005656 │ │
│ │ │ 4d6cc7ad633c97c │ gmail.com │ :16 2022 -0800 │ _exceptions │ │ │
│ │ │ ec0e99001a │ │ │ │ │ │
├─────────────────┼─────────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼────────────┼─────────────────┤
│ Kevin Lyter │ │ 6b069a82d0fa19c │ lyterk@sent.com │ Thu Feb 3 18:13 │ Add xrandr to l │ 1643940838 │ │
│ │ │ 8d83b19b934bace │ │ :58 2022 -0800 │ ib.py │ │ │
│ │ │ 556cb758d7 │ │ │ │ │ │
├─────────────────┼─────────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼────────────┼─────────────────┤
│ Kevin Lyter │ │ 6b793d052147406 │ lyterk@sent.com │ Thu Feb 3 18:13 │ Clean up types │ 1643940791 │ │
│ │ │ f388c4d5dc04f50 │ │ :11 2022 -0800 │ │ │ │
│ │ │ 6a3456f409 │ │ │ │ │ │
│ │ │ │ │ │ * | operator = │ │ │
│ │ │ │ │ │ > Union[] │ │ │
│ │ │ │ │ │ * Rem │ │ │
│ │ │ │ │ │ ove unused impo │ │ │
│ │ │ │ │ │ rt Iterator │ │ │
│ │ │ │ │ │ * R │ │ │
│ │ │ │ │ │ emove comment │ │ │
├─────────────────┼─────────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼────────────┼─────────────────┤
│ Kevin Lyter │ │ ce9103f7cc66689 │ lyterk@sent.com │ Thu Feb 3 18:12 │ Delete old file │ 1643940766 │ │
│ │ │ 5dc7840d32797d8 │ │ :46 2022 -0800 │ s in template f │ │ │
│ │ │ c7274cf1b8 │ │ │ older │ │ │
├─────────────────┼─────────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼────────────┼─────────────────┤
'''
expected = [
{
"author": "Kelly Brazil",
"yada": None,
"yada2": "a76d46f9ecb1eff\n4d6cc7ad633c97c\nec0e99001a",
"yada3": "kellyjonbrazil@\ngmail.com",
"yada4": "Fri Feb 4 12:14\n:16 2022 -0800",
"yada5": "refactor ignore\n_exceptions",
"yada6": "1644005656",
"yada7": None
},
{
"author": "Kevin Lyter",
"yada": None,
"yada2": "6b069a82d0fa19c\n8d83b19b934bace\n556cb758d7",
"yada3": "lyterk@sent.com",
"yada4": "Thu Feb 3 18:13\n:58 2022 -0800",
"yada5": "Add xrandr to l\nib.py",
"yada6": "1643940838",
"yada7": None
},
{
"author": "Kevin Lyter",
"yada": None,
"yada2": "ce9103f7cc66689\n5dc7840d32797d8\nc7274cf1b8",
"yada3": "lyterk@sent.com",
"yada4": "Thu Feb 3 18:12\n:46 2022 -0800",
"yada5": "Delete old file\ns in template f\nolder",
"yada6": "1643940766",
"yada7": None
}
]
self.assertEqual(jc.parsers.asciitable_m.parse(input, quiet=False), expected)
def test_asciitable_m_markdown(self): def test_asciitable_m_markdown(self):
""" """
Test 'asciitable_m' with a markdown table. Should raise a ParseError Test 'asciitable_m' with a markdown table. Should raise a ParseError