Remove hard-coded BytesCollection encoding (#1057)

* Remove hard-coded BytesCollection encoding Towards resolving #1048 * Pass encoding keyword arg in test * Update change log
Toblerity · Jan 31, 2022 · 9925896 · 9925896
1 parent c4ec419
commit 9925896
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -10,6 +10,11 @@ Changes:
 
 - Upgrade attrs, cython, etc to open up Python 3.10 support (#1049).
 
+Bug fixes:
+
+- Hard-coded "utf-8" collection encoding added in #423 has been removed
+  (#1057).
+
 1.8.20 (2021-05-31)
 -------------------
 

diff --git a/fiona/collection.py b/fiona/collection.py
@@ -552,8 +552,7 @@ def __init__(self, bytesbuf, **kwds):
         self.virtual_file = buffer_to_virtual_file(self.bytesbuf, ext=ext)
 
         # Instantiate the parent class.
-        super(BytesCollection, self).__init__(self.virtual_file, vsi=filetype,
-                                              encoding='utf-8', **kwds)
+        super(BytesCollection, self).__init__(self.virtual_file, vsi=filetype, **kwds)
 
     def close(self):
         """Removes the virtual file associated with the class."""

diff --git a/tests/test_bytescollection.py b/tests/test_bytescollection.py
@@ -12,7 +12,7 @@ class TestReading(object):
     def bytes_collection_object(self, path_coutwildrnp_json):
         with open(path_coutwildrnp_json) as src:
             bytesbuf = src.read().encode('utf-8')
-        self.c = fiona.BytesCollection(bytesbuf)
+        self.c = fiona.BytesCollection(bytesbuf, encoding="utf-8")
         yield
         self.c.close()