From 11d582b997624c6355c2b21b6fa582de44506713 Mon Sep 17 00:00:00 2001
From: Juarez Rudsatz <juarez.rudsatz@ceabs.net>
Date: Mon, 20 Jul 2020 17:31:14 -0300
Subject: [PATCH 1/8] allow reading/writing remote xlsx files

---
 petl/io/xlsx.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/petl/io/xlsx.py b/petl/io/xlsx.py
index c46dc8db..b9eb7e18 100644
--- a/petl/io/xlsx.py
+++ b/petl/io/xlsx.py
@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, division
 
-
 import locale
 
-
 from petl.util.base import Table, data
+from petl.io.sources import read_source_from_arg, write_source_from_arg
 
 
 def fromxlsx(filename, sheet=None, range_string=None, min_row=None,
@@ -58,9 +57,11 @@ def __init__(self, filename, sheet=None, range_string=None,
 
     def __iter__(self):
         import openpyxl
-        wb = openpyxl.load_workbook(filename=self.filename,
-                                    read_only=self.read_only,
-                                    **self.kwargs)
+        source = read_source_from_arg(self.filename)
+        with source.open('rb') as source2:
+            wb = openpyxl.load_workbook(filename=source2,
+                                        read_only=self.read_only,
+                                        **self.kwargs)
         if self.sheet is None:
             ws = wb[wb.sheetnames[0]]
         elif isinstance(self.sheet, int):
@@ -101,7 +102,9 @@ def toxlsx(tbl, filename, sheet=None, write_header=True):
         rows = data(tbl)
     for row in rows:
         ws.append(row)
-    wb.save(filename)
+    target = write_source_from_arg(filename)
+    with target.open('wb') as target2:
+        wb.save(target2)
 
 
 Table.toxlsx = toxlsx
@@ -113,7 +116,9 @@ def appendxlsx(tbl, filename, sheet=None, write_header=False):
     """
 
     import openpyxl
-    wb = openpyxl.load_workbook(filename=filename, read_only=False)
+    source = read_source_from_arg(filename)
+    with source.open('rb') as source2:
+        wb = openpyxl.load_workbook(filename=source2, read_only=False)
     if sheet is None:
         ws = wb[wb.sheetnames[0]]
     elif isinstance(sheet, int):
@@ -126,7 +131,9 @@ def appendxlsx(tbl, filename, sheet=None, write_header=False):
         rows = data(tbl)
     for row in rows:
         ws.append(row)
-    wb.save(filename)
+    target = write_source_from_arg(filename)
+    with target.open('wb') as target2:
+        wb.save(target2)
 
 
 Table.appendxlsx = appendxlsx

From 95c3312181af64cead09e966009ab90f8cc985ee Mon Sep 17 00:00:00 2001
From: Juarez Rudsatz <juarez.rudsatz@ceabs.net>
Date: Mon, 20 Jul 2020 17:31:46 -0300
Subject: [PATCH 2/8] allow reading/writing remote xls files

---
 petl/io/xls.py          | 48 ++++++++++++++++++++++++-----------------
 petl/io/xlutils_view.py |  5 +++--
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/petl/io/xls.py b/petl/io/xls.py
index 23f188cb..b9896d8d 100644
--- a/petl/io/xls.py
+++ b/petl/io/xls.py
@@ -5,8 +5,9 @@
 import locale
 
 
-from petl.compat import izip_longest, next, xrange
+from petl.compat import izip_longest, next, xrange, BytesIO
 from petl.util.base import Table
+from petl.io.sources import read_source_from_arg, write_source_from_arg
 
 
 def fromxls(filename, sheet=None, use_view=True, **kwargs):
@@ -36,26 +37,31 @@ def __iter__(self):
         # converted
         if self.use_view:
             from petl.io import xlutils_view
-            wb = xlutils_view.View(self.filename)
-            if self.sheet is None:
-                ws = wb[0]
-            else:
-                ws = wb[self.sheet]
-            for row in ws:
-                yield tuple(row)
-
-        else:
-            import xlrd
-            with xlrd.open_workbook(filename=self.filename,
-                                    on_demand=True, **self.kwargs) as wb:
+            source = read_source_from_arg(self.filename)
+            with source.open('rb') as source2:
+                source3 = source2.read()
+                wb = xlutils_view.View(source3)
                 if self.sheet is None:
-                    ws = wb.sheet_by_index(0)
-                elif isinstance(self.sheet, int):
-                    ws = wb.sheet_by_index(self.sheet)
+                    ws = wb[0]
                 else:
-                    ws = wb.sheet_by_name(str(self.sheet))
-                for rownum in xrange(ws.nrows):
-                    yield tuple(ws.row_values(rownum))
+                    ws = wb[self.sheet]
+                for row in ws:
+                    yield tuple(row)
+        else:
+            import xlrd
+            source = read_source_from_arg(self.filename)
+            with source.open('rb') as source2:
+                source3 = source2.read()
+                with xlrd.open_workbook(file_contents=source3,
+                                        on_demand=True, **self.kwargs) as wb:
+                    if self.sheet is None:
+                        ws = wb.sheet_by_index(0)
+                    elif isinstance(self.sheet, int):
+                        ws = wb.sheet_by_index(self.sheet)
+                    else:
+                        ws = wb.sheet_by_name(str(self.sheet))
+                    for rownum in xrange(ws.nrows):
+                        yield tuple(ws.row_values(rownum))
 
 
 def toxls(tbl, filename, sheet, encoding=None, style_compression=0,
@@ -92,7 +98,9 @@ def toxls(tbl, filename, sheet, encoding=None, style_compression=0,
                                                         fillvalue=None)):
                 ws.write(r+1, c, label=v, style=style)
 
-    wb.save(filename)
+    target = write_source_from_arg(filename)
+    with target.open('wb') as target2:
+        wb.save(target2)
 
 
 Table.toxls = toxls
diff --git a/petl/io/xlutils_view.py b/petl/io/xlutils_view.py
index 1b42c598..62136cbc 100644
--- a/petl/io/xlutils_view.py
+++ b/petl/io/xlutils_view.py
@@ -111,10 +111,11 @@ class View(object):
     #: :class:`SheetView` for the views of sheets returned.
     class_ = SheetView
 
-    def __init__(self, path, class_=None):
+    def __init__(self, file_contents, class_=None, **kwargs):
         self.class_ = class_ or self.class_
         from xlrd import open_workbook
-        self.book = open_workbook(path, formatting_info=0, on_demand=True)
+        self.book = open_workbook(file_contents=file_contents, 
+                                  on_demand=True, **kwargs)
 
     def __getitem__(self, item):
         """

From 52758f4a07b8f824e1f61095f00fb63af68271d1 Mon Sep 17 00:00:00 2001
From: Juarez Rudsatz <juarez.rudsatz@ceabs.net>
Date: Mon, 20 Jul 2020 17:33:02 -0300
Subject: [PATCH 3/8] test remote excel files

---
 petl/test/io/test_remotes.py | 73 +++++++++++++++++++++++-------------
 1 file changed, 46 insertions(+), 27 deletions(-)

diff --git a/petl/test/io/test_remotes.py b/petl/test/io/test_remotes.py
index 9ccf46e2..423c0d0f 100644
--- a/petl/test/io/test_remotes.py
+++ b/petl/test/io/test_remotes.py
@@ -3,11 +3,15 @@
 
 import sys
 import os
+from importlib import import_module
 
 from petl.compat import PY3
 from petl.test.helpers import ieq, eq_
 from petl.io.avro import fromavro, toavro
 from petl.io.csv import fromcsv, tocsv
+from petl.io.json import fromjson, tojson
+from petl.io.xlsx import fromxlsx, toxlsx
+from petl.io.xls import fromxls, toxls
 from petl.util.vis import look
 
 # region Codec test cases
@@ -69,7 +73,7 @@ def _write_read_from_env_matching(prefix):
     if q < 1:
         msg = """SKIPPED
     For testing remote source define a environment variable:
-    $ export PETL_TEST_<protocol>='<protocol>://myuser:mypassword@host:port/path/to/file.ext'"""
+    $ export PETL_TEST_<protocol>='<protocol>://myuser:mypassword@host:port/path/to/folder'"""
         print(msg, file=sys.stderr)
 
 
@@ -83,19 +87,24 @@ def _write_read_from_env_url(env_var_name):
 
 
 def _write_read_into_url(base_url):
-    _write_read_file_into_url(base_url, "filename1.csv")
-    _write_read_file_into_url(base_url, "filename2.avro")
-    _write_read_file_into_url(base_url, "filename3.csv", "gz")
-    _write_read_file_into_url(base_url, "filename4.avro", "gz")
-    _write_read_file_into_url(base_url, "filename5.csv", "xz")
-    _write_read_file_into_url(base_url, "filename6.csv", "zst")
-    _write_read_file_into_url(base_url, "filename7.csv", "lz4")
-    _write_read_file_into_url(base_url, "filename8.csv", "snappy")
-
-
-def _write_read_file_into_url(base_url, filename, compression=None):
-    if ".avro" in filename and not _has_avro:
-        return
+    _write_read_file_into_url(base_url, "filename10.csv")
+    _write_read_file_into_url(base_url, "filename11.csv", "gz")
+    _write_read_file_into_url(base_url, "filename12.csv", "xz")
+    _write_read_file_into_url(base_url, "filename13.csv", "zst")
+    _write_read_file_into_url(base_url, "filename14.csv", "lz4")
+    _write_read_file_into_url(base_url, "filename15.csv", "snappy")
+    _write_read_file_into_url(base_url, "filename20.json")
+    _write_read_file_into_url(base_url, "filename21.json", "gz")
+    _write_read_file_into_url(base_url, "filename30.avro", pkg='fastavro')
+    _write_read_file_into_url(base_url, "filename40.xlsx", pkg='openpyxl')
+    _write_read_file_into_url(base_url, "filename50.xls", pkg='xlwt')
+
+
+def _write_read_file_into_url(base_url, filename, compression=None, pkg=None):
+    if pkg is not None:
+        if not _is_installed(pkg):
+            print("\n    - %s SKIPPED " % filename, file=sys.stderr, end="")
+            return
     is_local = base_url.startswith("./")
     if compression is not None:
         if is_local:
@@ -112,18 +121,30 @@ def _write_read_file_into_url(base_url, filename, compression=None):
     else:
         source_url = os.path.join(base_url, filename)
 
-    _show__rows_from("Expected:", _table)
-
+    actual = None
     if ".avro" in filename:
         toavro(_table, source_url)
         actual = fromavro(source_url)
-    else:
+    elif ".xlsx" in filename:
+        toxlsx(_table, source_url, 'test')
+        actual = fromxlsx(source_url, 'test')
+    elif ".xls" in filename:
+        toxls(_table, source_url, 'test')
+        actual = fromxls(source_url, 'test')
+    elif ".json" in filename:
+        tojson(_table, source_url)
+        actual = fromjson(source_url)
+    elif ".csv" in filename:
         tocsv(_table, source_url, encoding="ascii", lineterminator="\n")
         actual = fromcsv(source_url, encoding="ascii")
 
-    _show__rows_from("Actual:", actual)
-    ieq(_table, actual)
-    ieq(_table, actual)  # verify can iterate twice
+    if actual is not None:
+        _show__rows_from("Expected:", _table)
+        _show__rows_from("Actual:", actual)
+        ieq(_table, actual)
+        ieq(_table, actual)  # verify can iterate twice
+    else:
+        print("\n    - %s SKIPPED " % filename, file=sys.stderr, end="")
 
 
 def _show__rows_from(label, test_rows, limit=0):
@@ -131,12 +152,12 @@ def _show__rows_from(label, test_rows, limit=0):
     print(look(test_rows, limit=limit))
 
 
-def _test_avro_too():
+def _is_installed(package_name):
     try:
-        import fastavro
-
-        return True
-    except:
+        mod = import_module(package_name)
+        return mod is not None
+    except Exception as exm:
+        print(exm, file=sys.stderr)
         return False
 
 
@@ -144,8 +165,6 @@ def _test_avro_too():
 
 # region Mockup data
 
-_has_avro = _test_avro_too()
-
 _table = (
     (u"name", u"friends", u"age"),
     (u"Bob", "42", "33"),

From 3293c68805afc5e8414b14fa679286c265a9861d Mon Sep 17 00:00:00 2001
From: Juarez Rudsatz <juarez.rudsatz@ceabs.net>
Date: Mon, 20 Jul 2020 17:33:35 -0300
Subject: [PATCH 4/8] add missing appendxlsx in petl init

---
 petl/io/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/petl/io/__init__.py b/petl/io/__init__.py
index 28497317..e3eb6bd5 100644
--- a/petl/io/__init__.py
+++ b/petl/io/__init__.py
@@ -23,7 +23,7 @@
 
 from petl.io.xls import fromxls, toxls
 
-from petl.io.xlsx import fromxlsx, toxlsx
+from petl.io.xlsx import fromxlsx, toxlsx, appendxlsx
 
 from petl.io.numpy import fromarray, toarray, torecarray
 

From 6e21fc0db9e67114d434438e3cc4daec3a673cf1 Mon Sep 17 00:00:00 2001
From: Juarez Rudsatz <juarez.rudsatz@ceabs.net>
Date: Fri, 7 Aug 2020 20:12:32 -0300
Subject: [PATCH 5/8] Allow toxlsx() to overwrite add or replace a worksheet

---
 petl/io/xlsx.py           |  48 ++++++++++++++---
 petl/test/io/test_xlsx.py | 107 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 144 insertions(+), 11 deletions(-)

diff --git a/petl/io/xlsx.py b/petl/io/xlsx.py
index b9eb7e18..749d9dc3 100644
--- a/petl/io/xlsx.py
+++ b/petl/io/xlsx.py
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, division
 
-import locale
-
+from petl.compat import PY3
 from petl.util.base import Table, data
 from petl.io.sources import read_source_from_arg, write_source_from_arg
 
@@ -87,15 +86,52 @@ def __iter__(self):
             pass
 
 
-def toxlsx(tbl, filename, sheet=None, write_header=True):
+def toxlsx(tbl, filename, sheet=None, write_header=True, mode="replace"):
     """
     Write a table to a new Excel .xlsx file.
 
-    """
+    N.B., the sheet name is case sensitive.
+    The `mode` argument controls how the file and sheet are treated:
+    - `replace`: This is the default. It either replaces or adds a
+      named sheet, or if no sheet name is provided, all sheets
+      (overwrites the entire file).
+    - `overwrite`: Always overwrites the file. This produces a file
+      with a single sheet.
+    - `add`: Adds a new sheet. Raises `ValueError` if a named sheet
+      already exists.
+    The `sheet` argument can be omitted in all cases. The new sheet
+    will then get a default name.
+    If the file does not exist, it will be created, unless `replace`
+    mode is used with a named sheet. In the latter case, the file
+    must exist and be a valid .xlsx file.
 
+    """
     import openpyxl
-    wb = openpyxl.Workbook(write_only=True)
-    ws = wb.create_sheet(title=sheet)
+    if mode == "overwrite" or (mode == "replace" and sheet is None):
+        wb = openpyxl.Workbook(write_only=True)
+        ws = wb.create_sheet(title=sheet)
+    elif mode == "replace":
+        if PY3:
+            FileNotFound = FileNotFoundError
+        else:
+            FileNotFound = IOError
+        try:
+            wb = openpyxl.load_workbook(filename=filename, read_only=False)
+        except FileNotFound:
+            wb = openpyxl.Workbook(write_only=True)
+        try:
+            ws = wb[str(sheet)]
+            ws.delete_rows(1, ws.max_row)
+        except KeyError:
+            ws = wb.create_sheet(title=sheet)
+    elif mode == "add":
+        wb = openpyxl.load_workbook(filename=filename, read_only=False)
+        ws = wb.create_sheet(title=sheet)
+        # wb.create_sheet(title="foo") creates "foo1" if "foo" exists.
+        if sheet is not None and ws.title != sheet:
+            raise ValueError("Sheet %s already exists in file" % sheet)
+    else:
+        raise ValueError("Unknown mode '%s'" % mode)
     if write_header:
         rows = tbl
     else:
diff --git a/petl/test/io/test_xlsx.py b/petl/test/io/test_xlsx.py
index dc2d711e..b038561b 100644
--- a/petl/test/io/test_xlsx.py
+++ b/petl/test/io/test_xlsx.py
@@ -3,14 +3,14 @@
 
 
 import sys
-import pkg_resources
 from datetime import datetime
 from tempfile import NamedTemporaryFile
 
+import pkg_resources
 
 import petl as etl
 from petl.io.xlsx import fromxlsx, toxlsx, appendxlsx
-from petl.test.helpers import ieq
+from petl.test.helpers import ieq, eq_
 
 
 try:
@@ -79,7 +79,7 @@ def test_toxlsx_appendxlsx():
                ('B', 2),
                ('C', 2),
                (u'é', datetime(2012, 1, 1)))
-        f = NamedTemporaryFile(delete=False, suffix='.xlsx')
+        f = NamedTemporaryFile(delete=True, suffix='.xlsx')
         f.close()
 
         # test toxlsx
@@ -98,7 +98,7 @@ def test_toxlsx_nosheet():
                ('B', 2),
                ('C', 2),
                (u'é', datetime(2012, 1, 1)))
