8000 :books: update docs, contributors. :fire: remove py2 support snippets · blog2i2j/pyexcel.._..pyexcel@342121d · GitHub
[go: up one dir, main page]
Skip to content

Commit 342121d

Browse files
chfwchfw
committed
📚 update docs, contributors. 🔥 remove py2 support snippets
1 parent 5daa300 commit 342121d

File tree

5 files changed

+12
-28
lines changed

5 files changed

+12
-28
lines changed

‎.github/workflows/moban-update.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ jobs:
88
- uses: actions/checkout@v2
99
with:
1010
ref: ${{ github.head_ref }}
11+
token: ${{ secrets.PAT }}
1112
- name: Set up Python
1213
uses: actions/setup-python@v1
1314
with:

‎CONTRIBUTORS.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ In alphabetical order:
1717
* `John Vandenberg <https://github.com/jayvdb>`_
1818
* `Linghui Zeng <https://github.com/mathsyouth>`_
1919
* `nikolas <https://github.com/nikolas>`_
20-
* `Rintze M. Zelle <https://github.com/rmzelle>`_
20+
* `Rintze M. Zelle, PhD <https://github.com/rmzelle>`_
2121
* `Simeon Visser <https://github.com/svisser>`_
2222
* `Simon Allen <https://github.com/garfunkel>`_
2323
* `simon klemenc <https://github.com/hiaselhans>`_

‎README.rst

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ Feature Highlights
7878
csvz a zip file that contains one or many csv files
7979
tsvz a zip file that contains one or many tsv files
8080
xls a spreadsheet file format created by
81-
MS-Excel 97-2003 [#f3]_
81+
MS-Excel 97-2003
8282
xlsx MS-Excel Extensions to the Office Open XML
83-
SpreadsheetML File Format. [#f4]_
83+
SpreadsheetML File Format.
8484
xlsm an MS-Excel Macro-Enabled Workbook file
8585
ods open document spreadsheet
8686
fods flat open document spreadsheet
@@ -92,10 +92,6 @@ Feature Highlights
9292
============ =======================================================
9393

9494

95-
.. [f3] quoted from `whatis.com <http://whatis.techtarget.com/fileformat/XLS-Worksheet-file-Microsoft-Excel>`_. Technical details can be found at `MSDN XLS <https://msdn.microsoft.com/en-us/library/office/gg615597(v=office.14).aspx>`_
96-
.. [f4] xlsx is used by MS-Excel 2007, more information can be found at `MSDN XLSX <https://msdn.microsoft.com/en-us/library/dd922181(v=office.12).aspx>`_
97-
98-
9995
.. image:: https://github.com/pyexcel/pyexcel/raw/dev/docs/source/_static/images/architecture.svg
10096

10197

‎docs/source/index.rst

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@ For compatibility tables of pyexcel-io plugins, please click `here <http://pyexc
338338
csvz a zip file that contains one or many csv files
339339
tsvz a zip file that contains one or many tsv files
340340
xls a spreadsheet file format created by
341-
MS-Excel 97-2003 [#f3]_
341+
MS-Excel 97-2003
342342
xlsx MS-Excel Extensions to the Office Open XML
343-
SpreadsheetML File Format. [#f4]_
343+
SpreadsheetML File Format.
344344
xlsm an MS-Excel Macro-Enabled Workbook file
345345
ods open document spreadsheet
346346
fods flat open document spreadsheet
@@ -352,10 +352,6 @@ For compatibility tables of pyexcel-io plugins, please click `here <http://pyexc
352352
============ =======================================================
353353

354354

355-
.. [f3] quoted from `whatis.com <http://whatis.techtarget.com/fileformat/XLS-Worksheet-file-Microsoft-Excel>`_. Technical details can be found at `MSDN XLS <https://msdn.microsoft.com/en-us/library/office/gg615597(v=office.14).aspx>`_
356-
.. [f4] xlsx is used by MS-Excel 2007, more information can be found at `MSDN XLSX <https://msdn.microsoft.com/en-us/library/dd922181(v=office.12).aspx>`_
357-
358-
359355
Usage
360356
------
361357

‎pyexcel/internal/core.py

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
55
elementary functions to read and write generic excel content
66
7-
:copyright: (c) 2015-2020 by Onni Software Ltd.
7+
:copyright: (c) 2015-2021 by Onni Software Ltd.
88
:license: New BSD License
99
"""
10-
from pyexcel._compact import PY2
1110
from pyexcel.internal import SOURCE
1211
from pyexcel.constants import DEFAULT_NO_DATA
1312
from pyexcel.internal.generators import BookStream, SheetStream
@@ -67,21 +66,13 @@ def _save_any(a_source, instance):
6766

6867

6968
def _seek_at_zero(a_stream):
70-
if PY2:
71-
try:
72-
a_stream.seek(0)
73-
except IOError:
74-
pass
75-
else:
76-
import io
69+
import io
7770

78-
try:
79-
a_stream.seek(0)
80-
except io.UnsupportedOperation:
81-
pass
71+
try:
72+
a_stream.seek(0)
73+
except io.UnsupportedOperation:
74+
pass
8275

8376

8477
def _one_sheet_tuple(items):
85-
if not PY2:
86-
items = list(items)
8778
return items[0][0], items[0][1]

0 commit comments

Comments
 (0)
0