postgrespro
diff --git a/‎setup.py
Lines changed: 0 additions & 1 deletion b/‎setup.py
Lines changed: 0 additions & 1 deletion
diff --git a/‎testgres/cache.py
Lines changed: 3 additions & 1 deletion b/‎testgres/cache.py
Lines changed: 3 additions & 1 deletion
diff --git a/‎testgres/operations/local_ops.py
Lines changed: 7 additions & 3 deletions b/‎testgres/operations/local_ops.py
Lines changed: 7 additions & 3 deletions
@@ -12,7 +12,6 @@
     "six>=1.9.0",
     "psutil",
     "packaging",
-    "paramiko",
     "fabric",
     "sshtunnel"
 ]
 
@@ -57,7 +57,9 @@ def call_initdb(initdb_dir, log=logfile):
                 # our initdb caching mechanism breaks this contract.
                 pg_control = os.path.join(data_dir, XLOG_CONTROL_FILE)
                 system_id = generate_system_id()
-                os_ops.write(pg_control, system_id, truncate=True, binary=True, read_and_write=True)
+                cur_pg_control = os_ops.read(pg_control, binary=True)
+                new_pg_control = system_id + cur_pg_control[len(system_id):]
+                os_ops.write(pg_control, new_pg_control, truncate=True, binary=True, read_and_write=True)
 
                 # XXX: build new WAL segment with our system id
                 _params = [get_bin_path("pg_resetwal"), "-D", data_dir, "-f"]
 
@@ -198,9 +198,13 @@ def touch(self, filename):
         with open(filename, "a"):
             os.utime(filename, None)
 
-    def read(self, filename, encoding=None):
-        with open(filename, "r", encoding=encoding) as file:
-            return file.read()
+    def read(self, filename, encoding=None, binary=False):
+        mode = "rb" if binary else "r"
+        with open(filename, mode) as file:
+            if binary:
+                return file.read()
+            return file.read().decode(encoding or 'utf-8')
+
 
     def readlines(self, filename, num_lines=0, binary=False, encoding=None):
         """
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`"six>=1.9.0",`
`13`	`13`	`"psutil",`
`14`	`14`	`"packaging",`
`15`		`- "paramiko",`
`16`	`15`	`"fabric",`
`17`	`16`	`"sshtunnel"`
`18`	`17`	`]`