-        f = NamedTemporaryFile(delete=False, suffix='.xlsx')
+        f = NamedTemporaryFile(delete=True, suffix='.xlsx')
         f.close()
         toxlsx(tbl, f.name)
         actual = fromxlsx(f.name)
@@ -110,7 +110,7 @@ def test_integration():
                ('B', 2),
                ('C', 2),
                (u'é', datetime(2012, 1, 1)))
-        f = NamedTemporaryFile(delete=False, suffix='.xlsx')
+        f = NamedTemporaryFile(delete=True, suffix='.xlsx')
         f.close()
         tbl = etl.wrap(tbl)
         tbl.toxlsx(f.name, 'Sheet1')
@@ -120,3 +120,100 @@ def test_integration():
         expect = tbl.cat(tbl)
         ieq(expect, actual)
 
+    def test_toxlsx_overwrite():
+        tbl = (('foo', 'bar'),
+               ('A', 1),
+               ('B', 2),
+               ('C', 2),
+               (u'é', datetime(2012, 1, 1)))
+        f = NamedTemporaryFile(delete=False, suffix='.xlsx')
+        f.close()
+
+        toxlsx(tbl, f.name, 'Sheet1', mode="overwrite")
+        wb = openpyxl.load_workbook(f.name, read_only=True)
+        eq_(1, len(wb.sheetnames))
+
+    def test_toxlsx_replace_file():
+        tbl = (('foo', 'bar'),
+               ('A', 1),
+               ('B', 2),
+               ('C', 2),
+               (u'é', datetime(2012, 1, 1)))
+        f = NamedTemporaryFile(delete=True, suffix='.xlsx')
+        f.close()
+
+        toxlsx(tbl, f.name, 'Sheet1', mode="overwrite")
+        toxlsx(tbl, f.name, sheet=None, mode="replace")
+        wb = openpyxl.load_workbook(f.name, read_only=True)
+        eq_(1, len(wb.sheetnames))
+
+    def test_toxlsx_replace_sheet():
+        tbl = (('foo', 'bar'),
+               ('A', 1),
+               ('B', 2),
+               ('C', 2),
+               (u'é', datetime(2012, 1, 1)))
+        f = NamedTemporaryFile(delete=True, suffix='.xlsx')
+        f.close()
+
+        toxlsx(tbl, f.name, 'Sheet1', mode="overwrite")
+        toxlsx(tbl, f.name, 'Sheet1', mode="replace")
+        wb = openpyxl.load_workbook(f.name, read_only=True)
+        eq_(1, len(wb.sheetnames))
+
+    def test_toxlsx_replace_sheet_nofile():
+        tbl = (('foo', 'bar'),
+               ('A', 1),
+               ('B', 2),
+               ('C', 2),
+               (u'é', datetime(2012, 1, 1)))
+        f = NamedTemporaryFile(delete=True, suffix='.xlsx')
+        f.close()
+
+        toxlsx(tbl, f.name, 'Sheet1', mode="replace")
+        wb = openpyxl.load_workbook(f.name, read_only=True)
+        eq_(1, len(wb.sheetnames))
+
+    def test_toxlsx_add_nosheet():
+        tbl = (('foo', 'bar'),
+               ('A', 1),
+               ('B', 2),
+               ('C', 2),
+               (u'é', datetime(2012, 1, 1)))
+        f = NamedTemporaryFile(delete=True, suffix='.xlsx')
+        f.close()
+
+        toxlsx(tbl, f.name, 'Sheet1', mode="overwrite")
+        toxlsx(tbl, f.name, None, mode="add")
+        wb = openpyxl.load_workbook(f.name, read_only=True)
+        eq_(2, len(wb.sheetnames))
+
+    def test_toxlsx_add_sheet_nomatch():
+        tbl = (('foo', 'bar'),
+               ('A', 1),
+               ('B', 2),
+               ('C', 2),
+               (u'é', datetime(2012, 1, 1)))
+        f = NamedTemporaryFile(delete=True, suffix='.xlsx')
+        f.close()
+
+        toxlsx(tbl, f.name, 'Sheet1', mode="overwrite")
+        toxlsx(tbl, f.name, 'Sheet2', mode="add")
+        wb = openpyxl.load_workbook(f.name, read_only=True)
+        eq_(2, len(wb.sheetnames))
+
+    def test_toxlsx_add_sheet_match():
+        tbl = (('foo', 'bar'),
+               ('A', 1),
+               ('B', 2),
+               ('C', 2),
+               (u'é', datetime(2012, 1, 1)))
+        f = NamedTemporaryFile(delete=True, suffix='.xlsx')
+        f.close()
+
+        toxlsx(tbl, f.name, 'Sheet1', mode="overwrite")
+        try:
+            toxlsx(tbl, f.name, 'Sheet1', mode="add")
+            assert False, 'Adding duplicate sheet name did not fail'
+        except ValueError:
+            pass

From fab8a448aefa4b468628d08b44ea13f59c106a8b Mon Sep 17 00:00:00 2001
From: Juarez Rudsatz <juarez.rudsatz@ceabs.net>
Date: Fri, 7 Aug 2020 20:52:44 -0300
Subject: [PATCH 6/8] fix toxlsx() docstring formatting from ci failure

---
 petl/io/xlsx.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/petl/io/xlsx.py b/petl/io/xlsx.py
index 749d9dc3..cde7d1dd 100644
--- a/petl/io/xlsx.py
+++ b/petl/io/xlsx.py
@@ -91,20 +91,24 @@ def toxlsx(tbl, filename, sheet=None, write_header=True, mode="replace"):
     Write a table to a new Excel .xlsx file.
 
     N.B., the sheet name is case sensitive.
+
     The `mode` argument controls how the file and sheet are treated:
-    - `replace`: This is the default. It either replaces or adds a
-      named sheet, or if no sheet name is provided, all sheets
-      (overwrites the entire file).
-    - `overwrite`: Always overwrites the file. This produces a file
-      with a single sheet.
-    - `add`: Adds a new sheet. Raises `ValueError` if a named sheet
-      already exists.
+
+      - `replace`: This is the default. It either replaces or adds a
+        named sheet, or if no sheet name is provided, all sheets
+        (overwrites the entire file).
+
+      - `overwrite`: Always overwrites the file. This produces a file
+        with a single sheet.
+
+      - `add`: Adds a new sheet. Raises `ValueError` if a named sheet
+        already exists.
+
     The `sheet` argument can be omitted in all cases. The new sheet
     will then get a default name.
     If the file does not exist, it will be created, unless `replace`
     mode is used with a named sheet. In the latter case, the file
     must exist and be a valid .xlsx file.
