Add options to set encoding or disable decode

wandio/compressed.py

@@ -86,7 +86,10 @@ def readline(self):
                 break
         if not len(res) and not len(self.buf) and self.eof:
             return None
-        return res.decode("utf-8")
+        if self.decode:
+            return res.decode(self.encoding)
+        else:
+            return res
 
 
 class CompressedWriter(wandio.file.GenericWriter):

wandio/file.py

@@ -16,8 +16,10 @@ class GenericReader(object):
     Wraps a file-like object
     """
 
-    def __init__(self, fh):
+    def __init__(self, fh, decode=True, encoding="utf-8"):
         self.fh = fh
+        self.decode = decode
+        self.encoding = encoding
 
     def __enter__(self):
         return self

wandio/http.py

@@ -42,4 +42,8 @@ def __init__(self, url):
         super(HttpReader, self).__init__(urlopen(self.url))
 
     def __next__(self):
-        return next(self.fh).decode("utf-8")
+        res = next(self.fh)
+        if self.decode:
+            return res.decode(self.encoding)
+        else:
+            return res

wandio/opener.py

@@ -99,9 +99,12 @@ def __init__(self, filename, options=None):
         super(Writer, self).__init__(fh)
 
 
-def wandio_open(filename, mode="r"):
+def wandio_open(filename, mode="r", decode=True, encoding="utf-8"):
     if mode == "r":
-        return Reader(filename)
+        reader = Reader(filename)
+        reader.fh.decode = decode
+        reader.fh.encoding = encoding
+        return reader
     elif mode == "w":
         return Writer(filename)
     else: