python3: use io.open() rather than open() in read_file() and create_file()

Author: jun66j5

trac/util/__init__.py

@@ -232,23 +232,43 @@ def __exit__(self, exc_type, exc_value, traceback):
     closed = property(lambda self: self._file is None or self._file.closed)
 
 
-def read_file(path, mode='r'):
+def read_file(path, mode='r', encoding=None, errors=None, newline=None):
     """Read a file and return its content."""
-    with open(path, mode) as f:
+    kwargs = {}
+    if 'b' not in mode:
+        kwargs['encoding'] = encoding or 'utf-8'
+        kwargs['errors'] = errors
+        kwargs['newline'] = newline
+    with io.open(path, mode=mode, **kwargs) as f:
         return f.read()
 
 
-def create_file(path, data='', mode='w'):
+def create_file(path, data=None, mode='w', encoding=None, errors=None,
+                newline=None):
     """Create a new file with the given data.
 
     :data: string or iterable of strings.
     """
-    with open(path, mode) as f:
-        if data:
+    binary = 'b' in mode
+    if encoding is None:
+        encoding = 'utf-8'
+    if errors is None:
+        errors = 'strict'
+    kwargs = {}
+    if 'b' not in mode:
+        kwargs['encoding'] = encoding
+        kwargs['errors'] = errors
+        kwargs['newline'] = newline
+    with io.open(path, mode, **kwargs) as f:
+        if data is not None:
             if isinstance(data, (unicode, bytes)):
-                f.write(data)
-            else:  # Assume iterable
-                f.writelines(data)
+                data = (data,)
+            for chunk in data:
+                if not chunk:
+                    continue
+                if not binary and isinstance(chunk, bytes):
+                    chunk = chunk.decode(encoding, errors)
+                f.write(chunk)
 
 
 def create_unique_file(path):

trac/wiki/admin.py

@@ -118,7 +118,8 @@ def import_page(self, filename, title, create_only=[],
             data = read_file(filename)
         else:
             data = sys.stdin.read()
-        data = to_unicode(data, 'utf-8')
+            if isinstance(data, bytes):
+                data = data.decode('utf-8')
 
         with self.env.db_transaction as db:
             # Make sure we don't insert the exact same page twice