-
     """
     import openpyxl
     if mode == "overwrite" or (mode == "replace" and sheet is None):

From f12dd9b20bc6ece9627e3a6035c97f57e3e2f94b Mon Sep 17 00:00:00 2001
From: Juarez Rudsatz <juarez.rudsatz@ceabs.net>
Date: Fri, 7 Aug 2020 22:07:15 -0300
Subject: [PATCH 7/8] rework xlsx mode for working with remote sources

---
 petl/io/xlsx.py              | 57 +++++++++++++++++++++++-------------
 petl/test/io/test_remotes.py | 34 +++++++++++++--------
 2 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/petl/io/xlsx.py b/petl/io/xlsx.py
index cde7d1dd..f059b69d 100644
--- a/petl/io/xlsx.py
+++ b/petl/io/xlsx.py
@@ -110,41 +110,56 @@ def toxlsx(tbl, filename, sheet=None, write_header=True, mode="replace"):
     mode is used with a named sheet. In the latter case, the file
     must exist and be a valid .xlsx file.
     """
+    wb = _load_or_create_workbook(filename, mode, sheet)
+    ws = _insert_sheet_on_workbook(mode, sheet, wb)
+    if write_header:
+        rows = tbl
+    else:
+        rows = data(tbl)
+    for row in rows:
+        ws.append(row)
+    target = write_source_from_arg(filename)
+    with target.open('wb') as target2:
+        wb.save(target2)
+
+
+def _load_or_create_workbook(filename, mode, sheet):
+    if PY3:
+        FileNotFound = FileNotFoundError
+    else:
+        FileNotFound = IOError
+
     import openpyxl
