8000 :lipstick: update coding style · blog2i2j/pyexcel.._..pyexcel@47f136a · GitHub
[go: up one dir, main page]
Skip to content

Commit 47f136a

Browse files
chfwchfw
committed
💄 update coding style
1 parent 66daa4a commit 47f136a

File tree

7 files changed

+51
-14
lines changed

7 files changed

+51
-14
lines changed

‎pyexcel/__version__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version__ = '0.6.7'
2-
__author__ = 'C.W.'
1+
__version__ = "0.6.7"
2+
__author__ = "C.W."

‎pyexcel/internal/sheets/matrix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def cell_value(self, row, column, new_value=None):
9090
raise IndexError("Index out of range")
9191
else:
9292
if not fit:
93-
width, array = uniform(self.__array, row+1, column+1)
93+
width, array = uniform(self.__array, row + 1, column + 1)
9494
self.__width, self.__array = width, array
9595

9696
self.__array[row][column] = new_value

‎tests/base.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import os
22
import json
3+
import unittest
34

45
import pyexcel as pe
56

6-
import unittest
77
from nose.tools import eq_, raises
88

99

@@ -68,10 +68,12 @@ class PyexcelSheetBase(unittest.TestCase):
6868
filename = "fixtures/non-uniform-rows.csv"
6969

7070
def setUp(self):
71-
self.sheet = pe.Sheet([
72-
[f"{row_no}_{col_no}" for col_no in range(10)]
73-
for row_no in range(10)
74-
])
71+
self.sheet = pe.Sheet(
72+
[
73+
[f"{row_no}_{col_no}" for col_no in range(10)]
74+
for row_no in range(10)
75+
]
76+
)
7577

7678

7779
class PyexcelBase:
@@ -154,7 +156,7 @@ def test_reading_through_sheets(self):
154156
expected = [[4, 4, 4, 4], [5, 5, 5, 5], [6, 6, 6, 6]]
155157
assert data == expected
156158
data = list(b["Sheet3"].rows())
157-
expected = [[u"X", u"Y", u"Z"], [1, 4, 7], [2, 5, 8], [3, 6, 9]]
159+
expected = [["X", "Y", "Z"], [1, 4, 7], [2, 5, 8], [3, 6, 9]]
158160
assert data == expected
159161
sheet3 = b["Sheet3"]
160162
sheet3.name_columns_by_row(0)

‎tests/fixtures/issue_241/1.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
header1,,header3,header4
2+
1,2,3,4

‎tests/fixtures/issue_241/2.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
headerA,headerB,,headerD
2+
A,,C,D
3+
F,G,M,T

‎tests/test_bug_fixes.py

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,3 +536,33 @@ def test_pyexcel_issue_176_get_book():
536536
file_name=os.path.join("tests", "fixtures", "bug_176.xlsx")
537537
)
538538
eq_({}, book.bookdict)
539+
540+
541+
def test_issue_241():
542+
import glob
543+
544+
from pyexcel import get_book, merge_all_to_a_book
545+
546+
merge_all_to_a_book(
547+
glob.glob("tests/fixtures/issue_241/*.csv"), "issue_241.xlsx"
548+
)
549+
book = get_book(file_name="issue_241.xlsx")
550+
expected = dedent(
551+
"""
552+
1.csv:
553+
+---------+---+---------+---------+
554+
| header1 | | header3 | header4 |
555+
+---------+---+---------+---------+
556+
| 1 | 2 | 3 | 4 |
557+
+---------+---+---------+---------+
558+
2.csv:
559+
+---------+---------+---+---------+
560+
| headerA | headerB | | headerD |
561+
+---------+---------+---+---------+
562+
| A | | C | D |
563+
+---------+---------+---+---------+
564+
| F | G | M | T |
565+
+---------+---------+---+---------+"""
566+
).lstrip()
567+
eq_(str(book), expected)
568+
os.unlink('issue_241.xlsx')

‎tests/test_sheet_access.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_out_of_bounds_write(self):
2020
def test_out_of_column_bound_write(self):
2121
value = self.get_random_char()
2222
column = self.get_random_char() + self.get_random_char()
23-
cell = 'A' + column + str(random.randint(9, 30))
23+
cell = "A" + column + str(random.randint(9, 30))
2424
self.sheet[cell] = value
2525

2626
self.assertEqual(value, self.sheet[cell])
@@ -33,15 +33,15 @@ def test_out_of_bounds_read(self):
3333
self.sheet[20, 0]
3434

3535
def test_column_edge_case(self):
36-
column = self.sheet.number_of_columns()-1
36+
column = self.sheet.number_of_columns() - 1
3737

3838
self.assertEqual(self.sheet[0, column], f"0_{column}")
3939
with self.assertRaises(IndexError):
40-
self.sheet[0, column+1]
40+
self.sheet[0, column + 1]
4141

4242
def test_row_edge_case(self):
43-
row = self.sheet.number_of_rows()-1
43+
row = self.sheet.number_of_rows() - 1
4444

4545
self.assertEqual(self.sheet[row, 0], f"{row}_0")
4646
with self.assertRaises(IndexError):
47-
self.sheet[row+1, 0]
47+
self.sheet[row + 1, 0]

0 commit comments

Comments
 (0)
0