-    if mode == "overwrite" or (mode == "replace" and sheet is None):
-        wb = openpyxl.Workbook(write_only=True)
-        ws = wb.create_sheet(title=sheet)
-    elif mode == "replace":
-        if PY3:
-            FileNotFound = FileNotFoundError
-        else:
-            FileNotFound = IOError
+    wb = None
+    if mode != "overwrite" and (mode != "replace" or sheet is not None):
         try:
-            wb = openpyxl.load_workbook(filename=filename, read_only=False)
+            source = read_source_from_arg(filename)
+            with source.open('rb') as source2:
+                wb = openpyxl.load_workbook(filename=source2, read_only=False)
         except FileNotFound:
-            wb = openpyxl.Workbook(write_only=True)
+            wb = None
+    if wb is None:
+        wb = openpyxl.Workbook(write_only=True)
+    return wb
+
+
+def _insert_sheet_on_workbook(mode, sheet, wb):
+    if mode == "replace":
         try:
             ws = wb[str(sheet)]
             ws.delete_rows(1, ws.max_row)
         except KeyError:
             ws = wb.create_sheet(title=sheet)
     elif mode == "add":
-        wb = openpyxl.load_workbook(filename=filename, read_only=False)
         ws = wb.create_sheet(title=sheet)
-        # wb.create_sheet(title="foo") creates "foo1" if "foo" exists.
+        # it creates a sheet named "foo1" if "foo" exists.
         if sheet is not None and ws.title != sheet:
             raise ValueError("Sheet %s already exists in file" % sheet)
+    elif mode == "overwrite":
+        ws = wb.create_sheet(title=sheet)
     else:
         raise ValueError("Unknown mode '%s'" % mode)
-    if write_header:
-        rows = tbl
-    else:
-        rows = data(tbl)
-    for row in rows:
-        ws.append(row)
-    target = write_source_from_arg(filename)
-    with target.open('wb') as target2:
-        wb.save(target2)
+    return ws
 
 
 Table.toxlsx = toxlsx
diff --git a/petl/test/io/test_remotes.py b/petl/test/io/test_remotes.py
index 423c0d0f..9dcdcf0b 100644
--- a/petl/test/io/test_remotes.py
+++ b/petl/test/io/test_remotes.py
@@ -3,6 +3,7 @@
 
 import sys
 import os
+import time
 from importlib import import_module
 
 from petl.compat import PY3
@@ -87,17 +88,17 @@ def _write_read_from_env_url(env_var_name):
 
 
 def _write_read_into_url(base_url):
-    _write_read_file_into_url(base_url, "filename10.csv")
-    _write_read_file_into_url(base_url, "filename11.csv", "gz")
-    _write_read_file_into_url(base_url, "filename12.csv", "xz")
-    _write_read_file_into_url(base_url, "filename13.csv", "zst")
-    _write_read_file_into_url(base_url, "filename14.csv", "lz4")
-    _write_read_file_into_url(base_url, "filename15.csv", "snappy")
-    _write_read_file_into_url(base_url, "filename20.json")
-    _write_read_file_into_url(base_url, "filename21.json", "gz")
-    _write_read_file_into_url(base_url, "filename30.avro", pkg='fastavro')
+    # _write_read_file_into_url(base_url, "filename10.csv")
+    # _write_read_file_into_url(base_url, "filename11.csv", "gz")
+    # _write_read_file_into_url(base_url, "filename12.csv", "xz")
+    # _write_read_file_into_url(base_url, "filename13.csv", "zst")
+    # _write_read_file_into_url(base_url, "filename14.csv", "lz4")
+    # _write_read_file_into_url(base_url, "filename15.csv", "snappy")
+    # _write_read_file_into_url(base_url, "filename20.json")
+    # _write_read_file_into_url(base_url, "filename21.json", "gz")
+    # _write_read_file_into_url(base_url, "filename30.avro", pkg='fastavro')
     _write_read_file_into_url(base_url, "filename40.xlsx", pkg='openpyxl')
-    _write_read_file_into_url(base_url, "filename50.xls", pkg='xlwt')
+    # _write_read_file_into_url(base_url, "filename50.xls", pkg='xlwt')
 
 
 def _write_read_file_into_url(base_url, filename, compression=None, pkg=None):
@@ -126,8 +127,9 @@ def _write_read_file_into_url(base_url, filename, compression=None, pkg=None):
         toavro(_table, source_url)
         actual = fromavro(source_url)
     elif ".xlsx" in filename:
-        toxlsx(_table, source_url, 'test')
-        actual = fromxlsx(source_url, 'test')
+        toxlsx(_table, source_url, 'test1', mode='overwrite')
+        toxlsx(_table2, source_url, 'test2', mode='add')
+        actual = fromxlsx(source_url, 'test1')
     elif ".xls" in filename:
         toxls(_table, source_url, 'test')
         actual = fromxls(source_url, 'test')
@@ -173,4 +175,12 @@ def _is_installed(package_name):
     (u"Ted", "23", "51"),
 )
 
+_table2 = (
+    (u"name", u"friends", u"age"),
+    (u"Giannis", "31", "12"),
+    (u"James", "38", "8"),
+    (u"Stephen", "28", "4"),
+    (u"Jason", "23", "12"),
+)
+
 # endregion

From 31099aa8bb26b7e9cdb749df115ea7505738a4c8 Mon Sep 17 00:00:00 2001
From: Juarez Rudsatz <juarez.rudsatz@ceabs.net>
Date: Fri, 7 Aug 2020 22:17:15 -0300
Subject: [PATCH 8/8] revert mistake on commented test lines

---
 petl/test/io/test_remotes.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/petl/test/io/test_remotes.py b/petl/test/io/test_remotes.py
index 9dcdcf0b..504b39f9 100644
--- a/petl/test/io/test_remotes.py
+++ b/petl/test/io/test_remotes.py
@@ -88,17 +88,17 @@ def _write_read_from_env_url(env_var_name):
 
 
 def _write_read_into_url(base_url):
-    # _write_read_file_into_url(base_url, "filename10.csv")
-    # _write_read_file_into_url(base_url, "filename11.csv", "gz")
-    # _write_read_file_into_url(base_url, "filename12.csv", "xz")
-    # _write_read_file_into_url(base_url, "filename13.csv", "zst")
-    # _write_read_file_into_url(base_url, "filename14.csv", "lz4")
-    # _write_read_file_into_url(base_url, "filename15.csv", "snappy")
-    # _write_read_file_into_url(base_url, "filename20.json")
-    # _write_read_file_into_url(base_url, "filename21.json", "gz")
-    # _write_read_file_into_url(base_url, "filename30.avro", pkg='fastavro')
+    _write_read_file_into_url(base_url, "filename10.csv")
+    _write_read_file_into_url(base_url, "filename11.csv", "gz")
+    _write_read_file_into_url(base_url, "filename12.csv", "xz")
+    _write_read_file_into_url(base_url, "filename13.csv", "zst")
+    _write_read_file_into_url(base_url, "filename14.csv", "lz4")
+    _write_read_file_into_url(base_url, "filename15.csv", "snappy")
+    _write_read_file_into_url(base_url, "filename20.json")
+    _write_read_file_into_url(base_url, "filename21.json", "gz")
+    _write_read_file_into_url(base_url, "filename30.avro", pkg='fastavro')
     _write_read_file_into_url(base_url, "filename40.xlsx", pkg='openpyxl')
-    # _write_read_file_into_url(base_url, "filename50.xls", pkg='xlwt')
+    _write_read_file_into_url(base_url, "filename50.xls", pkg='xlwt')
 
 
 def _write_read_file_into_url(base_url, filename, compression=None, pkg=None):